[arch-commits] Commit in glib/repos (4 files)

[Eric Bélanger]

    Date: Saturday, August 1, 2009 @ 23:23:15
  Author: eric
Revision: 48445

fixed svn conflicts

Added:
  glib/repos/extra-x86_64/ChangeLog
    (from rev 48444, glib/trunk/ChangeLog)
  glib/repos/extra-x86_64/glib.install
    (from rev 48444, glib/trunk/glib.install)
Modified:
  glib/repos/extra-x86_64/	(properties)
  glib/repos/extra-x86_64/PKGBUILD

--------------+
 ChangeLog    |    6 ++++++
 PKGBUILD     |   22 ++++++++++++----------
 glib.install |   20 ++++++++++++++++++++
 3 files changed, 38 insertions(+), 10 deletions(-)


Property changes on: glib/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /glib/trunk:1
   + /glib/trunk:1-48444

Copied: glib/repos/extra-x86_64/ChangeLog (from rev 48444, glib/trunk/ChangeLog)
===================================================================
--- extra-x86_64/ChangeLog	                        (rev 0)
+++ extra-x86_64/ChangeLog	2009-08-02 03:23:15 UTC (rev 48445)
@@ -0,0 +1,6 @@
+2009-08-01  Eric Belanger  <eric at archlinux.org>
+
+	* glib 1.2.10-8
+	* FHS man pages
+	* Added info pages
+	* Added ChangeLog

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-08-02 03:21:33 UTC (rev 48444)
+++ extra-x86_64/PKGBUILD	2009-08-02 03:23:15 UTC (rev 48445)
@@ -4,29 +4,31 @@
 
 pkgname=glib
 pkgver=1.2.10
-pkgrel=7
+pkgrel=8
 pkgdesc="Common C routines used by Gtk+ and other libs"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
 license=('LGPL')
-depends=('glibc')
+depends=('glibc' 'texinfo')
 options=('!libtool')
-source=(ftp://ftp.gtk.org/pub/gtk/v1.2/$pkgname-$pkgver.tar.gz \
+install=glib.install
+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'\
-          'ae4438cf56c0c9264ee36f6973fb445f9a820be0')
+sha1sums=('e5a9361c594608d152d5d9650154c2e3260b87fa' 'a2cc224a66aeffdcac16ebd9e8af18143cf54918'\
+         'ae4438cf56c0c9264ee36f6973fb445f9a820be0')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i ../gcc340.patch || return 1
   patch -Np0 -i ../aclocal-fixes.patch || return 1
 
-  #Arch64 fixes --build/host
-  ./configure --prefix=/usr --host=i686-pc-linux-gnu
+  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info \
+    --host=i686-pc-linux-gnu || return 1
   make || return 1
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR="${pkgdir}" install || return 1
+  rm "${pkgdir}/usr/share/info/dir"
+  gzip "${pkgdir}/usr/share/info/glib.info"
 }

Copied: glib/repos/extra-x86_64/glib.install (from rev 48444, glib/trunk/glib.install)
===================================================================
--- extra-x86_64/glib.install	                        (rev 0)
+++ extra-x86_64/glib.install	2009-08-02 03:23:15 UTC (rev 48445)
@@ -0,0 +1,20 @@
+infodir=/usr/share/info
+filelist=(glib.info.gz)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}