- updated to 3.12.0

- updated link patch
- *-devel packages are now metapackages pulling appropriate python version specific dependencies

diff --git a/link.patch b/link.patch
index 5c778c8b8deb4f2b16c8fe133cb78f61627c86ad..2fecb3d24d697b8190cae66595af4e7d6ed20f44 100644 (file)
--- a/link.patch
+++ b/link.patch
@@ -29,41 +29,3 @@
  
  AC_MSG_CHECKING([for PySignal_SetWakeupFd in Python.h])
  old_CPPFLAGS=$CPPFLAGS
---- pygobject-3.0.0/gi/_gobject/Makefile.am.wiget      2011-09-24 20:07:59.829604244 +0200
-+++ pygobject-3.0.0/gi/_gobject/Makefile.am    2011-09-24 20:08:32.401508942 +0200
-@@ -12,13 +12,13 @@ extension_ldflags = \
-       -module \
-       -avoid-version
- 
-+extension_libadd = \
-+      $(PYTHON_LIBS)
-+
- if OS_WIN32
- # Windows requires Python modules to be explicitly linked to libpython.
- # Extension modules are shared libaries (.dll), but need to be
- # called .pyd for Python to load it as an extension module.
--extension_libadd = \
--      $(PYTHON_LIBS)
--
- extension_ldflags += \
-       -no-undefined \
-       -shrext ".pyd"
---- pygobject-3.0.0/gi/_glib/Makefile.am.wiget 2011-09-24 20:07:15.244891968 +0200
-+++ pygobject-3.0.0/gi/_glib/Makefile.am       2011-09-24 20:07:33.914073757 +0200
-@@ -8,13 +8,13 @@ extension_ldflags = \
-       -module \
-       -avoid-version
- 
-+extension_libadd = \
-+      $(PYTHON_LIBS)
-+
- if OS_WIN32
- # Windows requires Python modules to be explicitly linked to libpython.
- # Extension modules are shared libaries (.dll), but need to be
- # called .pyd for Python to load it as an extension module.
--extension_libadd = \
--      $(PYTHON_LIBS)
--
- extension_ldflags += \
-       -no-undefined \
-       -shrext ".pyd"

diff --git a/python-pygobject3.spec b/python-pygobject3.spec
index 6d17cd61b0ff6efe63dc9272f1ea6ef23b4335ba..29649498407d175f8e3cd96d3bbe9f75b2ca2387 100644 (file)
--- a/python-pygobject3.spec
+++ b/python-pygobject3.spec
@@ -7,21 +7,21 @@
 Summary:       Python bindings for GObject library
 Summary(pl.UTF-8):     Wiązania Pythona do biblioteki GObject
 Name:          python-pygobject3
-Version:       3.10.2
+Version:       3.12.0
 Release:       1
 License:       LGPL v2+
 Group:         Libraries/Python
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.10/%{module}-%{version}.tar.xz
-# Source0-md5: f311155be8510df6ad8e4edf1cb463d4
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.12/%{module}-%{version}.tar.xz
+# Source0-md5: f62700cdd7919b5afbc1de54569df648
 Patch0:                link.patch
 URL:           https://live.gnome.org/PyGObject
 BuildRequires: autoconf >= 2.68
 BuildRequires: automake >= 1:1.11.1
 %{?with_python3:BuildRequires: automake >= 1:1.13}
 BuildRequires: cairo-gobject-devel
-BuildRequires: glib2-devel >= 1:2.35.9
+BuildRequires: glib2-devel >= 1:2.38.0
 BuildRequires: gnome-common >= 3.10
-BuildRequires: gobject-introspection-devel >= 1.35.9
+BuildRequires: gobject-introspection-devel >= 1.38.0
 BuildRequires: libffi-devel >= 3.0
 BuildRequires: libtool >= 2:2.2.6
 BuildRequires: pkgconfig
@@ -40,8 +40,8 @@ BuildRequires:        python3-devel >= 3.2.2-3
 BuildRequires: python3-modules >= 3.2.2-3
 BuildRequires: python3-pycairo-devel >= 1.10.0
 %endif
-Requires:      glib2 >= 1:2.35.9
-Requires:      gobject-introspection >= 1.35.9
+Requires:      glib2 >= 1:2.38.0
+Requires:      gobject-introspection >= 1.38.0
 Conflicts:     python-pygobject < 2.28.6-3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -56,7 +56,7 @@ Summary:      Python bindings for GObject library
 Summary(pl.UTF-8):     Wiązania Pythona do biblioteki GObject
 Group:         Development/Languages/Python
 Requires:      %{name} = %{version}-%{release}
-Requires:      glib2-devel >= 1:2.35.9
+Requires:      glib2-devel >= 1:2.38.0
 Requires:      libffi-devel >= 3.0
 
 %description common-devel
@@ -70,29 +70,29 @@ biblioteki GObject, tak by mogły te biblioteki kooperowaći z
 wiązaniami Pythona.
 
 %package devel
-Summary:       Python bindings for GObject library
-Summary(pl.UTF-8):     Wiązania Pythona do biblioteki GObject
+Summary:       Python 2 bindings for GObject library - development metapackage
+Summary(pl.UTF-8):     Wiązania Pythona 2 do biblioteki GObject - metapakiet programistyczny
 Group:         Development/Languages/Python
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-common-devel = %{version}-%{release}
-Requires:      glib2-devel >= 1:2.35.9
+Requires:      glib2-devel >= 1:2.38.0
 Requires:      libffi-devel >= 3.0
 Requires:      python-devel >= 1:2.6
 
 %description devel
