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

[andyrtr at archlinux.org]

    Date: Friday, August 29, 2008 @ 05:13:19
  Author: andyrtr
Revision: 10556

upgpkg: glibc 2.8-3
    new toolchain for new kernel-headers, gcc-4.3.2 and added info files all around

Modified:
  glibc/trunk/PKGBUILD
  glibc/trunk/glibc.install

---------------+
 PKGBUILD      |   18 ++++++++++--------
 glibc.install |   16 ++++++++++++++++
 2 files changed, 26 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-08-29 08:41:05 UTC (rev 10555)
+++ PKGBUILD	2008-08-29 09:13:19 UTC (rev 10556)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=glibc
 pkgver=2.8
-pkgrel=2
-_glibcdate=20080610
+pkgrel=3
+_glibcdate=20080828
 install=glibc.install
 backup=(etc/locale.gen)
 pkgdesc="GNU C Library"
@@ -12,14 +12,14 @@
 url="http://www.gnu.org/software/libc"
 groups=('base')
 depends=('sh' 'kernel-headers>=2.6.25.6' 'tzdata')
-makedepends=('gcc>=4.3.1-1')
+makedepends=('gcc>=4.3.2-1')
 replaces=('glibc-xen')
 source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-2.8_${_glibcdate}.tar.bz2
 	ftp://ftp.archlinux.org/other/glibc/glibc-patches-${pkgver}-2.tar.bz2
 	nscd
 	locale.gen.txt
 	locale-gen)
-md5sums=('63def58972f0e8429247916154c21323'
+md5sums=('76be5bc7308956562afc84550d099404'
          '3ec00d9aa3f2fec046bc3e615dfb723a'
          'b587ee3a70c9b3713099295609afde49'
          '07ac979b6ab5eeb778d55f041529d623'
@@ -28,10 +28,10 @@
 build() {
 
   # for cvs checkout
-#  mkdir ${startdir}/src/glibc-${_glibcdate}
-#  cd ${startdir}/src/glibc-${_glibcdate}
-#  export _TAG=glibc-2_8-branch
-#  export 'CVSROOT=:pserver:anoncvs at sources.redhat.com:/cvs/glibc'
+  mkdir ${startdir}/src/glibc-${_glibcdate}
+  cd ${startdir}/src/glibc-${_glibcdate}
+  export _TAG=glibc-2_8-branch
+  export 'CVSROOT=:pserver:anoncvs at sources.redhat.com:/cvs/glibc'
 #  cvs -z9 co -r $_TAG libc || return 1
 #  tar -cvjf glibc-2.8_${_glibcdate}.tar.bz2 libc
 #  return 1
@@ -97,4 +97,6 @@
     cd ${startdir}/pkg/lib64
     ln -v -s ../lib/ld* .
   fi
+
+  rm -f ${pkgdir}/usr/share/info/dir
 }

Modified: glibc.install
===================================================================
--- glibc.install	2008-08-29 08:41:05 UTC (rev 10555)
+++ glibc.install	2008-08-29 09:13:19 UTC (rev 10556)
@@ -1,3 +1,7 @@
+infodir=/usr/share/info
+filelist=(libc.info libc.info-1 libc.info-2 libc.info-3 libc.info-4 libc.info-5 libc.info-6 libc.info-7 
+          libc.info-8 libc.info-9 libc.info-10 libc.info-11)
+
 pre_upgrade() {
 if [ "`uname -m`" = "x86_64" ]; then
  if [ "`vercmp $2 2.4`" -lt 0 ]; then
@@ -29,6 +33,10 @@
 
  fi
 fi
+
+ for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+ done
 }
 
 
@@ -115,8 +123,16 @@
  fi
 fi
 
+ for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+ done
 }
 
+pre_remove() {
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
 op=$1
 shift
 $op $*