[arch-commits] Commit in pygobject/repos (6 files)

Ionut Biru ibiru at archlinux.org
Fri Sep 2 18:56:26 UTC 2011


    Date: Friday, September 2, 2011 @ 14:56:25
  Author: ibiru
Revision: 136915

archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64

Added:
  pygobject/repos/gnome-unstable-i686/PKGBUILD
    (from rev 136914, pygobject/trunk/PKGBUILD)
  pygobject/repos/gnome-unstable-i686/documentation-location.patch
    (from rev 136914, pygobject/trunk/documentation-location.patch)
  pygobject/repos/gnome-unstable-x86_64/PKGBUILD
    (from rev 136914, pygobject/trunk/PKGBUILD)
  pygobject/repos/gnome-unstable-x86_64/documentation-location.patch
    (from rev 136914, pygobject/trunk/documentation-location.patch)
Deleted:
  pygobject/repos/gnome-unstable-i686/PKGBUILD
  pygobject/repos/gnome-unstable-x86_64/PKGBUILD

----------------------------------------------------+
 gnome-unstable-i686/PKGBUILD                       |  106 ++++++++++---------
 gnome-unstable-i686/documentation-location.patch   |   39 ++++++
 gnome-unstable-x86_64/PKGBUILD                     |  106 ++++++++++---------
 gnome-unstable-x86_64/documentation-location.patch |   39 ++++++
 4 files changed, 190 insertions(+), 100 deletions(-)

