[weasel-commit] Source: pygobject=2.18.0-2
- From: rbuilder@xxxxxxxxx
- To: weasel-commit@xxxxxxxxxxxxx
- Date: Mon, 25 Jan 2010 06:59:49 -0500
================================
pygobject:source=2.18.0-2 (previous: 2.18.0-1)
cvc rdiff pygobject -1 /weasel.rpath.org@wgl:3-devel/2.18.0-2
================================
2.18.0-2 Filip Brcic (brcha@xxxxxxx) Mon Jan 25 06:59:35 2010
fixed recipe and metadata
pygobject-2.15.4-fix-codegen-location.patch: new
--- /dev/null
+++ pygobject-2.15.4-fix-codegen-location.patch
@@ -0,0 +50 @@
+---
+ Fix FHS compliance of codegen
+
+ codegen/Makefile.am | 2 +-
+ codegen/pygtk-codegen-2.0.in | 3 ++-
+ pygtk-2.0.pc.in | 2 +-
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+--- a/codegen/Makefile.am 2007-11-01 12:20:22.000000000 -0400
++++ b/codegen/Makefile.am 2008-05-28 22:21:04.000000000 -0400
+@@ -2,7 +2,7 @@ PLATFORM_VERSION = 2.0
+
+ bin_SCRIPTS = pygobject-codegen-$(PLATFORM_VERSION)
+
+-codegendir = $(pkgdatadir)/$(PLATFORM_VERSION)/codegen
++codegendir = $(pyexecdir)/gtk-2.0/codegen
+
+ codegen_PYTHON = \
+ __init__.py \
+--- a/codegen/pygobject-codegen-2.0.in 2007-11-01 12:20:22.000000000 -0400
++++ b/codegen/pygobject-codegen-2.0.in 2008-05-28 22:24:38.000000000 -0400
+@@ -1,9 +1,10 @@
+ #!/bin/sh
+
+ prefix=@prefix@
++exec_prefix=@exec_prefix@
+ datarootdir=@datarootdir@
+ datadir=@datadir@
+-codegendir=${datadir}/pygobject/2.0/codegen
++codegendir=@pyexecdir@/gtk-2.0/codegen
+
+ PYTHONPATH=$codegendir
+ export PYTHONPATH
+--- a/pygobject-2.0.pc.in 2007-11-01 12:20:22.000000000 -0400
++++ b/pygobject-2.0.pc.in 2008-05-28 22:21:04.000000000 -0400
+@@ -4,6 +4,7 @@
+ datarootdir=@datarootdir@
+ datadir=@datadir@
+ libdir=@libdir@
++pyexecdir=@pyexecdir@
+
+ # you can use the --variable=pygtkincludedir argument to
+ # pkg-config to get this value. You might want to use this to
+@@ -12,5 +12,5 @@
+ defsdir=${datadir}/pygobject/2.0/defs
+-codegendir=${datadir}/pygobject/2.0/codegen
++codegendir=${pyexecdir}/gtk-2.0/codegen
+
+ Name: PyGObject
+ Description: Python bindings for GObject
pygobject-2.18.0-make_check.patch: new
--- /dev/null
+++ pygobject-2.18.0-make_check.patch
@@ -0,0 +57 @@
+--- tests/Makefile.am
++++ tests/Makefile.am
+@@ -11,7 +11,7 @@
+ test-thread.h \
+ test-unknown.h
+
+-noinst_LTLIBRARIES = testhelper.la
++check_LTLIBRARIES = testhelper.la
+ linked_LIBS = testhelper.la
+
+ testhelper_la_LDFLAGS = -module -avoid-version
+@@ -47,6 +47,7 @@
+ cp $(top_srcdir)/gobject/*.py $(top_builddir)/gobject; \
+ cp $(top_srcdir)/gio/*.py $(top_builddir)/gio; \
+ fi
++ $(LN_S) .libs/testhelper.so testhelper.so
+ @$(PYTHON) $(srcdir)/runtests.py $(top_builddir) $(top_srcdir)
+ @if test "$(top_builddir)" != "$(top_srcdir)"; then \
+ rm -f $(top_builddir)/glib/*.py; \
+@@ -58,8 +59,5 @@
+ @rm -fr $(top_builddir)/gio/*.pyc
+
+
+-all: $(LTLIBRARIES:.la=.so)
+ clean-local:
+- rm -f $(LTLIBRARIES:.la=.so)
+-.la.so:
+- $(LN_S) .libs/$@ $@ || true
++ rm -f .libs/testhelper.so
+--- tests/runtests.py
++++ tests/runtests.py
+@@ -6,6 +6,9 @@
+
+ import common
+
++# Some tests fail with translated messages.
++os.environ["LC_ALL"] = "C"
++
+ program = None
+ if len(sys.argv) == 3:
+ buildDir = sys.argv[1]
+--- tests/test_gio.py
++++ tests/test_gio.py
+@@ -386,9 +386,10 @@
+
+ def testQueryWritableNamespaces(self):
+ infolist = self.file.query_writable_namespaces()
+- for info in infolist:
+- if info.name == "xattr":
+- self.assertEqual(info.type, gio.FILE_ATTRIBUTE_TYPE_STRING)
++ if infolist:
++ for info in infolist:
++ if info.name == "xattr":
++ self.assertEqual(info.type,
gio.FILE_ATTRIBUTE_TYPE_STRING)
+
+ def testSetAttribute(self):
+ self._f.write("testing attributes")
pygobject.recipe: changed
Index: pygobject.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- pygobject.recipe /weasel.rpath.org@wgl:3-devel/2.18.0-1
+++ pygobject.recipe /weasel.rpath.org@wgl:3-devel/2.18.0-2
@@ -1,16 +1,42 @@
#
-# Copyright (c) 2006-2007 rPath, Inc.
-# This file is distributed under the terms of the MIT License.
-# A copy is available at http://www.rpath.com/permanent/mit-license.html
+# Copyright (c) 2010 Filip Brcic <brcha@xxxxxxxxxxxx>
+# Distributed under the terms of the GNU General Public License v3
#
loadSuperClass('gnomepackage')
-class PyGObject(GnomePackageRecipe):
+class Pygobject(GnomePackageRecipe):
name = 'pygobject'
version = '2.18.0'
- buildRequires = [ 'glib:devel', 'python:devel', ]
- buildMultiarch = True
+ buildRequires = [
+ 'python:devel', 'glib:devel', 'libffi:devel',
+ ]
- def post32bit(r):
- r.NonMultilibComponent(exceptions='.*')
+ shortDesc = 'Python bindings of GObject'
+ longDesc = "GLib's GObject library bindings for Python"
+ url = 'http://www.pygtk.org/'
+ licenses = [ 'LGPL-2.1' ]
+ categories = [ 'Gnome', 'Development/Python' ]
+
+ extraConfig = (
+ ' --disable-dependency-tracking'
+ ' --enable-docs'
+ ' --with-ffi'
+ )
+
+ patches = [
+ 'pygobject-2.15.4-fix-codegen-location.patch',
+ 'pygobject-2.18.0-make_check.patch',
+ 'pygobject-2.18.0-automake111.patch',
+ ]
+
+ def unpack(r):
+ GnomePackageRecipe.unpack(r)
+
+ r.Remove('m4/lt*', 'm4/libtool.m4', 'ltmain.sh')
+
+ r.Move('py-compile', 'py-compile.orig')
+ r.Symlink('%(essentialbindir)s/true', 'py-compile')
+
+ r.Autoreconf(m4Dir='m4')
+
pygobject-2.18.0-automake111.patch: new
--- /dev/null
+++ pygobject-2.18.0-automake111.patch
@@ -0,0 +13 @@
+# Fix build failure due to automake 1.11.
+# defsgen.py was installed twice
+# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=279813
+--- a/codegen/Makefile.am
++++ b/codegen/Makefile.am
+@@ -18,7 +18,6 @@
+ docextract_to_xml.py \
+ docgen.py \
+ h2def.py \
+- defsgen.py \
+ createdefs.py \
+ mergedefs.py \
+ missingdefs.py \
Committed by: brcha
Other related posts:
