Date: Friday, September 2, 2011 @ 14:51:16 Author: ibiru Revision: 136914
fix documentation conflict Added: pygobject/trunk/documentation-location.patch Modified: pygobject/trunk/PKGBUILD ------------------------------+ PKGBUILD | 12 +++++++++--- documentation-location.patch | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-09-02 18:43:01 UTC (rev 136913) +++ PKGBUILD 2011-09-02 18:51:16 UTC (rev 136914) @@ -4,15 +4,17 @@ pkgbase=pygobject pkgname=(python-gobject python2-gobject) pkgver=2.90.3 -pkgrel=1 +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) +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz + documentation-location.patch) options=('!libtool') -sha256sums=('8e14f8db0780ad26a8ce6583da30313463ca40519b35f5cda8780f02bd6ddca4') +sha256sums=('8e14f8db0780ad26a8ce6583da30313463ca40519b35f5cda8780f02bd6ddca4' + '6174cdeea99e134168ef8235251d9c3802200ee75dc63f86144de75f864e1344') build() { cd "${srcdir}" @@ -20,6 +22,8 @@ ( cd python2-build + patch -Np1 -i ${srcdir}/documentation-location.patch + autoreconf -fi export PYTHON=/usr/bin/python2 ./configure --prefix=/usr make @@ -27,6 +31,8 @@ ( cd "${pkgbase}-${pkgver}" + patch -Np1 -i ${srcdir}/documentation-location.patch + autoreconf -fi ./configure --prefix=/usr make ) Added: documentation-location.patch =================================================================== --- documentation-location.patch (rev 0) +++ documentation-location.patch 2011-09-02 18:51:16 UTC (rev 136914) @@ -0,0 +1,39 @@ +From 07cbf21a0c729000db28da7cb9ba08e5b79f7674 Mon Sep 17 00:00:00 2001 +From: Dieter Verfaillie <diet...@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 +