From 92d9fe91692bf13b32c60764257d1f844de67b50 Mon Sep 17 00:00:00 2001 From: gafton Date: Wed, 24 Nov 2004 05:07:57 +0000 Subject: [PATCH 01/22] Fix braindead typo from the original import --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d2485ab..619b49e 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common -test -f CVS/Rootx && { 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 +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)) From f39167fdb7a31697d3141dc1308ceb6dbe0c2f2c Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Wed, 2 Feb 2005 14:11:51 +0000 Subject: [PATCH 02/22] Fix release. --- wxPython.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/wxPython.spec b/wxPython.spec index b834409..f06f1d9 100644 --- a/wxPython.spec +++ b/wxPython.spec @@ -4,8 +4,7 @@ Name: wxPython Version: 2.4.2.4 -Release: 0.fdr.2.1 -Epoch: 0 +Release: 1 Summary: wxPython is a GUI toolkit for the Python programming language. Group: Development/Languages @@ -15,8 +14,8 @@ Source0: http://dl.sf.net/wxpython/wxPythonSrc-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: wxGTK2-devel >= 0:2.4.2, pkgconfig -BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel -BuildRequires: python-devel, wxGTK2-gl +BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel +BuildRequires: python-devel, wxGTK2-gl Requires: %{_libdir}/python%{pyver} %description From 919b70049ae41a2a8619c7c1161bb7e29d1a32b3 Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Thu, 10 Feb 2005 18:55:05 +0000 Subject: [PATCH 03/22] remove included disutils before build; fixes build on x86_64 --- wxPython.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/wxPython.spec b/wxPython.spec index f06f1d9..a431937 100644 --- a/wxPython.spec +++ b/wxPython.spec @@ -4,7 +4,7 @@ Name: wxPython Version: 2.4.2.4 -Release: 1 +Release: 2 Summary: wxPython is a GUI toolkit for the Python programming language. Group: Development/Languages @@ -32,6 +32,8 @@ platform GUI library, which is written in C++. # just build the wxPython part, not all of wxWindows which we already have # in fedora... cd wxPython +# included disutils is not multilib aware; use normal +rm -rf distutils python setup.py %{buildflags} build # this doesn't get built automatically, resulting in bogus libwx_gtk2-2.3.so.0 @@ -56,6 +58,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/python%{pyver}/site-packages/wx %changelog +* Tue Feb 08 2005 Thorsten Leemhuis 2.4.2.4-2 +- remove included disutils - it is not multilib aware; this + fixes build on x86_64 + * Thu Nov 20 2003 Panu Matilainen 0:2.4.2.4-0.fdr.2 - add missing buildrequires: python-devel, wxGTK2-gl From 1261be89acc7fe69542bfe492d3b4cf3345b51f1 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Sat, 12 Feb 2005 03:18:05 +0000 Subject: [PATCH 04/22] This package was renamed to wxPythonGTK2 in extras for FC2. --- .cvsignore | 1 - Makefile | 21 ---------------- sources | 1 - wxPython.spec | 69 --------------------------------------------------- 4 files changed, 92 deletions(-) delete mode 100644 .cvsignore delete mode 100644 Makefile delete mode 100644 sources delete mode 100644 wxPython.spec diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 5ff901a..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -wxPythonSrc-2.4.2.4.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index 619b49e..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wxPython -# $Id$ -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 -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/sources b/sources deleted file mode 100644 index d49d5e3..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -ea4eb68e10a0c2a9be643b35dcb78e41 wxPythonSrc-2.4.2.4.tar.gz diff --git a/wxPython.spec b/wxPython.spec deleted file mode 100644 index a431937..0000000 --- a/wxPython.spec +++ /dev/null @@ -1,69 +0,0 @@ -%define pyver %(python -c 'import sys ; print sys.version[:3]') - -%define buildflags WXPORT=gtk2 UNICODE=1 - -Name: wxPython -Version: 2.4.2.4 -Release: 2 -Summary: wxPython is a GUI toolkit for the Python programming language. - -Group: Development/Languages -License: LGPL -URL: http://www.wxpython.org/ -Source0: http://dl.sf.net/wxpython/wxPythonSrc-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: wxGTK2-devel >= 0:2.4.2, pkgconfig -BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel -BuildRequires: python-devel, wxGTK2-gl -Requires: %{_libdir}/python%{pyver} - -%description -wxPython is a GUI toolkit for the Python programming language. It allows -Python programmers to create programs with a robust, highly functional -graphical user interface, simply and easily. It is implemented as a Python -extension module (native code) that wraps the popular wxWindows cross -platform GUI library, which is written in C++. - -%prep -%setup -q -n %{name}Src-%{version} - -%build -# just build the wxPython part, not all of wxWindows which we already have -# in fedora... -cd wxPython -# included disutils is not multilib aware; use normal -rm -rf distutils -python setup.py %{buildflags} build - -# this doesn't get built automatically, resulting in bogus libwx_gtk2-2.3.so.0 -# dependency for the package -cd demo/dllwidget -make clean -make - -%install -rm -rf $RPM_BUILD_ROOT -cd wxPython -python setup.py %{buildflags} install --root=$RPM_BUILD_ROOT - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root,-) -%doc wxPython/docs wxPython/demo wxPython/licence/ wxPython/samples -%{_bindir}/* -%{_libdir}/python%{pyver}/site-packages/wxPython -%{_libdir}/python%{pyver}/site-packages/wx - -%changelog -* Tue Feb 08 2005 Thorsten Leemhuis 2.4.2.4-2 -- remove included disutils - it is not multilib aware; this - fixes build on x86_64 - -* Thu Nov 20 2003 Panu Matilainen 0:2.4.2.4-0.fdr.2 -- add missing buildrequires: python-devel, wxGTK2-gl - -* Sun Nov 02 2003 Panu Matilainen 0:2.4.2.4-0.fdr.1 -- Initial RPM release. From 0381bc9f4e2dd759a978305dab7ed2494c4e50a8 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Wed, 21 Dec 2005 13:19:54 +0000 Subject: [PATCH 05/22] re-enable wxPython component in CVS --- Makefile | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..619b49e --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: wxPython +# $Id$ +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 +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) From b8bf9b48b87a75816bab19f11d7eaab63fcd685f Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Fri, 31 Mar 2006 02:23:27 +0000 Subject: [PATCH 06/22] Update to 2.6.3.0 (finally, I know) --- .cvsignore | 1 + sources | 1 + wxPython.spec | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 130 insertions(+) create mode 100644 .cvsignore create mode 100644 sources create mode 100644 wxPython.spec diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..6500640 --- /dev/null +++ b/.cvsignore @@ -0,0 +1 @@ +wxPython-src-2.6.3.0.tar.gz diff --git a/sources b/sources new file mode 100644 index 0000000..8ff4a1b --- /dev/null +++ b/sources @@ -0,0 +1 @@ +2891a496f4a415179e6a231619344b27 wxPython-src-2.6.3.0.tar.gz diff --git a/wxPython.spec b/wxPython.spec new file mode 100644 index 0000000..5bdcec2 --- /dev/null +++ b/wxPython.spec @@ -0,0 +1,128 @@ +%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + +%define buildflags WXPORT=gtk2 UNICODE=1 + +Name: wxPython +Version: 2.6.3.0 +Release: 1%{?dist} + +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 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: wxGTK-devel = 2.6.3, pkgconfig +BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel +BuildRequires: python-devel, wxGTK-gl + +# packages should depend on "wxPython", not "wxPythonGTK2", but in case +# one does, here's the provides for it. +Provides: wxPythonGTK2 = %{version}-%{release} + +%description +wxPython is a GUI toolkit for the Python programming language. It allows +Python programmers to create programs with a robust, highly functional +graphical user interface, simply and easily. It is implemented as a Python +extension module (native code) that wraps the popular wxWindows cross +platform GUI library, which is written in C++. + +%package devel +Group: Development/Libraries +Summary: Development files for wxPython add-on modules +Requires: %{name} = %{version}-%{release} +Requires: wxGTK-devel + +%description devel +This package includes C++ header files and SWIG files needed for developing +add-on modules for wxPython. It is NOT needed for development of most +programs which use the wxPython toolkit. + + +%prep +%setup -q -n wxPython-src-%{version} + +# There's binaries included in the source tarball, resulting in bogus +# dependencies for the package -- clean it up: +rm wxPython/samples/embedded/embedded wxPython/samples/embedded/embedded.o + +%build +# Just build the wxPython part, not all of wxWindows which we already have +# in Fedora +cd wxPython +# included distutils is not multilib aware; use normal +rm -rf distutils +python setup.py %{buildflags} build + + +%install +rm -rf $RPM_BUILD_ROOT +cd wxPython +python setup.py %{buildflags} install --root=$RPM_BUILD_ROOT + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc wxPython/docs wxPython/demo wxPython/licence/ wxPython/samples +%{_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 + +%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 + + +%changelog +* Thu Mar 30 2006 Matthew Miller - 2.6.3.0-1 +- update to 2.6.3.0 +- wxGTK and wxPython versions are inexorably linked; make BuildRequires + be exact, rather than >=. +- make devel subpackage as per comment #7 in bug #163440. + +* Thu Nov 24 2005 Matthew Miller - 2.6.1.0-1 +- update to 2.6.0.0 +- merge in changes from current extras 2.4.x package +- Happy Thanksgiving +- build animate extention again -- works now. + +* Thu Apr 28 2005 Matthew Miller - 2.6.0.0-bu45.1 +- get rid of accidental binaries in source tarball -- they generates + spurious dependencies and serve no purpose +- update to 2.6.0.0 and build for Velouria +- switch to Fedora Extras base spec file +- enable gtk2 and unicode and all the code stuff (as FE does) +- disable BUILD_ANIMATE extension from contrib -- doesn't build +- files are in a different location now -- adjust to that +- zap include files (needed only for building wxPython 3rd-party modules), + because I don't think this is likely to be very useful. Other option + would be to create a -devel package, but I think that'd be confusing. + +* Tue Feb 08 2005 Thorsten Leemhuis 0:2.4.2.4-4 +- remove included disutils - it is not multilib aware; this + fixes build on x86_64 + +* Tue Jan 06 2004 Panu Matilainen 0:2.4.2.4-0.fdr.3 +- rename package to wxPythonGTK2, provide wxPython (see bug 927) +- dont ship binaries in /usr/share + +* Thu Nov 20 2003 Panu Matilainen 0:2.4.2.4-0.fdr.2 +- add missing buildrequires: python-devel, wxGTK2-gl + +* Sun Nov 02 2003 Panu Matilainen 0:2.4.2.4-0.fdr.1 +- Initial RPM release. +~ From 1a4fe2f69c368a2081dba2b7f38093bfd4906370 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Fri, 31 Mar 2006 13:18:42 +0000 Subject: [PATCH 07/22] buildrequires mesa-libGLU-devel --- wxPython.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wxPython.spec b/wxPython.spec index 5bdcec2..59fbd7d 100644 --- a/wxPython.spec +++ b/wxPython.spec @@ -4,7 +4,7 @@ Name: wxPython Version: 2.6.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GUI toolkit for the Python programming language @@ -16,6 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: wxGTK-devel = 2.6.3, pkgconfig BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel +BuildRequires: mesa-libGLU-devel BuildRequires: python-devel, wxGTK-gl # packages should depend on "wxPython", not "wxPythonGTK2", but in case @@ -88,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Mar 31 2006 Matthew Miller - 2.6.3.0-2 +- buildrequires mesa-libGLU-devel + * Thu Mar 30 2006 Matthew Miller - 2.6.3.0-1 - update to 2.6.3.0 - wxGTK and wxPython versions are inexorably linked; make BuildRequires From df7614752c2b41f7443bf7272837479a60a0ab65 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Fri, 31 Mar 2006 14:12:24 +0000 Subject: [PATCH 08/22] Apparently wx.pth and wxversion.py don't belong in lib64. --- wxPython.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/wxPython.spec b/wxPython.spec index 59fbd7d..27dce63 100644 --- a/wxPython.spec +++ b/wxPython.spec @@ -1,10 +1,11 @@ +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %define buildflags WXPORT=gtk2 UNICODE=1 Name: wxPython Version: 2.6.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GUI toolkit for the Python programming language @@ -72,8 +73,8 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc wxPython/docs wxPython/demo wxPython/licence/ wxPython/samples %{_bindir}/* -%{python_sitearch}/wx.pth -%{python_sitearch}/wxversion.py* +%{python_sitelib}/wx.pth +%{python_sitelib}/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 @@ -89,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Mar 31 2006 Matthew Miller - 2.6.3.0-3 +- oh yeah -- wxversion.py not lib64. + * Fri Mar 31 2006 Matthew Miller - 2.6.3.0-2 - buildrequires mesa-libGLU-devel From 08afee30ddbf47ce92f8ed950bf236ddeede7695 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Fri, 31 Mar 2006 14:13:49 +0000 Subject: [PATCH 09/22] Rel number bump. Sorry for noise. --- wxPython.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxPython.spec b/wxPython.spec index 27dce63..0e046cf 100644 --- a/wxPython.spec +++ b/wxPython.spec @@ -5,7 +5,7 @@ Name: wxPython Version: 2.6.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GUI toolkit for the Python programming language @@ -90,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Mar 31 2006 Matthew Miller - 2.6.3.0-4 +- grr. bump relnumber. + * Fri Mar 31 2006 Matthew Miller - 2.6.3.0-3 - oh yeah -- wxversion.py not lib64. From 66347b7dd7a5cb779f62c63b345af54f18ca4d2a Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Fri, 31 Mar 2006 18:46:12 +0000 Subject: [PATCH 10/22] mesa-*-devel -> just *-devel --- wxPython.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wxPython.spec b/wxPython.spec index 0e046cf..74e5d5e 100644 --- a/wxPython.spec +++ b/wxPython.spec @@ -5,7 +5,7 @@ Name: wxPython Version: 2.6.3.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GUI toolkit for the Python programming language @@ -17,7 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: wxGTK-devel = 2.6.3, pkgconfig BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel -BuildRequires: mesa-libGLU-devel +BuildRequires: libGLU-devel BuildRequires: python-devel, wxGTK-gl # packages should depend on "wxPython", not "wxPythonGTK2", but in case @@ -90,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Mar 31 2006 Matthew Miller - 2.6.3.0-5 +- mesa-libGLU-devel -> libGLU-devel, for FC4 and for The Future + * Fri Mar 31 2006 Matthew Miller - 2.6.3.0-4 - grr. bump relnumber. From 7e2ddbdbc3554e413d11c7204cf5bab9e90f6ec1 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Thu, 13 Apr 2006 21:09:03 +0000 Subject: [PATCH 11/22] - version 2.6.3.2 - move wxversion.py _into_ lib64. Apparently that's the right thing to do. :) - upstream tarball no longer includes embedded.o (since I finally got around to pointing that out to the developers instead of just kludging it away.) - buildrequires to just libGLU-devel instead of mesa-libGL-devel --- .cvsignore | 2 +- sources | 2 +- wxPython.spec | 26 ++++++++++++++++---------- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6500640..b6500b9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wxPython-src-2.6.3.0.tar.gz +wxPython-src-2.6.3.2.tar.gz diff --git a/sources b/sources index 8ff4a1b..464223d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2891a496f4a415179e6a231619344b27 wxPython-src-2.6.3.0.tar.gz +a27546fab8a8d77eb6b67954e6362269 wxPython-src-2.6.3.2.tar.gz diff --git a/wxPython.spec b/wxPython.spec index 74e5d5e..00e2eaa 100644 --- a/wxPython.spec +++ b/wxPython.spec @@ -4,8 +4,8 @@ %define buildflags WXPORT=gtk2 UNICODE=1 Name: wxPython -Version: 2.6.3.0 -Release: 5%{?dist} +Version: 2.6.3.2 +Release: 1%{?dist} Summary: GUI toolkit for the Python programming language @@ -17,7 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: wxGTK-devel = 2.6.3, pkgconfig BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel -BuildRequires: libGLU-devel +BuildRequires: libGL-devel, libGLU-devel BuildRequires: python-devel, wxGTK-gl # packages should depend on "wxPython", not "wxPythonGTK2", but in case @@ -46,9 +46,6 @@ programs which use the wxPython toolkit. %prep %setup -q -n wxPython-src-%{version} -# There's binaries included in the source tarball, resulting in bogus -# dependencies for the package -- clean it up: -rm wxPython/samples/embedded/embedded wxPython/samples/embedded/embedded.o %build # Just build the wxPython part, not all of wxWindows which we already have @@ -64,6 +61,11 @@ rm -rf $RPM_BUILD_ROOT cd wxPython python setup.py %{buildflags} install --root=$RPM_BUILD_ROOT +# this is a kludge.... +%if "%{python_sitelib}" != "%{python_sitearch}" +mv $RPM_BUILD_ROOT%{python_sitelib}/wx.pth $RPM_BUILD_ROOT%{python_sitearch} +mv $RPM_BUILD_ROOT%{python_sitelib}/wxversion.py* $RPM_BUILD_ROOT%{python_sitearch} +%endif %clean rm -rf $RPM_BUILD_ROOT @@ -73,8 +75,8 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc wxPython/docs wxPython/demo wxPython/licence/ wxPython/samples %{_bindir}/* -%{python_sitelib}/wx.pth -%{python_sitelib}/wxversion.py* +%{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 @@ -90,8 +92,12 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Fri Mar 31 2006 Matthew Miller - 2.6.3.0-5 -- mesa-libGLU-devel -> libGLU-devel, for FC4 and for The Future +* Thu Apr 13 2006 Matthew Miller - 2.6.3.2-1 +- version 2.6.3.2 +- move wxversion.py _into_ lib64. Apparently that's the right thing to do. :) +- upstream tarball no longer includes embedded.o (since I finally got around + to pointing that out to the developers instead of just kludging it away.) +- buildrequires to just libGLU-devel instead of mesa-libGL-devel * Fri Mar 31 2006 Matthew Miller - 2.6.3.0-4 - grr. bump relnumber. From a09e05be8cffef68dfdef4d2b9845d39b494b874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 27 Aug 2006 21:14:57 +0000 Subject: [PATCH 12/22] http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild --- needs.rebuild | 1 + 1 file changed, 1 insertion(+) create mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild new file mode 100644 index 0000000..815fd29 --- /dev/null +++ b/needs.rebuild @@ -0,0 +1 @@ +http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 7571d41802c00a194df4a4fb66308a6a76fc7aee Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Mon, 28 Aug 2006 20:05:21 +0000 Subject: [PATCH 13/22] bump release for FC6 rebuild. --- wxPython.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxPython.spec b/wxPython.spec index 00e2eaa..a4825b5 100644 --- a/wxPython.spec +++ b/wxPython.spec @@ -5,7 +5,7 @@ Name: wxPython Version: 2.6.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GUI toolkit for the Python programming language @@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Aug 28 2006 Matthew Miller - 2.6.3.2-2 +- bump release for FC6 rebuild + * Thu Apr 13 2006 Matthew Miller - 2.6.3.2-1 - version 2.6.3.2 - move wxversion.py _into_ lib64. Apparently that's the right thing to do. :) From 1ee0c93c4816e390ecec05625e830b46a2e6096a Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Thu, 7 Sep 2006 20:27:07 +0000 Subject: [PATCH 14/22] built succesfully a while ago. removing needs.rebuild. --- needs.rebuild | 1 - 1 file changed, 1 deletion(-) delete mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild deleted file mode 100644 index 815fd29..0000000 --- a/needs.rebuild +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 6758ce62a116975a6e81280b80f0f06b69c79263 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Mon, 11 Dec 2006 15:24:46 +0000 Subject: [PATCH 15/22] - bump release for rebuild against python 2.5. --- wxPython.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxPython.spec b/wxPython.spec index a4825b5..e37825a 100644 --- a/wxPython.spec +++ b/wxPython.spec @@ -5,7 +5,7 @@ Name: wxPython Version: 2.6.3.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GUI toolkit for the Python programming language @@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 6264856c0a70061cbef373478aeab32c0ebef0fc Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Fri, 15 Dec 2006 15:00:29 +0000 Subject: [PATCH 16/22] Update to new 2.8.0.1 release. 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 --- .cvsignore | 2 +- sources | 2 +- wxPython.spec | 32 +++++++++++++++++++------------- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.cvsignore b/.cvsignore index b6500b9..aa18fd0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wxPython-src-2.6.3.2.tar.gz +wxPython-src-2.8.0.1.tar.bz2 diff --git a/sources b/sources index 464223d..c80075c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a27546fab8a8d77eb6b67954e6362269 wxPython-src-2.6.3.2.tar.gz +5d4000fa5fc330519e882e6cc115b000 wxPython-src-2.8.0.1.tar.bz2 diff --git a/wxPython.spec b/wxPython.spec index e37825a..b6e8867 100644 --- a/wxPython.spec +++ b/wxPython.spec @@ -4,18 +4,18 @@ %define buildflags WXPORT=gtk2 UNICODE=1 Name: wxPython -Version: 2.6.3.2 -Release: 3%{?dist} +Version: 2.8.0.1 +Release: 1%{?dist} 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 +BuildRequires: wxGTK-devel >= 2.8.0-2.8.0.1, pkgconfig BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel BuildRequires: libGL-devel, libGLU-devel BuildRequires: python-devel, wxGTK-gl @@ -77,21 +77,27 @@ 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 %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 +* 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. From 1255630b7579acbe06801dd3ebe7a7c9393513de Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Sun, 15 Apr 2007 17:52:30 +0000 Subject: [PATCH 17/22] update to 2.8.3.0 --- .cvsignore | 2 +- sources | 2 +- wxPython.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index aa18fd0..52b2d28 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wxPython-src-2.8.0.1.tar.bz2 +wxPython-src-2.8.3.0.tar.bz2 diff --git a/sources b/sources index c80075c..110c684 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5d4000fa5fc330519e882e6cc115b000 wxPython-src-2.8.0.1.tar.bz2 +8e0e7ccf002a58b354d2dd69754522b4 wxPython-src-2.8.3.0.tar.bz2 diff --git a/wxPython.spec b/wxPython.spec index b6e8867..5038bc4 100644 --- a/wxPython.spec +++ b/wxPython.spec @@ -4,7 +4,7 @@ %define buildflags WXPORT=gtk2 UNICODE=1 Name: wxPython -Version: 2.8.0.1 +Version: 2.8.3.0 Release: 1%{?dist} Summary: GUI toolkit for the Python programming language @@ -15,7 +15,7 @@ URL: http://www.wxpython.org/ Source0: http://dl.sf.net/wxpython/wxPython-src-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: wxGTK-devel >= 2.8.0-2.8.0.1, pkgconfig +BuildRequires: wxGTK-devel >= 2.8.3, pkgconfig BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel BuildRequires: libGL-devel, libGLU-devel BuildRequires: python-devel, wxGTK-gl @@ -93,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 From 5a53797e307ff1092debb5af82ca848f73b3c961 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 18 May 2007 11:11:37 +0000 Subject: [PATCH 18/22] Initialize branch F-7 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..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From 395855c5cb9b95ed0d2e19201a9a9bc732da3a01 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Thu, 12 Jul 2007 15:22:17 +0000 Subject: [PATCH 19/22] - update to 2.8.4.0 - obsolete compat-wxPythonGTK --- .cvsignore | 2 +- sources | 2 +- wxPython.spec | 11 +++++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 52b2d28..22b91cf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wxPython-src-2.8.3.0.tar.bz2 +wxPython-src-2.8.4.0.tar.bz2 diff --git a/sources b/sources index 110c684..0d30ff5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8e0e7ccf002a58b354d2dd69754522b4 wxPython-src-2.8.3.0.tar.bz2 +424f5a569635646eb805adfe4e4dd9ec wxPython-src-2.8.4.0.tar.bz2 diff --git a/wxPython.spec b/wxPython.spec index 5038bc4..d475b7a 100644 --- a/wxPython.spec +++ b/wxPython.spec @@ -4,7 +4,7 @@ %define buildflags WXPORT=gtk2 UNICODE=1 Name: wxPython -Version: 2.8.3.0 +Version: 2.8.4.0 Release: 1%{?dist} Summary: GUI toolkit for the Python programming language @@ -15,7 +15,7 @@ URL: http://www.wxpython.org/ Source0: http://dl.sf.net/wxpython/wxPython-src-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: wxGTK-devel >= 2.8.3, pkgconfig +BuildRequires: wxGTK-devel >= 2.8.4, pkgconfig BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel BuildRequires: libGL-devel, libGLU-devel BuildRequires: python-devel, wxGTK-gl @@ -24,6 +24,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 @@ -93,6 +96,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 From 0bbb640838716fa0838605c2159a9a7927617c77 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Sat, 7 Jun 2008 12:04:36 +0000 Subject: [PATCH 20/22] clog --- .cvsignore | 2 +- sources | 2 +- wxPython.spec | 33 +++++++++++++++++++++++++++++---- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 22b91cf..1097728 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wxPython-src-2.8.4.0.tar.bz2 +wxPython-src-2.8.7.1.tar.bz2 diff --git a/sources b/sources index 0d30ff5..ddd1250 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -424f5a569635646eb805adfe4e4dd9ec wxPython-src-2.8.4.0.tar.bz2 +04fc1079430b18e6fd097b3287e9ae10 wxPython-src-2.8.7.1.tar.bz2 diff --git a/wxPython.spec b/wxPython.spec index d475b7a..ba28ce7 100644 --- a/wxPython.spec +++ b/wxPython.spec @@ -4,8 +4,8 @@ %define buildflags WXPORT=gtk2 UNICODE=1 Name: wxPython -Version: 2.8.4.0 -Release: 1%{?dist} +Version: 2.8.7.1 +Release: 4%{?dist} Summary: GUI toolkit for the Python programming language @@ -14,8 +14,9 @@ License: LGPL URL: http://www.wxpython.org/ Source0: http://dl.sf.net/wxpython/wxPython-src-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: wxGTK-devel >= 2.8.4, 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 @@ -84,6 +85,10 @@ rm -rf $RPM_BUILD_ROOT %{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,-) @@ -96,6 +101,26 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jun 6 2008 Matthew Miller - 2.8.7.1-4 +- gratuitously bump package release number to work around build system + glitch. again, but it will work this time. + +* Wed Jun 4 2008 Matthew Miller - 2.8.7.1-3 +- gratuitously bump package release number to work around build system + glitch + +* 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 From 4d0a2052471553747fa36d96e2fb465163341420 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:19:42 +0000 Subject: [PATCH 21/22] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 619b49e..210e4d1 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 4b3a72d2eb813fab3e906ce890dc1546e7b6bb3c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:29:07 +0000 Subject: [PATCH 22/22] 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 210e4d1..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wxPython -# $Id$ -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 c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7