From c7d1ec308c653d11e9159e96bae46646ffcfbb8caebb6d3537761ef08f7ddbba Mon Sep 17 00:00:00 2001 From: Berthold Gunreben Date: Tue, 23 Aug 2011 11:52:10 +0000 Subject: [PATCH] Accepting request 79548 from devel:languages:python OBS-URL: https://build.opensuse.org/request/show/79548 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-gobject2?expand=0&rev=3 --- python-gobject2.changes | 15 +++++++++++++++ python-gobject2.spec | 14 ++++---------- python3-gobject2.changes | 15 +++++++++++++++ python3-gobject2.spec | 14 ++++---------- 4 files changed, 38 insertions(+), 20 deletions(-) diff --git a/python-gobject2.changes b/python-gobject2.changes index c8ac546..2f3007c 100644 --- a/python-gobject2.changes +++ b/python-gobject2.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Aug 22 13:01:34 UTC 2011 - dimstar@opensuse.org + +- Remove gobject-introspection-devel BuildRequires: We no longer + build the gi bindings, as they were moved to python-gobject 3. +- Move the doc from /usr/share/gtk-doc/html/pygobject to pygobject2 + in order to not conflicy with python-gobject 3 on file level. + +------------------------------------------------------------------- +Sat Aug 20 21:15:39 UTC 2011 - dimstar@opensuse.org + +- Pass --disable-introspection to configure. The introspection + based bindings are provided by python-gobject, the newer version + of this code. + ------------------------------------------------------------------- Mon Aug 15 08:46:22 UTC 2011 - dimstar@opensuse.org diff --git a/python-gobject2.spec b/python-gobject2.spec index 0763171..25d0e35 100644 --- a/python-gobject2.spec +++ b/python-gobject2.spec @@ -40,7 +40,6 @@ Source: http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.28/%{_name}-% Patch0: python-gobject-python3.patch BuildRequires: fdupes BuildRequires: glib2-devel -BuildRequires: gobject-introspection-devel BuildRequires: libffi-devel %if %{build_for_python3} BuildRequires: python3-cairo-devel @@ -96,12 +95,14 @@ autoreconf -fi %if %{build_for_python3} export PYTHON=python3 %endif -%configure --disable-static +%configure --disable-static --disable-introspection make %{?jobs:-j%jobs} V=1 %install %makeinstall find %{buildroot} -name '*.la' -delete -print +# Move /usr/share/gtk-doc/html/pygobject to /usr/share/gtk-doc/html/pygobject2 +mv %{buildroot}%{_datadir}/gtk-doc/html/pygobject %{buildroot}%{_datadir}/gtk-doc/html/pygobject2 rm examples/Makefile* %fdupes $RPM_BUILD_ROOT @@ -116,19 +117,12 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %doc AUTHORS NEWS README ChangeLog examples %dir %{local_py_sitedir}/gtk-2.0 -%{local_py_sitedir}/gi/ %{local_py_sitedir}/gtk-2.0/gio/ %{local_py_sitedir}/glib/ %{local_py_sitedir}/gobject/ %{local_py_sitedir}/gtk-2.0/dsextras.py* %{local_py_sitedir}/pygtk.* %{_libdir}/*.so.* -# Live in cairo subpackage -%exclude %{local_py_sitedir}/gi/_gi_cairo.so - -%files cairo -%defattr(-,root,root) -%{local_py_sitedir}/gi/_gi_cairo.so %files devel %defattr(-,root,root) @@ -149,6 +143,6 @@ rm -rf $RPM_BUILD_ROOT # Own these repositories to not depend on gtk-doc while building: %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html -%{_datadir}/gtk-doc/html/pygobject/ +%{_datadir}/gtk-doc/html/pygobject2/ %changelog diff --git a/python3-gobject2.changes b/python3-gobject2.changes index c8ac546..2f3007c 100644 --- a/python3-gobject2.changes +++ b/python3-gobject2.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Aug 22 13:01:34 UTC 2011 - dimstar@opensuse.org + +- Remove gobject-introspection-devel BuildRequires: We no longer + build the gi bindings, as they were moved to python-gobject 3. +- Move the doc from /usr/share/gtk-doc/html/pygobject to pygobject2 + in order to not conflicy with python-gobject 3 on file level. + +------------------------------------------------------------------- +Sat Aug 20 21:15:39 UTC 2011 - dimstar@opensuse.org + +- Pass --disable-introspection to configure. The introspection + based bindings are provided by python-gobject, the newer version + of this code. + ------------------------------------------------------------------- Mon Aug 15 08:46:22 UTC 2011 - dimstar@opensuse.org diff --git a/python3-gobject2.spec b/python3-gobject2.spec index 4620b1d..470c577 100644 --- a/python3-gobject2.spec +++ b/python3-gobject2.spec @@ -40,7 +40,6 @@ Source: http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.28/%{_name}-% Patch0: python-gobject-python3.patch BuildRequires: fdupes BuildRequires: glib2-devel -BuildRequires: gobject-introspection-devel BuildRequires: libffi-devel %if %{build_for_python3} BuildRequires: python3-cairo-devel @@ -96,12 +95,14 @@ autoreconf -fi %if %{build_for_python3} export PYTHON=python3 %endif -%configure --disable-static +%configure --disable-static --disable-introspection make %{?jobs:-j%jobs} V=1 %install %makeinstall find %{buildroot} -name '*.la' -delete -print +# Move /usr/share/gtk-doc/html/pygobject to /usr/share/gtk-doc/html/pygobject2 +mv %{buildroot}%{_datadir}/gtk-doc/html/pygobject %{buildroot}%{_datadir}/gtk-doc/html/pygobject2 rm examples/Makefile* %fdupes $RPM_BUILD_ROOT @@ -116,19 +117,12 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %doc AUTHORS NEWS README ChangeLog examples %dir %{local_py_sitedir}/gtk-2.0 -%{local_py_sitedir}/gi/ %{local_py_sitedir}/gtk-2.0/gio/ %{local_py_sitedir}/glib/ %{local_py_sitedir}/gobject/ %{local_py_sitedir}/gtk-2.0/dsextras.py* %{local_py_sitedir}/pygtk.* %{_libdir}/*.so.* -# Live in cairo subpackage -%exclude %{local_py_sitedir}/gi/_gi_cairo.so - -%files cairo -%defattr(-,root,root) -%{local_py_sitedir}/gi/_gi_cairo.so %files devel %defattr(-,root,root) @@ -149,6 +143,6 @@ rm -rf $RPM_BUILD_ROOT # Own these repositories to not depend on gtk-doc while building: %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html -%{_datadir}/gtk-doc/html/pygobject/ +%{_datadir}/gtk-doc/html/pygobject2/ %changelog