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

Eric Bélanger eric at archlinux.org
Fri Nov 6 14:41:32 UTC 2009


    Date: Friday, November 6, 2009 @ 09:41:31
  Author: eric
Revision: 58247

Merged revisions 53805,58240,58244 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/bc/trunk

........
  r53805 | roman | 2009-10-03 08:37:53 -0400 (Sat, 03 Oct 2009) | 3 lines
  
  Added url
........
  r58240 | eric | 2009-11-06 09:16:27 -0500 (Fri, 06 Nov 2009) | 2 lines
  
  upgpkg: bc 1.06-7
      Added install script to update info db (close FS#13924)
........
  r58244 | eric | 2009-11-06 09:34:10 -0500 (Fri, 06 Nov 2009) | 2 lines
  
  upgpkg: bc 1.06-7
      fixed bc info file
........

Added:
  bc/repos/extra-i686/bc-1.06-info-dir-entry.patch
    (from rev 58244, bc/trunk/bc-1.06-info-dir-entry.patch)
  bc/repos/extra-i686/bc.install
    (from rev 58244, bc/trunk/bc.install)
Modified:
  bc/repos/extra-i686/	(properties)
  bc/repos/extra-i686/PKGBUILD

------------------------------+
 PKGBUILD                     |   27 ++++++++++++++++-----------
 bc-1.06-info-dir-entry.patch |   11 +++++++++++
 bc.install                   |   20 ++++++++++++++++++++
 3 files changed, 47 insertions(+), 11 deletions(-)


Property changes on: bc/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /bc/trunk:1-42716
   + /bc/trunk:1-58246

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-11-06 14:38:32 UTC (rev 58246)
+++ extra-i686/PKGBUILD	2009-11-06 14:41:31 UTC (rev 58247)
@@ -3,24 +3,29 @@
 
 pkgname=bc
 pkgver=1.06
-pkgrel=6
+pkgrel=7
 pkgdesc="An arbitrary precision calculator language"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/bc/"
 license=('GPL')
 depends=('readline')
-replaces=(bc-readline)
-conflicts=(bc-readline)
+replaces=('bc-readline')
+conflicts=('bc-readline')
+install=bc.install
 source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
-	build-fix.patch)
-md5sums=('d44b5dddebd8a7a7309aea6c36fda117' 'fc7ecbd9e55ef04c6d3a495692626116')
+	build-fix.patch bc-1.06-info-dir-entry.patch)
+md5sums=('d44b5dddebd8a7a7309aea6c36fda117' 'fc7ecbd9e55ef04c6d3a495692626116'\
+         'b6fe9869830aca0d34badf810fe0cfb3')
+sha1sums=('c8f258a7355b40a485007c40865480349c157292' '3af67c59e2232b9329ff0c1cf49d1a8a1cf87cd7'\
+         'c15c2a301ba80cf4d3c03a6e164f4e57fa86e4a2')
 
 build() {
   CFLAGS="$CFLAGS -O3"
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np1 -i ${startdir}/src/build-fix.patch || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/build-fix.patch" || return 1
+  patch -p1 -i "${srcdir}/bc-1.06-info-dir-entry.patch" || return 1
   ./configure --prefix=/usr --mandir=/usr/share/man \
-    --infodir=/usr/share/info --with-readline
+    --infodir=/usr/share/info --with-readline || return 1
   make LEX="flex -I" || return 1
-  make DESTDIR=${startdir}/pkg install
-  rm ${pkgdir}/usr/share/info/dir
+  make DESTDIR="${pkgdir}" install || return 1
 }

Copied: bc/repos/extra-i686/bc-1.06-info-dir-entry.patch (from rev 58244, bc/trunk/bc-1.06-info-dir-entry.patch)
===================================================================
--- extra-i686/bc-1.06-info-dir-entry.patch	                        (rev 0)
+++ extra-i686/bc-1.06-info-dir-entry.patch	2009-11-06 14:41:31 UTC (rev 58247)
@@ -0,0 +1,11 @@
+--- bc-1.06/doc/bc.info.info-dir-entry	2000-10-03 20:36:31.000000000 +0200
++++ bc-1.06/doc/bc.info	2003-01-06 14:07:40.000000000 +0100
+@@ -1,5 +1,8 @@
+ This is bc.info, produced by makeinfo version 4.0 from bc.texi.
+ 
++START-INFO-DIR-ENTRY
++* bc: (bc).                   Arbritrary precision calculator language.
++END-INFO-DIR-ENTRY
+ 
+ File: bc.info,  Node: Top,  Next: Introduction,  Prev: (dir),  Up: (dir)
+ 

Copied: bc/repos/extra-i686/bc.install (from rev 58244, bc/trunk/bc.install)
===================================================================
--- extra-i686/bc.install	                        (rev 0)
+++ extra-i686/bc.install	2009-11-06 14:41:31 UTC (rev 58247)
@@ -0,0 +1,20 @@
+infodir=/usr/share/info
+filelist=(bc.info.gz dc.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
+}




More information about the arch-commits mailing list