[arch-commits] Commit in pygobject/trunk (PKGBUILD documentation-location.patch)

[Ionut Biru]

    Date: Friday, September 16, 2011 @ 04:42:55
  Author: ibiru
Revision: 138089

update to 2.90.4, split out conflicting files in pygobject-devel, to allow parallel installation for python2/python port

Modified:
  pygobject/trunk/PKGBUILD
Deleted:
  pygobject/trunk/documentation-location.patch

------------------------------+
 PKGBUILD                     |   36 +++++++++++++++++++-----------------
 documentation-location.patch |   39 ---------------------------------------
 2 files changed, 19 insertions(+), 56 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-16 07:43:49 UTC (rev 138088)
+++ PKGBUILD	2011-09-16 08:42:55 UTC (rev 138089)
@@ -2,28 +2,25 @@
 # Maintainer: Ionut Biru <ibiru at archlinux.org>
 
 pkgbase=pygobject
-pkgname=(python-gobject python2-gobject)
-pkgver=2.90.3
-pkgrel=3
+pkgname=(python-gobject python2-gobject pygobject-devel)
+pkgver=2.90.4
+pkgrel=1
 arch=('i686' 'x86_64')
 url="https://live.gnome.org/PyGObject"
 license=('LGPL')
-depends=('glib2' 'gobject-introspection')
+depends=('glib2' 'gobject-introspection' )
 makedepends=(python python2 python-cairo python2-cairo)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz
-        documentation-location.patch)
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz)
 options=('!libtool')
-sha256sums=('8e14f8db0780ad26a8ce6583da30313463ca40519b35f5cda8780f02bd6ddca4'
-            '6174cdeea99e134168ef8235251d9c3802200ee75dc63f86144de75f864e1344')
+sha256sums=('8407b6997181bbca4783798e21d7d63ca41708a6c05a3b08c953d64e7b97b2a1')
 
 build() {
   cd "${srcdir}"
   cp -a "${pkgbase}-${pkgver}" python2-build
+  mkdir devel
 
   (
     cd python2-build
-    patch -Np1 -i ${srcdir}/documentation-location.patch
-    autoreconf -fi
     export PYTHON=/usr/bin/python2
     ./configure --prefix=/usr
     make
@@ -31,8 +28,6 @@
 
   (
     cd "${pkgbase}-${pkgver}"
-    patch -Np1 -i ${srcdir}/documentation-location.patch
-    autoreconf -fi
     ./configure --prefix=/usr
     make
   )
@@ -40,19 +35,26 @@
 
 package_python-gobject() {
   pkgdesc="Python 3 bindings for GObject"
-  depends+=('python' 'python-cairo')
+  depends+=('python' 'python-cairo' "pygobject-devel=${pkgver}")
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}/usr/lib/python3.2/site-packages/gtk-2.0/"
+  rm -r "${pkgdir}"/usr/{include,lib/pkgconfig}
 }
 
 package_python2-gobject() {
   pkgdesc="Python 2 bindings for GObject"
-  depends+=('python2' 'python2-cairo')
-  conflicts=('python-gobject')
+  depends+=('python2' 'python2-cairo' "pygobject-devel=${pkgver}")
 
   cd "${srcdir}/python2-build"
   make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}/usr/lib/python2.7/site-packages/gtk-2.0/"
+  mv "${pkgdir}"/usr/{include,lib/pkgconfig} "${srcdir}/devel"
 }
+
+package_pygobject-devel() {
+  pkgdesc="Development files for the pygobject bindings"
+  cd "${srcdir}/devel"
+  mkdir -p "${pkgdir}"/usr/{include,lib}
+  mv include "${pkgdir}/usr/"
+  mv pkgconfig "${pkgdir}/usr/lib/"
+}

Deleted: documentation-location.patch
===================================================================
--- documentation-location.patch	2011-09-16 07:43:49 UTC (rev 138088)
+++ documentation-location.patch	2011-09-16 08:42:55 UTC (rev 138089)
@@ -1,39 +0,0 @@
-From 07cbf21a0c729000db28da7cb9ba08e5b79f7674 Mon Sep 17 00:00:00 2001
-From: Dieter Verfaillie <dieterv at optionexplicit.be>
-Date: Tue, 23 Aug 2011 10:45:50 +0200
-Subject: [PATCH] Fix documentation installation directory
-
----
- docs/Makefile.am |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/docs/Makefile.am b/docs/Makefile.am
-index 775e1e9..b9086a9 100644
---- a/docs/Makefile.am
-+++ b/docs/Makefile.am
-@@ -1,3 +1,4 @@
-+PLATFORM_VERSION = 3.0
- REF_VERSION = $(PYGOBJECT_MAJOR_VERSION).$(PYGOBJECT_MINOR_VERSION)
- FULL_VERSION = $(REF_VERSION).$(PYGOBJECT_MICRO_VERSION)
- 
-@@ -52,7 +53,7 @@ XSL_FILES =			\
- # so the date is newer then the files in HTML_FILES
- FIXXREF = xsl/fixxref.py
- 
--TARGET_DIR = $(datadir)/gtk-doc/html/pygobject
-+TARGET_DIR = $(datadir)/gtk-doc/html/pygobject-$(PLATFORM_VERSION)
- CSSdir = $(TARGET_DIR)
- CSS_DATA = $(CSS_FILES)
- 
-@@ -75,7 +76,7 @@ uninstall-local:
- 	rm -f $(DESTDIR)$(TARGET_DIR)/*
- 
- 
--XSLdir = $(datadir)/pygobject/xsl
-+XSLdir = $(datadir)/pygobject-$(PLATFORM_VERSION)/xsl
- XSL_DATA = $(XSL_FILES) $(FIXXREF)
- 
- EXTRA_DIST = 		\
--- 
-1.7.6.msysgit.0
-