[arch-commits] CVS update of extra/gnome/gnome-doc-utils (2 files)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 10:02:51
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-doc-utils

Modified: PKGBUILD (1.16 -> 1.17)
 Removed: fix-disable-sk.patch (1.2)

upgpkg: gnome-doc-utils 0.10.3-1
Move to /usr, update to 0.10.3 which includes the removed patch


----------------------+
 PKGBUILD             |   22 +++++++------------
 fix-disable-sk.patch |   56 -------------------------------------------------
 2 files changed, 8 insertions(+), 70 deletions(-)


Index: extra/gnome/gnome-doc-utils/PKGBUILD
diff -u extra/gnome/gnome-doc-utils/PKGBUILD:1.16 extra/gnome/gnome-doc-utils/PKGBUILD:1.17
--- extra/gnome/gnome-doc-utils/PKGBUILD:1.16	Mon Apr  9 15:32:50 2007
+++ extra/gnome/gnome-doc-utils/PKGBUILD	Sun Apr 22 10:02:50 2007
@@ -1,29 +1,23 @@
-# $Id: PKGBUILD,v 1.16 2007/04/09 19:32:50 jgc Exp $
-# Maintainer: arjan <arjan at archlinux.org>
+# $Id: PKGBUILD,v 1.17 2007/04/22 14:02:50 jgc Exp $
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-doc-utils
-pkgver=0.10.2
+pkgver=0.10.3
 pkgrel=1
 pkgdesc="Documentation utilities for Gnome"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
 depends=('python>=2.5' 'scrollkeeper')
-makedepends=('intltool')
+makedepends=('pkgconfig')
 url="http://www.gnome.org"
 install=gnome-doc-utils.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.10/${pkgname}-${pkgver}.tar.bz2
-	fix-disable-sk.patch)
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.10/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('43f3a4086ec1254cbe20b85948192d18')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
-
   cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np1 -i ${startdir}/src/fix-disable-sk.patch || return 1
-  PKG_NAME="gnome-doc-utils" ACLOCAL_FLAGS="-I `pwd`/tools $ACLOCAL_FLAGS" \
-    REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 NOCONFIGURE=1 \
-    gnome-autogen.sh
-
-  ./configure --prefix=/opt/gnome --disable-scrollkeeper --mandir=/opt/gnome/man
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var --disable-scrollkeeper
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
 }
Index: extra/gnome/gnome-doc-utils/fix-disable-sk.patch
diff -u extra/gnome/gnome-doc-utils/fix-disable-sk.patch:1.2 extra/gnome/gnome-doc-utils/fix-disable-sk.patch:removed
--- extra/gnome/gnome-doc-utils/fix-disable-sk.patch:1.2	Mon Apr  9 15:32:50 2007
+++ extra/gnome/gnome-doc-utils/fix-disable-sk.patch	Sun Apr 22 10:02:51 2007
@@ -1,56 +0,0 @@
---- trunk/tools/gnome-doc-utils.make	2007/03/19 16:37:56	904
-+++ trunk/tools/gnome-doc-utils.make	2007/04/09 18:04:19	913
-@@ -131,6 +131,7 @@
- _ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
- 
- if ENABLE_SK
-+_ENABLE_SK = true
- _skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
- _sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
- _skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
-@@ -150,7 +151,8 @@
- 	--stringparam db2omf.omf_dir "$(OMF_DIR)"				\
- 	--stringparam db2omf.help_dir "$(HELP_DIR)"				\
- 	--stringparam db2omf.omf_in "$(_DOC_OMF_IN)"				\
--	--stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)"		\
-+	$(if $(_ENABLE_SK),							\
-+	  --stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)")		\
- 	$(_db2omf) $(2)
- 
- ## @ _DOC_OMF_IN
-@@ -164,7 +166,7 @@
- 
- $(_DOC_OMF_DB) : $(_DOC_OMF_IN)
- $(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml
--	@test -f "$(_skcontentslist)" || {					\
-+	@test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || {	\
- 	  echo "The file '$(_skcontentslist)' does not exist." >&2;		\
- 	  echo "Please check your ScrollKeeper installation." >&2;		\
- 	  exit 1; }
-@@ -177,10 +179,12 @@
- 
- $(_DOC_OMF_HTML) : $(_DOC_OMF_IN)
- $(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml
--	@test -f "$(_skcontentslist)" || {					\
-+if ENABLE_SK
-+	@test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || {	\
- 	  echo "The file '$(_skcontentslist)' does not exist" >&2;		\
- 	  echo "Please check your ScrollKeeper installation." >&2;		\
- 	  exit 1; }
-+endif
- 	xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
- 
- ## @ _DOC_OMF_ALL
-@@ -344,12 +348,6 @@
- 
- ################################################################################
- 
--if ENABLE_SK
--_ENABLE_SK = true
--else
--_ENABLE_SK = false
--endif
--
- all:							\
- 	$(_DOC_C_DOCS)		$(_DOC_LC_DOCS)		\
- 	$(_DOC_OMF_ALL)		$(_DOC_DSK_ALL)		\