- fix unresolved symbols (link.patch and BR fixed python3)

- removed outdated TODO

Changed files:
    link.patch -> 1.1
    python-pygobject3.spec -> 1.6

diff --git a/link.patch b/link.patch
new file mode 100644 (file)
index 0000000..5c778c8
--- /dev/null
+++ b/link.patch
@@ -0,0 +1,69 @@
+--- pygobject-3.0.0/gi/Makefile.am.wiget       2011-09-24 19:46:02.886052379 +0200
++++ pygobject-3.0.0/gi/Makefile.am     2011-09-24 19:46:24.461794869 +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/configure.ac.wiget 2011-09-24 19:56:06.566708752 +0200
++++ pygobject-3.0.0/configure.ac       2011-09-24 19:56:29.259058498 +0200
+@@ -102,9 +102,7 @@ if test $build_py3k = true ; then
+ fi
+ 
+ AM_CHECK_PYTHON_HEADERS(, AC_MSG_ERROR([Python headers not found]))
+-if test "x$os_win32" = "xyes"; then
+   AM_CHECK_PYTHON_LIBS(, AC_MSG_ERROR([Python libs not found. Windows requires Python modules to be explicitly linked to libpython.]))
+-fi
+ 
+ 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 4cb949dad1cef0fbb08e88b99f3b9af741aca9bb..458f30a5460e4afe4cf01785d6c74c395c5cc4c8 100644 (file)
--- a/python-pygobject3.spec
+++ b/python-pygobject3.spec
@@ -1,5 +1,3 @@
-# TODO:
-# - header file is needed by python-pygobject3-devel and python3-pygobject3-devel
 #
 # Conditional build:
 %bcond_without python2         # Python 2.x module
@@ -11,12 +9,13 @@ Summary:     Python bindings for GObject library
 Summary(pl.UTF-8):     Wiązania Pythona do biblioteki GObject
 Name:          python-%{module}3
 Version:       3.0.0
-Release:       1
+Release:       2
 License:       LGPL v2+
 Group:         Libraries/Python
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.0/%{module}-%{version}.tar.xz
 # Source0-md5: 42b940ec9ed64b1c5f0e79164cd0c93f
 URL:           http://www.pygtk.org/
+Patch0:                link.patch
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake >= 1:1.11
 BuildRequires: glib2-devel >= 1:2.24.0
@@ -33,18 +32,15 @@ BuildRequires:      python-pycairo-devel >= 1.2.0
 %pyrequires_eq python-modules
 %endif
 %if %{with python3}
-BuildRequires: python3 >= 3.1
-BuildRequires: python3-devel >= 3.1
-BuildRequires: python3-modules >= 3.1
+BuildRequires: python3 >= 3.2.2-3
+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.24.0
 Requires:      gobject-introspection >= 1.29.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# python provides Py* and _Py* symbols at runtime
-%define                skip_post_check_so      libpyglib-gi-2.0-python3?.so.*
-
 %description
 Python bindings for GObject library.
 
@@ -142,6 +138,7 @@ Dokumentacja API pygobject.
 
 %prep
 %setup -q -n %{module}-%{version}
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -154,6 +151,7 @@ mkdir py3
 cd py3
 ../%configure \
        PYTHON=/usr/bin/python3 \
+       PYTHON_LIBS=-lpython3 \
        --disable-silent-rules
 %{__make}
 cd ..
@@ -163,6 +161,7 @@ mkdir py2
 cd py2
 ../%configure \
        PYTHON=%{__python} \
+       PYTHON_LIBS=-lpython \
        --disable-silent-rules
 %{__make}
 cd ..