Deleted: gnome-unstable-i686/PKGBUILD
===================================================================
--- gnome-unstable-i686/PKGBUILD	2011-09-02 18:51:16 UTC (rev 136914)
+++ gnome-unstable-i686/PKGBUILD	2011-09-02 18:56:25 UTC (rev 136915)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-
-pkgbase=pygobject
-pkgname=(python-gobject python2-gobject)
-pkgver=2.90.3
-pkgrel=1
-arch=('i686' 'x86_64')
-url="https://live.gnome.org/PyGObject"
-license=('LGPL')
-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)
-options=('!libtool')
-sha256sums=('8e14f8db0780ad26a8ce6583da30313463ca40519b35f5cda8780f02bd6ddca4')
-
-build() {
-  cd "${srcdir}"
-  cp -a "${pkgbase}-${pkgver}" python2-build
-
-  (
-    cd python2-build
-    export PYTHON=/usr/bin/python2
-    ./configure --prefix=/usr
-    make
-  )
-
-  (
-    cd "${pkgbase}-${pkgver}"
-    ./configure --prefix=/usr
-    make
-  )
-}
-
-package_python-gobject() {
-  pkgdesc="Python 3 bindings for GObject"
-  depends+=('python' 'python-cairo')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
-package_python2-gobject() {
-  pkgdesc="Python 2 bindings for GObject"
-  depends+=('python2' 'python2-cairo')
-  conflicts=('python-gobject')
-
-  cd "${srcdir}/python2-build"
-  make DESTDIR="${pkgdir}" install
-}

Copied: pygobject/repos/gnome-unstable-i686/PKGBUILD (from rev 136914, pygobject/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-i686/PKGBUILD	                        (rev 0)
+++ gnome-unstable-i686/PKGBUILD	2011-09-02 18:56:25 UTC (rev 136915)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+
+pkgbase=pygobject
+pkgname=(python-gobject python2-gobject)
+pkgver=2.90.3
+pkgrel=2
+arch=('i686' 'x86_64')
+url="https://live.gnome.org/PyGObject"
+license=('LGPL')
+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)
+options=('!libtool')
+sha256sums=('8e14f8db0780ad26a8ce6583da30313463ca40519b35f5cda8780f02bd6ddca4'
+            '6174cdeea99e134168ef8235251d9c3802200ee75dc63f86144de75f864e1344')
+
+build() {
+  cd "${srcdir}"
+  cp -a "${pkgbase}-${pkgver}" python2-build
+
+  (
+    cd python2-build
+    patch -Np1 -i ${srcdir}/documentation-location.patch
+    autoreconf -fi
+    export PYTHON=/usr/bin/python2
+    ./configure --prefix=/usr
+    make
+  )
+
+  (
+    cd "${pkgbase}-${pkgver}"
+    patch -Np1 -i ${srcdir}/documentation-location.patch
+    autoreconf -fi
+    ./configure --prefix=/usr
+    make
+  )
+}
+
+package_python-gobject() {
+  pkgdesc="Python 3 bindings for GObject"
+  depends+=('python' 'python-cairo')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
+
+package_python2-gobject() {
+  pkgdesc="Python 2 bindings for GObject"
+  depends+=('python2' 'python2-cairo')
+  conflicts=('python-gobject')
+
+  cd "${srcdir}/python2-build"
+  make DESTDIR="${pkgdir}" install
+}

Copied: pygobject/repos/gnome-unstable-i686/documentation-location.patch (from rev 136914, pygobject/trunk/documentation-location.patch)
===================================================================
--- gnome-unstable-i686/documentation-location.patch	                        (rev 0)
+++ gnome-unstable-i686/documentation-location.patch	2011-09-02 18:56:25 UTC (rev 136915)
@@ -0,0 +1,39 @@
+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
+

Deleted: gnome-unstable-x86_64/PKGBUILD
===================================================================
--- gnome-unstable-x86_64/PKGBUILD	2011-09-02 18:51:16 UTC (rev 136914)
+++ gnome-unstable-x86_64/PKGBUILD	2011-09-02 18:56:25 UTC (rev 136915)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-
-pkgbase=pygobject
-pkgname=(python-gobject python2-gobject)
-pkgver=2.90.3
-pkgrel=1
-arch=('i686' 'x86_64')
-url="https://live.gnome.org/PyGObject"
-license=('LGPL')
-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)
-options=('!libtool')
-sha256sums=('8e14f8db0780ad26a8ce6583da30313463ca40519b35f5cda8780f02bd6ddca4')
-
-build() {
-  cd "${srcdir}"
-  cp -a "${pkgbase}-${pkgver}" python2-build
-
-  (
-    cd python2-build
-    export PYTHON=/usr/bin/python2
-    ./configure --prefix=/usr
-    make
-  )
-
-  (
-    cd "${pkgbase}-${pkgver}"
-    ./configure --prefix=/usr
-    make
-  )
-}
-
-package_python-gobject() {
-  pkgdesc="Python 3 bindings for GObject"
-  depends+=('python' 'python-cairo')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
-package_python2-gobject() {
-  pkgdesc="Python 2 bindings for GObject"
-  depends+=('python2' 'python2-cairo')
-  conflicts=('python-gobject')
-
-  cd "${srcdir}/python2-build"
-  make DESTDIR="${pkgdir}" install
-}

Copied: pygobject/repos/gnome-unstable-x86_64/PKGBUILD (from rev 136914, pygobject/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-x86_64/PKGBUILD	                        (rev 0)
+++ gnome-unstable-x86_64/PKGBUILD	2011-09-02 18:56:25 UTC (rev 136915)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+
+pkgbase=pygobject
+pkgname=(python-gobject python2-gobject)
+pkgver=2.90.3
+pkgrel=2
+arch=('i686' 'x86_64')
+url="https://live.gnome.org/PyGObject"
+license=('LGPL')
+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)
+options=('!libtool')
+sha256sums=('8e14f8db0780ad26a8ce6583da30313463ca40519b35f5cda8780f02bd6ddca4'
+            '6174cdeea99e134168ef8235251d9c3802200ee75dc63f86144de75f864e1344')
+
+build() {
+  cd "${srcdir}"
+  cp -a "${pkgbase}-${pkgver}" python2-build
+
+  (
+    cd python2-build
+    patch -Np1 -i ${srcdir}/documentation-location.patch
+    autoreconf -fi
+    export PYTHON=/usr/bin/python2
+    ./configure --prefix=/usr
+    make
+  )
+
+  (
+    cd "${pkgbase}-${pkgver}"
+    patch -Np1 -i ${srcdir}/documentation-location.patch
+    autoreconf -fi
+    ./configure --prefix=/usr
+    make
+  )
+}
+
+package_python-gobject() {
+  pkgdesc="Python 3 bindings for GObject"
+  depends+=('python' 'python-cairo')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
+
+package_python2-gobject() {
+  pkgdesc="Python 2 bindings for GObject"
+  depends+=('python2' 'python2-cairo')
+  conflicts=('python-gobject')
+
+  cd "${srcdir}/python2-build"
+  make DESTDIR="${pkgdir}" install
+}

Copied: pygobject/repos/gnome-unstable-x86_64/documentation-location.patch (from rev 136914, pygobject/trunk/documentation-location.patch)
===================================================================
--- gnome-unstable-x86_64/documentation-location.patch	                        (rev 0)
+++ gnome-unstable-x86_64/documentation-location.patch	2011-09-02 18:56:25 UTC (rev 136915)
@@ -0,0 +1,39 @@
+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
+




More information about the arch-commits mailing list