From d8739cfa674dc506f1cc5475afec596525cf011d072865d6a3599f8ce71be069 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sun, 8 Aug 2010 13:40:28 +0000 Subject: [PATCH] Accepting request 44890 from home:vuntz:branches:devel:languages:python Copy from home:vuntz:branches:devel:languages:python/python-gtk via accept of submit request 44890 revision 3. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/44890 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-gtk?expand=0&rev=12 --- pygtk-2.17.0.tar.bz2 | 3 --- pygtk-2.21.0.tar.bz2 | 3 +++ python-gtk-fix-pkg-config.patch | 20 --------------- python-gtk.changes | 13 ++++++++++ python-gtk.spec | 44 +++++++++++++++++++-------------- 5 files changed, 42 insertions(+), 41 deletions(-) delete mode 100644 pygtk-2.17.0.tar.bz2 create mode 100644 pygtk-2.21.0.tar.bz2 delete mode 100644 python-gtk-fix-pkg-config.patch diff --git a/pygtk-2.17.0.tar.bz2 b/pygtk-2.17.0.tar.bz2 deleted file mode 100644 index 22c8890..0000000 --- a/pygtk-2.17.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6a61817a2e765c6209c72ecdf44389ec134c1ebed1d842408bf001c9321f1400 -size 2260394 diff --git a/pygtk-2.21.0.tar.bz2 b/pygtk-2.21.0.tar.bz2 new file mode 100644 index 0000000..3535cb7 --- /dev/null +++ b/pygtk-2.21.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:726d345bf063618d19f63e00239176c051ed9b170ea9b7a3505035ca7fc1dffd +size 2285104 diff --git a/python-gtk-fix-pkg-config.patch b/python-gtk-fix-pkg-config.patch deleted file mode 100644 index 02e837d..0000000 --- a/python-gtk-fix-pkg-config.patch +++ /dev/null @@ -1,20 +0,0 @@ -commit a9e24426aae96e5968b95ef76aacf41d3153ddf7 -Author: Colin Walters -Date: Fri Jul 30 10:23:56 2010 -0400 - - [pygtk-2.0.pc] Should require gtk+-2.0 - - https://bugzilla.redhat.com/show_bug.cgi?id=618944 - -diff --git a/pygtk-2.0.pc.in b/pygtk-2.0.pc.in -index 0506e75..e277e80 100644 ---- a/pygtk-2.0.pc.in -+++ b/pygtk-2.0.pc.in -@@ -20,6 +20,6 @@ codegendir=${datadir}/pygobject/2.0/codegen - - Name: PyGTK - Description: Python bindings for GTK+ and related libraries --Requires: pygobject-2.0 -+Requires: pygobject-2.0 gtk+-2.0 - Version: @VERSION@ - Cflags: -I${pygtkincludedir} @THREADING_CFLAGS@ diff --git a/python-gtk.changes b/python-gtk.changes index c33ece8..eac5773 100644 --- a/python-gtk.changes +++ b/python-gtk.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sun Aug 8 14:27:13 CEST 2010 - vuntz@opensuse.org + +- Update to version 2.21.0: + + Bump version number so next stable release will be aligned with + the final gtk+-2.0 release (gtk+-2.22) + + Wrap new API added in GTK/GDK 2.21/2.22 + + Wrap new API added in GTK/GDK 2.20 + + Add forgotten API from GTK/GDK 2.12/14/16/18/20 +- Drop python-gtk-fix-pkg-config.patch: fixed upstream. +- Move /usr/share/pygobject/ and files belonging to the demo + application to devel subpackage. + ------------------------------------------------------------------- Sat Aug 7 12:36:27 CEST 2010 - vuntz@opensuse.org diff --git a/python-gtk.spec b/python-gtk.spec index 1cd70c7..9d36989 100644 --- a/python-gtk.spec +++ b/python-gtk.spec @@ -1,5 +1,5 @@ # -# spec file for package python-gtk (Version 2.17.0) +# spec file for package python-gtk (Version 2.21.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -30,13 +30,11 @@ Requires: python-numpy BuildRequires: gtk-doc Url: http://www.pygtk.org/ Summary: Python bindings for the GTK+ widget set -Version: 2.17.0 -Release: 2 +Version: 2.21.0 +Release: 1 License: LGPLv2.1+ Group: Development/Libraries/Python Source: %{_name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM python-gtk-fix-pkg-config.patch vuntz@opensuse.org -- Taken from upstream -Patch0: python-gtk-fix-pkg-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define lparen ( %define rparen ) @@ -77,7 +75,6 @@ python's benefits. %prep %setup -q -n %{_name}-%{version} -%patch0 -p1 %build %configure @@ -87,9 +84,8 @@ make %{?jobs:-j%jobs} %makeinstall find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -v rm examples/Makefile* -mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} -cp -a AUTHORS NEWS README MAPPING ChangeLog THREADS COPYING examples $RPM_BUILD_ROOT%{_docdir}/%{name} -#chmod +x $RPM_BUILD_ROOT%{_libdir}/pygtk/2.0/{,*/}*.py $RPM_BUILD_ROOT%{_datadir}/pygtk/2.0/*/*.py +# demo is already in devel package +rm -rf examples/pygtk-demo chmod +x $RPM_BUILD_ROOT%{_libdir}/pygtk/2.0/{,*/}*.py %fdupes $RPM_BUILD_ROOT%{_libdir} %fdupes $RPM_BUILD_ROOT%{_datadir} @@ -99,19 +95,31 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc %dir %{_docdir}/%{name} -%doc %{_docdir}/%{name}/[ACMNRT]* -%{py_sitedir}/gtk-2.0/* -%{_datadir}/%{_name} -%{_libdir}/%{_name} +%doc AUTHORS NEWS README MAPPING ChangeLog THREADS COPYING examples +%{py_sitedir}/gtk-2.0/gtk/ +%{py_sitedir}/gtk-2.0/atk.so +%{py_sitedir}/gtk-2.0/gtkunixprint.so +%{py_sitedir}/gtk-2.0/pango*.so %files devel %defattr(-,root,root) -%doc %{_docdir}/%{name}/examples -%{_bindir}/%{_name}-codegen-2.0 -%{_bindir}/%{_name}-demo -%{_includedir}/%{_name}-2.0/%{_name} +%{_includedir}/%{_name}-2.0/%{_name}/ %{_libdir}/pkgconfig/*.pc +## codegen +%{_bindir}/%{_name}-codegen-2.0 +# we explicitly list the directories here to be sure we don't include something +# that should live in the main package +%dir %{_datadir}/%{_name} +%dir %{_datadir}/%{_name}/2.0 +%{_datadir}/%{_name}/2.0/defs/ +## demo +%{_bindir}/%{_name}-demo +# we explicitly list the directories here to be sure we don't include something +# that should live in the main package +%dir %{_libdir}/%{_name} +%dir %{_libdir}/%{_name}/2.0 +%{_libdir}/%{_name}/2.0/demos/ +%{_libdir}/%{_name}/2.0/pygtk-demo.py* %files doc %defattr(-,root,root)