Author: wiget Date: Sat Sep 24 18:15:28 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- fix unresolved symbols (link.patch and BR fixed python3)
- removed outdated TODO
---- Files affected:
packages/python-pygobject3:
python-pygobject3.spec (1.5 -> 1.6) , link.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/python-pygobject3/python-pygobject3.spec
diff -u packages/python-pygobject3/python-pygobject3.spec:1.5
packages/python-pygobject3/python-pygobject3.spec:1.6
--- packages/python-pygobject3/python-pygobject3.spec:1.5 Mon Sep 19
21:31:37 2011
+++ packages/python-pygobject3/python-pygobject3.spec Sat Sep 24 20:15:23 2011
@@ -1,6 +1,4 @@
# $Revision$, $Date$
-# TODO:
-# - header file is needed by python-pygobject3-devel and
python3-pygobject3-devel
#
# Conditional build:
%bcond_without python2 # Python 2.x module
@@ -12,12 +10,13 @@
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
@@ -34,18 +33,15 @@
%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.
@@ -143,6 +139,7 @@
%prep
%setup -q -n %{module}-%{version}
+%patch0 -p1
%build
%{__libtoolize}
@@ -155,6 +152,7 @@
cd py3
../%configure \
PYTHON=/usr/bin/python3 \
+ PYTHON_LIBS=-lpython3 \
--disable-silent-rules
%{__make}
cd ..
@@ -164,6 +162,7 @@
cd py2
../%configure \
PYTHON=%{__python} \
+ PYTHON_LIBS=-lpython \
--disable-silent-rules
%{__make}
cd ..
@@ -278,6 +277,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.6 2011/09/24 18:15:23 wiget
+- fix unresolved symbols (link.patch and BR fixed python3)
+- removed outdated TODO
+
Revision 1.5 2011/09/19 19:31:37 megabajt
- fixed description tag for common-devel subpackage
================================================================
Index: packages/python-pygobject3/link.patch
diff -u /dev/null packages/python-pygobject3/link.patch:1.1
--- /dev/null Sat Sep 24 20:15:28 2011
+++ packages/python-pygobject3/link.patch Sat Sep 24 20:15:23 2011
@@ -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"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python-pygobject3/python-pygobject3.spec?r1=1.5&r2=1.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