-This package contains files required to build wrappers for GObject
-addon libraries so that they interoperate with Python bindings.
+This metapackage gathers files required to develop GObject bindings
+for Python 2.
 
 %description devel -l pl.UTF-8
-Pakiet zawiera pliki wymagane do zbudowania funkcji do biblioteki
-GObject, tak by mogły te biblioteki kooperować z wiązaniami Pythona.
+Ten metapakiet gromadzi pliki wymagane do tworzenia wiązań biblioteki
+GObject dla Pythona 2.
 
 %package -n python3-pygobject3
 Summary:       Python 3.x bindings for GObject library
 Summary(pl.UTF-8):     Wiązania Pythona 3.x do biblioteki GObject
 Group:         Libraries/Python
-Requires:      glib2 >= 1:2.35.9
-Requires:      gobject-introspection >= 1.35.9
+Requires:      glib2 >= 1:2.38.0
+Requires:      gobject-introspection >= 1.38.0
 Conflicts:     python3-pygobject < 2.28.6-3
 
 %description -n python3-pygobject3
@@ -102,22 +102,22 @@ Python 3.x bindings for GObject library.
 Wiązania Pythona 3.x do biblioteki GObject.
 
 %package -n python3-pygobject3-devel
-Summary:       Python bindings for GObject library
-Summary(pl.UTF-8):     Wiązania Pythona do biblioteki GObject
+Summary:       Python 3 bindings for GObject library - development metapackage
+Summary(pl.UTF-8):     Wiązania Pythona 3 do biblioteki GObject - metapakiet programistyczny
 Group:         Development/Languages/Python
 Requires:      %{name}-common-devel = %{version}-%{release}
-Requires:      glib2-devel >= 1:2.35.9
+Requires:      glib2-devel >= 1:2.38.0
 Requires:      libffi-devel >= 3.0
 Requires:      python3-devel >= 3.2
 Requires:      python3-pygobject3 = %{version}-%{release}
 
 %description -n python3-pygobject3-devel
-This package contains files required to build wrappers for GObject
-addon libraries so that they interoperate with Python bindings.
+This metapackage gathers files required to develop GObject bindings
+for Python 3.
 
 %description -n python3-pygobject3-devel -l pl.UTF-8
-Pakiet zawiera pliki wymagane do zbudowania funkcji do biblioteki
-GObject, tak by mogły te biblioteki kooperować z wiązaniami Pythona.
+Ten metapakiet gromadzi pliki wymagane do tworzenia wiązań biblioteki
+GObject dla Pythona 3.
 
 %package examples
 Summary:       Example programs for GObject library
@@ -179,31 +179,21 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 cp -a examples/*.py $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
-
 %if %{with python2}
-%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/gi/{*/,}/*.la
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/gi/*.la
 %py_postclean
 %endif
 %if %{with python3}
-%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/gi/{*/,}*.la
+%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/gi/*.la
 %endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%post  -n python3-pygobject3 -p /sbin/ldconfig
-%postun        -n python3-pygobject3 -p /sbin/ldconfig
-
 %if %{with python2}
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_libdir}/libpyglib-gi-2.0-python.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpyglib-gi-2.0-python.so.0
 %dir %{py_sitedir}/gi
 %attr(755,root,root) %{py_sitedir}/gi/_gi.so
 %attr(755,root,root) %{py_sitedir}/gi/_gi_cairo.so
@@ -212,11 +202,7 @@ rm -rf $RPM_BUILD_ROOT
 %{py_sitedir}/gi/overrides/*.py[co]
 %dir %{py_sitedir}/gi/repository
 %{py_sitedir}/gi/repository/*.py[co]
-%dir %{py_sitedir}/gi/_glib
-%attr(755,root,root) %{py_sitedir}/gi/_glib/_glib.so
-%{py_sitedir}/gi/_glib/*.py[co]
 %dir %{py_sitedir}/gi/_gobject
-%attr(755,root,root) %{py_sitedir}/gi/_gobject/_gobject.so
 %{py_sitedir}/gi/_gobject/*.py[co]
 %dir %{py_sitedir}/pygtkcompat
 %{py_sitedir}/pygtkcompat/*.py[co]
@@ -229,26 +215,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpyglib-gi-2.0-python.so
 %endif
 
 %if %{with python3}
 %files -n python3-pygobject3
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_libdir}/libpyglib-gi-2.0-python3.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpyglib-gi-2.0-python3.so.0
 %dir %{py3_sitedir}/gi
 %attr(755,root,root) %{py3_sitedir}/gi/_gi.cpython*.so
 %attr(755,root,root) %{py3_sitedir}/gi/_gi_cairo.cpython*.so
 %{py3_sitedir}/gi/*.py
 %{py3_sitedir}/gi/__pycache__
-%dir %{py3_sitedir}/gi/_glib
-%attr(755,root,root) %{py3_sitedir}/gi/_glib/_glib.cpython*.so
-%{py3_sitedir}/gi/_glib/*.py
-%{py3_sitedir}/gi/_glib/__pycache__
 %dir %{py3_sitedir}/gi/_gobject
-%attr(755,root,root) %{py3_sitedir}/gi/_gobject/_gobject.cpython*.so
 %{py3_sitedir}/gi/_gobject/*.py
 %{py3_sitedir}/gi/_gobject/__pycache__
 %dir %{py3_sitedir}/gi/overrides
@@ -264,7 +242,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n python3-pygobject3-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpyglib-gi-2.0-python3.so
 %endif
 
 %files examples