[arch-commits] Commit in maxima/repos (3 files)

[Ronald van Haren]

    Date: Friday, September 26, 2008 @ 04:15:33
  Author: ronald
Revision: 13309

Merged revisions 13036,13306 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/maxima/trunk

........
  r13036 | ronald | 2008-09-25 21:41:33 +0200 (Thu, 25 Sep 2008) | 1 line
  
  upgpkg: maxima 5.16.3-2
........
  r13306 | ronald | 2008-09-26 10:07:19 +0200 (Fri, 26 Sep 2008) | 1 line
  
  upgpkg: maxima 5.16.3-2
........

Modified:
  maxima/repos/extra-i686/	(properties)
  maxima/repos/extra-i686/PKGBUILD
  maxima/repos/extra-i686/maxima.install

----------------+
 PKGBUILD       |   13 +++++++++----
 maxima.install |   31 +++++++++++++++++++++++--------
 2 files changed, 32 insertions(+), 12 deletions(-)


Property changes on: maxima/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /maxima/trunk:1-12732
   + /maxima/trunk:1-13308

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-09-26 08:08:26 UTC (rev 13308)
+++ extra-i686/PKGBUILD	2008-09-26 08:15:33 UTC (rev 13309)
@@ -5,7 +5,7 @@
 
 pkgname=maxima
 pkgver=5.16.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Maxima - a sophisticated computer algebra system"
 arch=("i686" "x86_64")
 license=('GPL')
@@ -23,18 +23,23 @@
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
+  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info \
+	--libexecdir=/usr/lib
   make || return 1
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR=$pkgdir install
   
   # install some freedesktop.org compatibility
-  install -D -m644 $srcdir/$pkgname.desktop \
+  install -Dm644 $srcdir/$pkgname.desktop \
   	$pkgdir/usr/share/applications/$pkgname.desktop
   
   # make sure, we have a nice icon for the desktop file at the right place ;)
   install -d $pkgdir/usr/share/pixmaps/
   ln -s /usr/share/maxima/${pkgver}/xmaxima/maxima-new.png \
 	$pkgdir/usr/share/pixmaps/${pkgname}.png
+
+# remove /usr/share/info/dir file
+  rm -f $pkgdir/usr/share/info/dir
+
 }
 
 

Modified: extra-i686/maxima.install
===================================================================
--- extra-i686/maxima.install	2008-09-26 08:08:26 UTC (rev 13308)
+++ extra-i686/maxima.install	2008-09-26 08:15:33 UTC (rev 13309)
@@ -1,11 +1,26 @@
-# arg 1:  the new package version
-post_install() {
+ infodir=/usr/share/info
+  filelist=(imaxima.info maxima.info xmaxima.info)
+
+  post_install() {
   echo "update desktop and mime database..."
   update-desktop-database
-}
 
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+
+  }
+
+  post_upgrade() {
+    post_install $1
+  }
+
+  post_remove() {
+  echo "update desktop and mime database..."
+  update-desktop-database
+
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+
+  }