[arch-commits] Commit in glib/trunk (ChangeLog PKGBUILD glib.install)

[Eric Bélanger]

    Date: Tuesday, August 9, 2011 @ 21:01:44
  Author: eric
Revision: 135061

upgpkg: glib 1.2.10-9
Remove texinfo depends, Remove ChangeLog

Modified:
  glib/trunk/PKGBUILD
  glib/trunk/glib.install
Deleted:
  glib/trunk/ChangeLog

--------------+
 ChangeLog    |   11 -----------
 PKGBUILD     |   39 ++++++++++++++++++---------------------
 glib.install |    2 +-
 3 files changed, 19 insertions(+), 33 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2011-08-10 00:44:47 UTC (rev 135060)
+++ ChangeLog	2011-08-10 01:01:44 UTC (rev 135061)
@@ -1,11 +0,0 @@
-2009-10-14  Eric Belanger  <eric at archlinux.org>
-
-	* glib 1.2.10-8.1
-	* Fixed configure options for x86_64 (close FS#16658)
-
-2009-08-01  Eric Belanger  <eric at archlinux.org>
-
-	* glib 1.2.10-8
-	* FHS man pages
-	* Added info pages
-	* Added ChangeLog

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-10 00:44:47 UTC (rev 135060)
+++ PKGBUILD	2011-08-10 01:01:44 UTC (rev 135061)
@@ -1,40 +1,37 @@
 # $Id$
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: dorphell <dorphell at archlinux.org>
-# Maintainer: Daniel J Griffiths
+# Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=glib
 pkgver=1.2.10
-pkgrel=8.1
+pkgrel=9
 pkgdesc="Common C routines used by Gtk+ and other libs"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
 license=('LGPL')
-depends=('glibc' 'texinfo')
+depends=('glibc')
 options=('!libtool')
 install=glib.install
-source=(ftp://ftp.gtk.org/pub/gtk/v1.2/${pkgname}-${pkgver}.tar.gz 
-	gcc340.patch 
-	aclocal-fixes.patch)
-md5sums=('6fe30dad87c77b91b632def29dd69ef9' 
-	 '877b3330e822a4be69a0f8a8c268cfd7'
+source=(ftp://ftp.gtk.org/pub/gtk/v1.2/${pkgname}-${pkgver}.tar.gz \
+	gcc340.patch aclocal-fixes.patch)
+md5sums=('6fe30dad87c77b91b632def29dd69ef9'
+         '877b3330e822a4be69a0f8a8c268cfd7'
          'e52c4b88427b9785bb8049dbdc9ff6fb')
-sha1sums=('e5a9361c594608d152d5d9650154c2e3260b87fa' 
-	  'a2cc224a66aeffdcac16ebd9e8af18143cf54918'
+sha1sums=('e5a9361c594608d152d5d9650154c2e3260b87fa'
+          'a2cc224a66aeffdcac16ebd9e8af18143cf54918'
           'ae4438cf56c0c9264ee36f6973fb445f9a820be0')
 
 build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	patch -Np1 -i ../gcc340.patch || return 1
-	patch -Np0 -i ../aclocal-fixes.patch || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ../gcc340.patch
+  patch -Np0 -i ../aclocal-fixes.patch
 
-	[ "$CARCH" = 'x86_64' ] && CONFIGFLAG='--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu'
-	./configure --prefix=/usr --mandir=/usr/share/man \
-	    --infodir=/usr/share/info $CONFIGFLAG || return 1
-	make || return 1
+  [ "$CARCH" = 'x86_64' ] && CONFIGFLAG='--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu'
+  ./configure --prefix=/usr --mandir=/usr/share/man \
+    --infodir=/usr/share/info $CONFIGFLAG
+  make
 }
 
 package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	make DESTDIR=${pkgdir} install || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }

Modified: glib.install
===================================================================
--- glib.install	2011-08-10 00:44:47 UTC (rev 135060)
+++ glib.install	2011-08-10 01:01:44 UTC (rev 135061)
@@ -1,4 +1,4 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(glib.info.gz)
 
 post_install() {