From 522d8573a97cfcc14068e239bdb72a068a0ebe9d Mon Sep 17 00:00:00 2001 From: gafton Date: Wed, 24 Nov 2004 05:08:05 +0000 Subject: [PATCH 01/11] Fix braindead typo from the original import --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 40ffebb..1ce9dd4 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # Makefile for source rpm: wxPythonGTK2 -# $Id$ +# $Id: Makefile,v 1.1 2004/11/08 05:33:06 cvsextras Exp $ NAME := wxPythonGTK2 SPECFILE = $(firstword $(wildcard *.spec)) @@ -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 a5661f5c4d7222e7d91ccb4cff27fc0b11575e42 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Fri, 10 Dec 2004 22:03:12 +0000 Subject: [PATCH 02/11] Bump release, strip off fedora.us prefix and dist tag. --- wxPython.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wxPython.spec b/wxPython.spec index 7dfd06c..a2f1156 100644 --- a/wxPython.spec +++ b/wxPython.spec @@ -4,7 +4,7 @@ Name: wxPythonGTK2 Version: 2.4.2.4 -Release: 0.fdr.3.2 +Release: 3 Epoch: 0 Summary: wxPython is a GUI toolkit for the Python programming language. From 8ecfc19a995a51f5f00296a60a6fc73a99328c83 Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Thu, 10 Feb 2005 19:02:14 +0000 Subject: [PATCH 03/11] 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 a2f1156..6687c38 100644 --- a/wxPython.spec +++ b/wxPython.spec @@ -4,7 +4,7 @@ Name: wxPythonGTK2 Version: 2.4.2.4 -Release: 3 +Release: 4 Epoch: 0 Summary: wxPython is a GUI toolkit for the Python programming language. @@ -36,6 +36,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 # There's a binary included in sources resulting in bogus libwx_gtk2-2.3.so.0 @@ -59,6 +61,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/python%{pyver}/site-packages/wx %changelog +* 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 From 71663fd128cc057842d18311bd9718fc6726689f Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Sat, 5 Mar 2005 19:55:54 +0000 Subject: [PATCH 04/11] Mass letter "u", "v" and "w" update, one or more apply : - Drop epoch: 0 - Remove %{epoch} requirements in sub-packages - Remove trailing white spaces - Keep consistent between spaces and tabs --- wxPython.spec | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/wxPython.spec b/wxPython.spec index 6687c38..23c9c52 100644 --- a/wxPython.spec +++ b/wxPython.spec @@ -5,8 +5,7 @@ Name: wxPythonGTK2 Version: 2.4.2.4 Release: 4 -Epoch: 0 -Summary: wxPython is a GUI toolkit for the Python programming language. +Summary: GUI toolkit for the Python programming language Group: Development/Languages License: LGPL @@ -14,19 +13,19 @@ 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 +BuildRequires: wxGTK2-devel >= 2.4.2, pkgconfig +BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel +BuildRequires: python-devel, wxGTK2-gl Requires: %{_bindir}/python%{pyver} # This is what other packages should depend on, NOT the package name! -Provides: wxPython = %{epoch}:%{version}-%{release} +Provides: wxPython = %{version}-%{release} %description -wxPython is a GUI toolkit for the Python programming language. It allows +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 +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 @@ -55,7 +54,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc wxPython/docs wxPython/demo wxPython/licence/ wxPython/samples +%doc wxPython/docs wxPython/demo wxPython/licence/ wxPython/samples %{_bindir}/* %{_libdir}/python%{pyver}/site-packages/wxPython %{_libdir}/python%{pyver}/site-packages/wx From 23b1b1f616f5a1d0e22772c739c480dc1f6535c5 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Wed, 6 Apr 2005 22:13:53 +0000 Subject: [PATCH 05/11] mass release bump for packages not rebuilt after FC-3-split --- wxPython.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wxPython.spec b/wxPython.spec index 23c9c52..de54da4 100644 --- a/wxPython.spec +++ b/wxPython.spec @@ -4,7 +4,8 @@ Name: wxPythonGTK2 Version: 2.4.2.4 -Release: 4 +Release: 5 + Summary: GUI toolkit for the Python programming language Group: Development/Languages @@ -60,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/python%{pyver}/site-packages/wx %changelog +* Fri Apr 7 2005 Michael Schwendt +- rebuilt + * 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 From a7a362b4e4b5118170892feaea5138a9e29ea37d Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Wed, 11 May 2005 09:32:05 +0000 Subject: [PATCH 06/11] bump + minor cleanup, then rebuild for ppc, too --- wxPython.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/wxPython.spec b/wxPython.spec index de54da4..28e130a 100644 --- a/wxPython.spec +++ b/wxPython.spec @@ -1,13 +1,12 @@ -%define pyver %(python -c 'import sys ; print sys.version[:3]') +# sitelib not sitearch, see build section +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define buildflags WXPORT=gtk2 UNICODE=1 Name: wxPythonGTK2 Version: 2.4.2.4 -Release: 5 - +Release: 6 Summary: GUI toolkit for the Python programming language - Group: Development/Languages License: LGPL URL: http://www.wxpython.org/ @@ -17,7 +16,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: wxGTK2-devel >= 2.4.2, pkgconfig BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel BuildRequires: python-devel, wxGTK2-gl -Requires: %{_bindir}/python%{pyver} # This is what other packages should depend on, NOT the package name! Provides: wxPython = %{version}-%{release} @@ -57,11 +55,16 @@ rm -rf $RPM_BUILD_ROOT %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 +%{python_sitelib}/wxPython/ +%{python_sitelib}/wx/ %changelog -* Fri Apr 7 2005 Michael Schwendt +* Wed May 11 2005 Michael Schwendt 2.4.2.4-6 +- rebuilt +- use %%python_sitelib macro +- drop dependency on python binary, python(abi) dependency is automatic + +* Thu Apr 7 2005 Michael Schwendt 2.4.2.4-5 - rebuilt * Tue Feb 08 2005 Thorsten Leemhuis 0:2.4.2.4-4 From 7b87f1172dcf42bdfb1a79e68e4ae6db2e041cd4 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Wed, 11 May 2005 11:46:24 +0000 Subject: [PATCH 07/11] - d'oh, it's sitearch here --- wxPython.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/wxPython.spec b/wxPython.spec index 28e130a..0deb0f0 100644 --- a/wxPython.spec +++ b/wxPython.spec @@ -1,11 +1,10 @@ -# sitelib not sitearch, see build section -%{!?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: wxPythonGTK2 Version: 2.4.2.4 -Release: 6 +Release: 7 Summary: GUI toolkit for the Python programming language Group: Development/Languages License: LGPL @@ -55,10 +54,13 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc wxPython/docs wxPython/demo wxPython/licence/ wxPython/samples %{_bindir}/* -%{python_sitelib}/wxPython/ -%{python_sitelib}/wx/ +%{python_sitearch}/wxPython/ +%{python_sitearch}/wx/ %changelog +* Wed May 11 2005 Michael Schwendt 2.4.2.4-7 +- d'oh, it's sitearch here + * Wed May 11 2005 Michael Schwendt 2.4.2.4-6 - rebuilt - use %%python_sitelib macro From 31236d67c3c932bdc2827cb581d2088b3d8d7fe8 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Mon, 13 Feb 2006 20:41:28 +0000 Subject: [PATCH 08/11] update for FC5; add note about future plans to changelog. --- wxPython.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/wxPython.spec b/wxPython.spec index 0deb0f0..03f7c44 100644 --- a/wxPython.spec +++ b/wxPython.spec @@ -4,7 +4,7 @@ Name: wxPythonGTK2 Version: 2.4.2.4 -Release: 7 +Release: 7.1 Summary: GUI toolkit for the Python programming language Group: Development/Languages License: LGPL @@ -58,6 +58,12 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/wx/ %changelog +* Mon Feb 13 2006 Matthew Miller - 2.4.2.4-7.1 +- rebuild in preparation for FC5 +- note for future -- this package is soon to be replaced with + wxPython 2.6.2.3 (dropping the GTK2 from the package name). See + bug #163440 and bug #154618 for details. + * Wed May 11 2005 Michael Schwendt 2.4.2.4-7 - d'oh, it's sitearch here From 3ac3c246be5c1b8cb9061f23f2594942e55c27d0 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Fri, 31 Mar 2006 15:31:52 +0000 Subject: [PATCH 09/11] removed -- moving this back to 'wxPython'. --- sources | 1 - wxPython.spec | 90 --------------------------------------------------- 2 files changed, 91 deletions(-) delete mode 100644 sources delete mode 100644 wxPython.spec 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 03f7c44..0000000 --- a/wxPython.spec +++ /dev/null @@ -1,90 +0,0 @@ -%{!?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: wxPythonGTK2 -Version: 2.4.2.4 -Release: 7.1 -Summary: 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 >= 2.4.2, pkgconfig -BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel -BuildRequires: python-devel, wxGTK2-gl - -# This is what other packages should depend on, NOT the package name! -Provides: wxPython = %{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++. - -%prep -%setup -q -n wxPythonSrc-%{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 - -# There's a binary included in sources resulting in bogus libwx_gtk2-2.3.so.0 -# dependency for the package, clean it up -cd demo/dllwidget -make clean - -%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}/wxPython/ -%{python_sitearch}/wx/ - -%changelog -* Mon Feb 13 2006 Matthew Miller - 2.4.2.4-7.1 -- rebuild in preparation for FC5 -- note for future -- this package is soon to be replaced with - wxPython 2.6.2.3 (dropping the GTK2 from the package name). See - bug #163440 and bug #154618 for details. - -* Wed May 11 2005 Michael Schwendt 2.4.2.4-7 -- d'oh, it's sitearch here - -* Wed May 11 2005 Michael Schwendt 2.4.2.4-6 -- rebuilt -- use %%python_sitelib macro -- drop dependency on python binary, python(abi) dependency is automatic - -* Thu Apr 7 2005 Michael Schwendt 2.4.2.4-5 -- rebuilt - -* 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 023f9bc93b151343c18a73908bd175abd3cc8de1 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 10/11] 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 83041c439685b0ea7d66fc16c4b26aefd12ed24f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 18 Sep 2006 19:04:20 +0000 Subject: [PATCH 11/11] Use dead.package. --- .cvsignore | 1 - Makefile | 21 --------------------- dead.package | 1 + needs.rebuild | 1 - 4 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 .cvsignore delete mode 100644 Makefile create mode 100644 dead.package delete mode 100644 needs.rebuild 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 1ce9dd4..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wxPythonGTK2 -# $Id: Makefile,v 1.1 2004/11/08 05:33:06 cvsextras Exp $ -NAME := wxPythonGTK2 -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/dead.package b/dead.package new file mode 100644 index 0000000..100e634 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Renamed to wxPython. 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