[arch-commits] Commit in cln/repos (5 files)

[Eric Bélanger]

    Date: Tuesday, June 9, 2009 @ 17:54:11
  Author: eric
Revision: 42049

Merged revisions 42048 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/cln/trunk

........
  r42048 | eric | 2009-06-09 17:53:55 -0400 (Tue, 09 Jun 2009) | 2 lines
  
  upgpkg: cln 1.2.2-2
      Added info page, Fixed docs location, Added gcc 4.4 patch (close FS#15015), Added ChangeLog
........

Added:
  cln/repos/extra-x86_64/ChangeLog
    (from rev 42048, cln/trunk/ChangeLog)
  cln/repos/extra-x86_64/cln-gcc44.patch
    (from rev 42048, cln/trunk/cln-gcc44.patch)
  cln/repos/extra-x86_64/cln.install
    (from rev 42048, cln/trunk/cln.install)
Modified:
  cln/repos/extra-x86_64/	(properties)
  cln/repos/extra-x86_64/PKGBUILD

-----------------+
 ChangeLog       |    6 ++++++
 PKGBUILD        |   28 ++++++++++++++--------------
 cln-gcc44.patch |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 cln.install     |   20 ++++++++++++++++++++
 4 files changed, 90 insertions(+), 14 deletions(-)


Property changes on: cln/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /cln/trunk:1-1618
   + /cln/trunk:1-42048

Copied: cln/repos/extra-x86_64/ChangeLog (from rev 42048, cln/trunk/ChangeLog)
===================================================================
--- extra-x86_64/ChangeLog	                        (rev 0)
+++ extra-x86_64/ChangeLog	2009-06-09 21:54:11 UTC (rev 42049)
@@ -0,0 +1,6 @@
+2009-06-09  Eric Belanger  <eric at archlinux.org>
+
+	* Added info page
+	* Fixed docs location
+	* Added gcc 4.4 patch (close FS#15015)
+	* Added ChangeLog

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-06-09 21:53:55 UTC (rev 42048)
+++ extra-x86_64/PKGBUILD	2009-06-09 21:54:11 UTC (rev 42049)
@@ -1,27 +1,27 @@
 # $Id$
+# Maintainer: Eric Belanger <eric at archlinux.org>
 # Contributor: Ben <ben at benmazer.net>
-# Maintainer: damir <damir at archlinux.org>
 
 pkgname=cln
 pkgver=1.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Class library for numbers"
-arch=("i686" "x86_64")
+arch=('i686' 'x86_64')
 url="http://www.ginac.de/CLN/"
 license=('GPL')
 options=('!libtool')
-depends=('gmp' 'bash')
-neededpatches=()
-source=("ftp://ftpthep.physik.uni-mainz.de/pub/gnu/$pkgname-$pkgver.tar.bz2")
+depends=('gmp' 'bash' 'texinfo')
+install=cln.install
+source=(ftp://ftpthep.physik.uni-mainz.de/pub/gnu/${pkgname}-${pkgver}.tar.bz2 cln-gcc44.patch)
+md5sums=('6b479281fec86314b4c7a9357bd83ef8' 'aa678ade85c1e364c879b2e0b40ba80d')
+sha1sums=('2d2a5d3e383a3043c5bf68299a466685ef4ec8ec' '6abb412a387ba8d27a6a80f963a55677e431daf8')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-    for patch in $neededpatches ; do
-        cat $startdir/src/$patch | patch -p1 || return 1
-    done
-  ./configure --prefix=/usr
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 < ../cln-gcc44.patch || return 1
+  ./configure --prefix=/usr || return 1
   make || return 1
-  make prefix=$startdir/pkg/usr install
+  make DESTDIR="${pkgdir}" htmldir=/usr/share/doc/cln/html dvidir=/usr/share/doc/cln/dvi install || return 1
+  rm "${pkgdir}/usr/share/info/dir"
+  gzip "${pkgdir}/usr/share/info/cln.info"
 }
-
-md5sums=('6b479281fec86314b4c7a9357bd83ef8')

Copied: cln/repos/extra-x86_64/cln-gcc44.patch (from rev 42048, cln/trunk/cln-gcc44.patch)
===================================================================
--- extra-x86_64/cln-gcc44.patch	                        (rev 0)
+++ extra-x86_64/cln-gcc44.patch	2009-06-09 21:54:11 UTC (rev 42049)
@@ -0,0 +1,50 @@
+--- ./src/base/string/input/cl_st_get1.cc~	2000-12-14 11:53:06.000000000 -0500
++++ ./src/base/string/input/cl_st_get1.cc	2009-06-07 16:36:45.681507023 -0400
+@@ -1,6 +1,7 @@
+ // cl_fget().
+ 
+ // General includes.
++#include <cstdio>
+ #include "cl_sysdep.h"
+ 
+ // Specification.
+--- ./src/base/string/input/cl_st_get2.cc~	2000-12-14 11:53:06.000000000 -0500
++++ ./src/base/string/input/cl_st_get2.cc	2009-06-07 16:52:15.291008894 -0400
+@@ -1,6 +1,7 @@
+ // cl_fget().
+ 
+ // General includes.
++#include <cstdio>
+ #include "cl_sysdep.h"
+ 
+ // Specification.
+--- ./src/base/string/input/cl_st_getline1.cc~	2000-12-14 11:53:06.000000000 -0500
++++ ./src/base/string/input/cl_st_getline1.cc	2009-06-08 19:18:18.815843098 -0400
+@@ -1,6 +1,7 @@
+ // cl_fgetline().
+ 
+ // General includes.
++#include <cstdio>
+ #include "cl_sysdep.h"
+ 
+ // Specification.
+--- ./src/base/string/input/cl_st_getline2.cc~	2000-12-14 11:53:06.000000000 -0500
++++ ./src/base/string/input/cl_st_getline2.cc	2009-06-08 19:18:12.899175378 -0400
+@@ -1,6 +1,7 @@
+ // cl_fgetline().
+ 
+ // General includes.
++#include <cstdio>
+ #include "cl_sysdep.h"
+ 
+ // Specification.
+--- ./src/base/string/input/cl_st_gettoken.cc~	2004-06-23 17:11:21.000000000 -0400
++++ ./src/base/string/input/cl_st_gettoken.cc	2009-06-08 19:47:41.202332829 -0400
+@@ -1,6 +1,7 @@
+ // operator>>.
+ 
+ // General includes.
++#include <cstdio>
+ #include "cl_sysdep.h"
+ 
+ // Specification.

Copied: cln/repos/extra-x86_64/cln.install (from rev 42048, cln/trunk/cln.install)
===================================================================
--- extra-x86_64/cln.install	                        (rev 0)
+++ extra-x86_64/cln.install	2009-06-09 21:54:11 UTC (rev 42049)
@@ -0,0 +1,20 @@
+infodir=/usr/share/info
+filelist=(cln.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
+}