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

[Jan de Groot]

    Date: Saturday, May 9, 2009 @ 15:11:36
  Author: jgc
Revision: 38648

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

........
  r38512 | jgc | 2009-05-08 22:42:46 +0200 (Fri, 08 May 2009) | 2 lines
  
  upgpkg: wxmaxima 0.8.2-2
      Remove update-desktop-database calls
........

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

------------------+
 PKGBUILD         |   19 +++++++++----------
 wxmaxima.install |   17 -----------------
 2 files changed, 9 insertions(+), 27 deletions(-)


Property changes on: wxmaxima/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /wxmaxima/trunk:1-36538
   + /wxmaxima/trunk:1-38647

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-05-09 19:06:29 UTC (rev 38647)
+++ extra-i686/PKGBUILD	2009-05-09 19:11:36 UTC (rev 38648)
@@ -5,28 +5,27 @@
 
 pkgname=wxmaxima
 pkgver=0.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A wxWidgets GUI for the computer algebra system Maxima"
 arch=('i686' 'x86_64')
 url="http://wxmaxima.sourceforge.net/"
 license=('GPL2')
-depends=('maxima>=5.18.1' 'libxml2' 'wxgtk')
+depends=('maxima>=5.18.1' 'libxml2>=2.7.3' 'wxgtk>=2.8.9.2')
 source=(http://downloads.sourceforge.net/$pkgname/wxMaxima-$pkgver.tar.gz)
-install=wxmaxima.install
 md5sums=('d3d4abde8495aebb295df587587de4a8')
 
 build() {
-  cd ${srcdir}/wxMaxima-$pkgver
-  ./configure --prefix=/usr
+  cd "${srcdir}/wxMaxima-${pkgver}"
+  ./configure --prefix=/usr || return 1
   make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR="${pkgdir}" install || return 1
 
   # Fix category in .desktop file
   sed -i -e 's/Utility;X-Red-Hat-Base;X-Red-Hat-Base-Only;/Science;Math;/' wxmaxima.desktop
   
   # Install desktop file and icon
-  install -Dm644  wxmaxima.desktop \
-  	${pkgdir}/usr/share/applications/wxmaxima.desktop
-  install -Dm644  ${srcdir}/wxMaxima-${pkgver}/data/wxmaxima.png \
-  	${pkgdir}/usr/share/pixmaps/wxmaxima.png
+  install -m755 -d "${pkgdir}/usr/share/applications"
+  install -m755 -d "${pkgdir}/usr/share/pixmaps"
+  install -m644 wxmaxima.desktop "${pkgdir}/usr/share/applications/" || return 1
+  install -m644 data/wxmaxima.png "${pkgdir}/usr/share/pixmaps/" || return 1
 }

Deleted: extra-i686/wxmaxima.install
===================================================================
--- extra-i686/wxmaxima.install	2009-05-09 19:06:29 UTC (rev 38647)
+++ extra-i686/wxmaxima.install	2009-05-09 19:11:36 UTC (rev 38648)
@@ -1,17 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  update-desktop-database -q
-}
-
-op=$1
-shift
-
-$op $*
-