[pygobject2] Update to upstream 2.26.0 and package python3-gobject module
John Palmieri (J5)
johnp at fedoraproject.org
Tue Sep 28 13:24:34 UTC 2010
commit deb2673e8d4de993fb7bc75fa67e5b5e09cc98a4
Author: John (J5) Palmieri <johnp at redhat.com>
Date: Tue Sep 28 00:03:53 2010 -0400
Update to upstream 2.26.0 and package python3-gobject module
.gitignore | 1 +
pygobject-py3m4.patch | 42 +++++++++++++++++++++++++
pygobject2.spec | 82 ++++++++++++++++++++++++++++++++++++++++++++++---
sources | 2 +-
4 files changed, 121 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f7944fb..c6559dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
pygobject-2.21.5.tar.bz2
+/pygobject-2.26.0.tar.bz2
diff --git a/pygobject-py3m4.patch b/pygobject-py3m4.patch
new file mode 100644
index 0000000..98d9866
--- /dev/null
+++ b/pygobject-py3m4.patch
@@ -0,0 +1,42 @@
+diff -up python3-pygobject2-2.26.0-1.fc14/configure.pygobject-py3m4 python3-pygobject2-2.26.0-1.fc14/configure
+--- python3-pygobject2-2.26.0-1.fc14/configure.pygobject-py3m4 2010-09-27 22:52:16.979414660 -0400
++++ python3-pygobject2-2.26.0-1.fc14/configure 2010-09-27 22:53:00.437408582 -0400
+@@ -13854,7 +13854,7 @@ $as_echo_n "checking for $am_display_PYT
+ if test "${am_cv_python_pythondir+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
++ am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX'))" 2>/dev/null ||
+ echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
+@@ -13871,7 +13871,7 @@ $as_echo_n "checking for $am_display_PYT
+ if test "${am_cv_python_pyexecdir+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
++ am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX'))" 2>/dev/null ||
+ echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
+diff -up python3-pygobject2-2.26.0-1.fc14/m4/python.m4.pygobject-py3m4 python3-pygobject2-2.26.0-1.fc14/m4/python.m4
+--- python3-pygobject2-2.26.0-1.fc14/m4/python.m4.pygobject-py3m4 2010-07-28 09:04:44.000000000 -0400
++++ python3-pygobject2-2.26.0-1.fc14/m4/python.m4 2010-09-27 22:40:07.937409005 -0400
+@@ -196,7 +196,7 @@ python2.1 python2.0])
+ dnl doesn't work.
+ AC_CACHE_CHECK([for $am_display_PYTHON script directory],
+ [am_cv_python_pythondir],
+- [am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
++ [am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX'))" 2>/dev/null ||
+ echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`])
+ AC_SUBST([pythondir], [$am_cv_python_pythondir])
+
+@@ -213,7 +213,7 @@ python2.1 python2.0])
+ dnl doesn't work.
+ AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
+ [am_cv_python_pyexecdir],
+- [am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
++ [am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX'))" 2>/dev/null ||
+ echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`])
+ AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
+
diff --git a/pygobject2.spec b/pygobject2.spec
index 5d01e79..af608ae 100644
--- a/pygobject2.spec
+++ b/pygobject2.spec
@@ -1,26 +1,37 @@
# Last updated for version 2.21.0
%define glib2_version 2.22.4
-%define gobject_introspection_version 0.6.3
+%define gobject_introspection_version 0.6.5
%define python2_version 2.3.5
+%if 0%{?fedora} > 12 || 0%{?rhel} > 6
+%global with_python3 1
+%define python3_version 3.1
+%endif
+
### Abstract ###
Name: pygobject2
-Version: 2.21.5
-Release: 3%{?dist}
+Version: 2.26.0
+Release: 1%{?dist}
License: LGPLv2+
Group: Development/Languages
-Summary: Python bindings for GObject
+Summary: Python 2 bindings for GObject
URL: http://www.pygtk.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
#VCS: git:git://git.gnome.org/pygobject
Source: http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.21/pygobject-%{version}.tar.bz2
+Patch1: pygobject-py3m4.patch
### Build Dependencies ###
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
BuildRequires: python2-devel >= %{python2_version}
+%if 0%{?with_python3}
+BuildRequires: python3-devel >= %{python3_version}
+BuildRequires: python3-cairo-devel
+%endif # if with_python3
+
BuildRequires: pycairo-devel
# Bootstrap requirements
BuildRequires: automake autoconf libtool
@@ -28,7 +39,7 @@ BuildRequires: automake autoconf libtool
# The cairo override module depends on this
Requires: pycairo
-Requires: gobject-introspection >= 0.9.0
+Requires: gobject-introspection >= %{gobject_introspection_version}
%description
The %{name} package provides a convenient wrapper for the GObject library
@@ -62,15 +73,60 @@ Group: Development/Languages
%description doc
This package contains documentation files for %{name}.
+%if 0%{?with_python3}
+%package -n python3-gobject
+Summary: Python 3 bindings for GObject and GObject Introspection
+Group: Development/Languages
+
+# The cairo override module depends on this
+#Requires: python3-cairo
+Requires: gobject-introspection >= %{gobject_introspection_version}
+
+%description -n python3-gobject
+The python3-gobject package provides a convenient wrapper for the GObject
+library and and other libraries that are compatible with GObject Introspection,
+for use in Python 3 programs.
+
+%endif # with_python3
+
%prep
%setup -q -n pygobject-%{version}
+%patch1 -p1 -b .pygobject-py3m4
+
+%if 0%{?with_python3}
+rm -rf %{py3dir}
+cp -a . %{py3dir}
+find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|'
+%endif # with_python3
+
+find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python}|'
%build
+PYTHON=%{__python}
+export PYTHON
%configure
make %{?_smp_mflags}
+%if 0%{?with_python3}
+pushd %{py3dir}
+PYTHON=%{__python3}
+export PYTHON
+%configure
+make
+popd
+%endif # with_python3
+
%install
rm -rf $RPM_BUILD_ROOT
+
+%if 0%{?with_python3}
+pushd %{py3dir}
+PYTHON=%{__python3}
+export PYTHON
+make DESTDIR=$RPM_BUILD_ROOT install
+popd
+%endif # with_python3
+
make DESTDIR=$RPM_BUILD_ROOT install
find $RPM_BUILD_ROOT -name '*.la' -delete
find $RPM_BUILD_ROOT -name '*.a' -delete
@@ -108,7 +164,23 @@ rm examples/Makefile*
%{_datadir}/gtk-doc/html/pygobject
%{_datadir}/pygobject/xsl
+%if 0%{?with_python3}
+%files -n python3-gobject
+%defattr(644, root, root, 755)
+%doc AUTHORS NEWS README
+%doc examples
+
+%{_libdir}/libpyglib-2.0-python3.so*
+%dir %{python3_sitearch}/gtk-2.0
+%{python3_sitearch}/gtk-2.0/*
+%{python3_sitearch}/pygtk.*
+%endif # with_python3
+
%changelog
+* Tue Sep 28 2010 John (J5) Palmieri <johnp at redhat.com> - 2.26.0-1
+- Update to upstream 2.26.0
+- package python3-gobject module
+
* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 2.21.5-3
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
diff --git a/sources b/sources
index d6600c4..d803d8c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-77ad7e8dbf13188364c9f56f907e530a pygobject-2.21.5.tar.bz2
+7e3352c4b83ce8dc15290e86dd9c2be0 pygobject-2.26.0.tar.bz2
More information about the scm-commits
mailing list