From 8ad785c516280836591249b0a7675023c8dd7d91 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 4 Apr 2008 16:15:49 +0000 Subject: [PATCH 1/6] Initialize branch EL-5 for wxPython --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 From a5ecf5ecd2d0f213da18e8a0cca5be8caac2cdef Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Thu, 24 Apr 2008 05:10:00 +0000 Subject: [PATCH 2/6] epel push --- sources | 2 +- wxPython.spec | 62 ++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 50 insertions(+), 14 deletions(-) diff --git a/sources b/sources index 464223d..ddd1250 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a27546fab8a8d77eb6b67954e6362269 wxPython-src-2.6.3.2.tar.gz +04fc1079430b18e6fd097b3287e9ae10 wxPython-src-2.8.7.1.tar.bz2 diff --git a/wxPython.spec b/wxPython.spec index a4825b5..ab16667 100644 --- a/wxPython.spec +++ b/wxPython.spec @@ -4,7 +4,7 @@ %define buildflags WXPORT=gtk2 UNICODE=1 Name: wxPython -Version: 2.6.3.2 +Version: 2.8.7.1 Release: 2%{?dist} Summary: GUI toolkit for the Python programming language @@ -12,10 +12,11 @@ Summary: GUI toolkit for the Python programming language Group: Development/Languages License: LGPL URL: http://www.wxpython.org/ -Source0: http://dl.sf.net/wxpython/wxPython-src-%{version}.tar.gz +Source0: http://dl.sf.net/wxpython/wxPython-src-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: wxGTK-devel = 2.6.3, pkgconfig +# make sure to keep this updated as appropriate +BuildRequires: wxGTK-devel >= 2.8.7 +BuildRequires: pkgconfig BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel BuildRequires: libGL-devel, libGLU-devel BuildRequires: python-devel, wxGTK-gl @@ -24,6 +25,9 @@ BuildRequires: python-devel, wxGTK-gl # one does, here's the provides for it. Provides: wxPythonGTK2 = %{version}-%{release} +# time for this to go away. +Obsoletes: compat-wxPythonGTK < 2.8.4.0 + %description wxPython is a GUI toolkit for the Python programming language. It allows Python programmers to create programs with a robust, highly functional @@ -77,21 +81,53 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %{python_sitearch}/wx.pth %{python_sitearch}/wxversion.py* -%dir %{python_sitearch}/wx-2.6-gtk2-unicode/ -%{python_sitearch}/wx-2.6-gtk2-unicode/wx -%{python_sitearch}/wx-2.6-gtk2-unicode/wxPython +%dir %{python_sitearch}/wx-2.8-gtk2-unicode/ +%{python_sitearch}/wx-2.8-gtk2-unicode/wx +%{python_sitearch}/wx-2.8-gtk2-unicode/wxPython +%{python_sitelib}/wxaddons +%if 0%{?fedora} >= 9 +%{python_sitelib}/*egg-info +%{python_sitearch}/wx-2.8-gtk2-unicode/*egg-info +%endif %files devel %defattr(-,root,root,-) -%dir %{_includedir}/wx-2.6/wx/wxPython -%{_includedir}/wx-2.6/wx/wxPython/*.h -%dir %{_includedir}/wx-2.6/wx/wxPython/i_files -%{_includedir}/wx-2.6/wx/wxPython/i_files/*.i -%{_includedir}/wx-2.6/wx/wxPython/i_files/*.py* -%{_includedir}/wx-2.6/wx/wxPython/i_files/*.swg +%dir %{_includedir}/wx-2.8/wx/wxPython +%{_includedir}/wx-2.8/wx/wxPython/*.h +%dir %{_includedir}/wx-2.8/wx/wxPython/i_files +%{_includedir}/wx-2.8/wx/wxPython/i_files/*.i +%{_includedir}/wx-2.8/wx/wxPython/i_files/*.py* +%{_includedir}/wx-2.8/wx/wxPython/i_files/*.swg %changelog +* Thu Feb 21 2008 Matthew Miller - 2.8.7.1-2 +- include egg-info files for fedora 9 or greater + +* Wed Feb 20 2008 Matthew Miller - 2.8.7.1-1 +- update to 2.8.7.1 + +* Tue Feb 19 2008 Fedora Release Engineering - 2.8.4.0-3 +- Autorebuild for GCC 4.3 + +* Wed Aug 29 2007 Fedora Release Engineering - 2.8.4.0-2 +- Rebuild for selinux ppc32 issue. + +* Wed Jul 11 2007 Matthew Miller - 2.8.4.0-1 +- update to 2.8.4.0 +- obsolete compat-wxPythonGTK + +* Sun Apr 15 2007 Matthew Miller - 2.8.3.0-1 +- update to 2.8.3.0 + +* Fri Dec 15 2006 Matthew Miller - 2.8.0.1-1 +- update to 2.8.0.1 +- make buildrequire wxGTK of version-wxpythonsubrelease +- add wxaddons to filelist + +* Mon Dec 11 2006 Matthew Miller - 2.6.3.2-3 +- bump release for rebuild against python 2.5. + * Mon Aug 28 2006 Matthew Miller - 2.6.3.2-2 - bump release for FC6 rebuild From f5a8423556d10d4e852219238e4a6b937fbbd64a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:19:41 +0000 Subject: [PATCH 3/6] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 59b840a..436fca0 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: wxPython -# $Id: Makefile,v 1.2 2004/11/24 05:07:05 gafton Exp $ +# $Id: Makefile,v 1.4 2005/12/21 13:19:54 mschwendt Exp $ NAME := wxPython SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From eec544ee3e2a3cf89b4f526bf9b9b6d40080760e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Mon, 31 May 2010 09:28:49 +0000 Subject: [PATCH 4/6] - update to 2.8.11.0 (#593837, #595936, #597639) --- .cvsignore | 2 +- sources | 2 +- wxPython-2.8.11.0-aui.patch | 24 ++++++++++++++++++++++++ wxPython-2.8.9.2-treelist.patch | 11 +++++++++++ wxPython.spec | 20 ++++++++++++++++---- 5 files changed, 53 insertions(+), 6 deletions(-) create mode 100644 wxPython-2.8.11.0-aui.patch create mode 100644 wxPython-2.8.9.2-treelist.patch diff --git a/.cvsignore b/.cvsignore index b6500b9..3a89b5e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wxPython-src-2.6.3.2.tar.gz +wxPython-src-2.8.11.0.tar.bz2 diff --git a/sources b/sources index ddd1250..08f0993 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -04fc1079430b18e6fd097b3287e9ae10 wxPython-src-2.8.7.1.tar.bz2 +63f73aae49e530852db56a31b57529fa wxPython-src-2.8.11.0.tar.bz2 diff --git a/wxPython-2.8.11.0-aui.patch b/wxPython-2.8.11.0-aui.patch new file mode 100644 index 0000000..45fab7c --- /dev/null +++ b/wxPython-2.8.11.0-aui.patch @@ -0,0 +1,24 @@ +diff -up wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_pages.py.aui wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_pages.py +--- wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_pages.py.aui 2010-05-27 15:38:42.000000000 +0200 ++++ wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_pages.py 2010-05-27 15:38:50.000000000 +0200 +@@ -36,7 +36,7 @@ import ed_txt + import ed_mdlg + import ebmlib + import eclib +-from extern import aui ++from wx.lib.agw import aui + + #--------------------------------------------------------------------------# + # Globals +diff -up wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_shelf.py.aui wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_shelf.py +--- wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_shelf.py.aui 2010-05-27 15:38:20.000000000 +0200 ++++ wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_shelf.py 2010-05-27 15:38:28.000000000 +0200 +@@ -28,7 +28,7 @@ import ed_glob + from profiler import Profile_Get + import plugin + import iface +-import extern.aui as aui ++from wx.lib.agw import aui + + #--------------------------------------------------------------------------# + # Globals diff --git a/wxPython-2.8.9.2-treelist.patch b/wxPython-2.8.9.2-treelist.patch new file mode 100644 index 0000000..e7cf28b --- /dev/null +++ b/wxPython-2.8.9.2-treelist.patch @@ -0,0 +1,11 @@ +--- wxPython-src-2.8.9.2/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp.orig 2009-04-10 23:03:18.000000000 +0200 ++++ wxPython-src-2.8.9.2/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp 2009-04-10 23:03:41.000000000 +0200 +@@ -10321,7 +10321,7 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_ + PyObject *resultobj = 0; + wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; + wxTreeItemId *arg2 = 0 ; +- wxTreeItemId const &arg3_defvalue = NULL ; ++ wxTreeItemId const &arg3_defvalue = (wxTreeItemId *) NULL ; + wxTreeItemId *arg3 = (wxTreeItemId *) &arg3_defvalue ; + bool arg4 = (bool) true ; + void *argp1 = 0 ; diff --git a/wxPython.spec b/wxPython.spec index ab16667..7100fd7 100644 --- a/wxPython.spec +++ b/wxPython.spec @@ -4,8 +4,8 @@ %define buildflags WXPORT=gtk2 UNICODE=1 Name: wxPython -Version: 2.8.7.1 -Release: 2%{?dist} +Version: 2.8.11.0 +Release: 1%{?dist} Summary: GUI toolkit for the Python programming language @@ -13,9 +13,14 @@ Group: Development/Languages License: LGPL URL: http://www.wxpython.org/ Source0: http://dl.sf.net/wxpython/wxPython-src-%{version}.tar.bz2 +# http://trac.wxwidgets.org/ticket/10703 +Patch0: wxPython-2.8.9.2-treelist.patch +# fix aui imports +# http://trac.wxwidgets.org/ticket/12107 +Patch1: wxPython-2.8.11.0-aui.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # make sure to keep this updated as appropriate -BuildRequires: wxGTK-devel >= 2.8.7 +BuildRequires: wxGTK-devel >= 2.8.11 BuildRequires: pkgconfig BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel BuildRequires: libGL-devel, libGLU-devel @@ -49,6 +54,11 @@ programs which use the wxPython toolkit. %prep %setup -q -n wxPython-src-%{version} +%patch0 -p1 -b .treelist +%patch1 -p1 -b .aui + +# fix libdir otherwise additional wx libs cannot be found +sed -i -e 's|/usr/lib|%{_libdir}|' wxPython/config.py %build @@ -84,7 +94,6 @@ rm -rf $RPM_BUILD_ROOT %dir %{python_sitearch}/wx-2.8-gtk2-unicode/ %{python_sitearch}/wx-2.8-gtk2-unicode/wx %{python_sitearch}/wx-2.8-gtk2-unicode/wxPython -%{python_sitelib}/wxaddons %if 0%{?fedora} >= 9 %{python_sitelib}/*egg-info %{python_sitearch}/wx-2.8-gtk2-unicode/*egg-info @@ -101,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 31 2010 Dan Horák - 2.8.11.0-1 +- update to 2.8.11.0 (#593837, #595936, #597639) + * Thu Feb 21 2008 Matthew Miller - 2.8.7.1-2 - include egg-info files for fedora 9 or greater From 6d223adeaa5603df9a2fc3234671ac4ef851d0f6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:29:13 +0000 Subject: [PATCH 5/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 436fca0..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wxPython -# $Id: Makefile,v 1.4 2005/12/21 13:19:54 mschwendt Exp $ -NAME := wxPython -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 42f697a..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-5 From 43d937bd209c4d77c6ee8b02da775d44b6482d7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Sat, 30 Apr 2011 16:11:10 +0200 Subject: [PATCH 6/6] update to 2.8.12.0 (#699207) --- .gitignore | 1 + sources | 2 +- wxPython-2.8.11.0-aui.patch | 24 ------------------------ wxPython-2.8.12.0-aui.patch | 24 ++++++++++++++++++++++++ wxPython-2.8.9.2-treelist.patch | 11 ----------- wxPython.spec | 14 +++++++------- 6 files changed, 33 insertions(+), 43 deletions(-) delete mode 100644 wxPython-2.8.11.0-aui.patch create mode 100644 wxPython-2.8.12.0-aui.patch delete mode 100644 wxPython-2.8.9.2-treelist.patch diff --git a/.gitignore b/.gitignore index 3a89b5e..ea61b77 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ wxPython-src-2.8.11.0.tar.bz2 +/wxPython-src-2.8.12.0.tar.bz2 diff --git a/sources b/sources index 08f0993..f117e2f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -63f73aae49e530852db56a31b57529fa wxPython-src-2.8.11.0.tar.bz2 +402e0b81e06f596d849e221a7a76acc6 wxPython-src-2.8.12.0.tar.bz2 diff --git a/wxPython-2.8.11.0-aui.patch b/wxPython-2.8.11.0-aui.patch deleted file mode 100644 index 45fab7c..0000000 --- a/wxPython-2.8.11.0-aui.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_pages.py.aui wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_pages.py ---- wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_pages.py.aui 2010-05-27 15:38:42.000000000 +0200 -+++ wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_pages.py 2010-05-27 15:38:50.000000000 +0200 -@@ -36,7 +36,7 @@ import ed_txt - import ed_mdlg - import ebmlib - import eclib --from extern import aui -+from wx.lib.agw import aui - - #--------------------------------------------------------------------------# - # Globals -diff -up wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_shelf.py.aui wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_shelf.py ---- wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_shelf.py.aui 2010-05-27 15:38:20.000000000 +0200 -+++ wxPython-src-2.8.11.0/wxPython/wx/tools/Editra/src/ed_shelf.py 2010-05-27 15:38:28.000000000 +0200 -@@ -28,7 +28,7 @@ import ed_glob - from profiler import Profile_Get - import plugin - import iface --import extern.aui as aui -+from wx.lib.agw import aui - - #--------------------------------------------------------------------------# - # Globals diff --git a/wxPython-2.8.12.0-aui.patch b/wxPython-2.8.12.0-aui.patch new file mode 100644 index 0000000..bd631e0 --- /dev/null +++ b/wxPython-2.8.12.0-aui.patch @@ -0,0 +1,24 @@ +diff -up wxPython-src-2.8.12.0/wxPython/wx/tools/Editra/src/ed_pages.py.aui wxPython-src-2.8.12.0/wxPython/wx/tools/Editra/src/ed_pages.py +--- wxPython-src-2.8.12.0/wxPython/wx/tools/Editra/src/ed_pages.py.aui 2011-04-13 22:28:07.000000000 +0200 ++++ wxPython-src-2.8.12.0/wxPython/wx/tools/Editra/src/ed_pages.py 2011-04-26 08:40:13.000000000 +0200 +@@ -37,7 +37,7 @@ import ed_txt + import ed_mdlg + import ebmlib + import eclib +-from extern import aui ++from wx.lib.agw import aui + import ed_book + + #--------------------------------------------------------------------------# +diff -up wxPython-src-2.8.12.0/wxPython/wx/tools/Editra/src/ed_shelf.py.aui wxPython-src-2.8.12.0/wxPython/wx/tools/Editra/src/ed_shelf.py +--- wxPython-src-2.8.12.0/wxPython/wx/tools/Editra/src/ed_shelf.py.aui 2011-04-13 22:28:07.000000000 +0200 ++++ wxPython-src-2.8.12.0/wxPython/wx/tools/Editra/src/ed_shelf.py 2011-04-26 08:40:26.000000000 +0200 +@@ -29,7 +29,7 @@ from profiler import Profile_Get + import ed_msg + import plugin + import iface +-from extern import aui ++from wx.lib.agw import aui + import ed_book + + #--------------------------------------------------------------------------# diff --git a/wxPython-2.8.9.2-treelist.patch b/wxPython-2.8.9.2-treelist.patch deleted file mode 100644 index e7cf28b..0000000 --- a/wxPython-2.8.9.2-treelist.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- wxPython-src-2.8.9.2/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp.orig 2009-04-10 23:03:18.000000000 +0200 -+++ wxPython-src-2.8.9.2/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp 2009-04-10 23:03:41.000000000 +0200 -@@ -10321,7 +10321,7 @@ SWIGINTERN PyObject *_wrap_TreeListCtrl_ - PyObject *resultobj = 0; - wxPyTreeListCtrl *arg1 = (wxPyTreeListCtrl *) 0 ; - wxTreeItemId *arg2 = 0 ; -- wxTreeItemId const &arg3_defvalue = NULL ; -+ wxTreeItemId const &arg3_defvalue = (wxTreeItemId *) NULL ; - wxTreeItemId *arg3 = (wxTreeItemId *) &arg3_defvalue ; - bool arg4 = (bool) true ; - void *argp1 = 0 ; diff --git a/wxPython.spec b/wxPython.spec index 7100fd7..3d70cb8 100644 --- a/wxPython.spec +++ b/wxPython.spec @@ -4,7 +4,7 @@ %define buildflags WXPORT=gtk2 UNICODE=1 Name: wxPython -Version: 2.8.11.0 +Version: 2.8.12.0 Release: 1%{?dist} Summary: GUI toolkit for the Python programming language @@ -12,12 +12,10 @@ Summary: GUI toolkit for the Python programming language Group: Development/Languages License: LGPL URL: http://www.wxpython.org/ -Source0: http://dl.sf.net/wxpython/wxPython-src-%{version}.tar.bz2 -# http://trac.wxwidgets.org/ticket/10703 -Patch0: wxPython-2.8.9.2-treelist.patch +Source0: http://downloads.sourceforge.net/wxpython/%{name}-src-%{version}.tar.bz2 # fix aui imports # http://trac.wxwidgets.org/ticket/12107 -Patch1: wxPython-2.8.11.0-aui.patch +Patch0: wxPython-2.8.12.0-aui.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # make sure to keep this updated as appropriate BuildRequires: wxGTK-devel >= 2.8.11 @@ -54,8 +52,7 @@ programs which use the wxPython toolkit. %prep %setup -q -n wxPython-src-%{version} -%patch0 -p1 -b .treelist -%patch1 -p1 -b .aui +%patch0 -p1 -b .aui # fix libdir otherwise additional wx libs cannot be found sed -i -e 's|/usr/lib|%{_libdir}|' wxPython/config.py @@ -110,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Apr 26 2011 Dan Horák - 2.8.12.0-1 +- update to 2.8.12.0 (#699207) + * Mon May 31 2010 Dan Horák - 2.8.11.0-1 - update to 2.8.11.0 (#593837, #595936, #597639)