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

[Alexander Fehr]

    Date: Saturday, December 6, 2008 @ 09:28:02
  Author: alexanderf
Revision: 20752

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

........
  r20747 | alexanderf | 2008-12-06 15:24:14 +0100 (Sa, 06 Dez 2008) | 1 line
  
  upgpkg: xarchiver 0.5.2-1
........

Added:
  xarchiver/repos/extra-x86_64/ChangeLog
    (from rev 20747, xarchiver/trunk/ChangeLog)
Modified:
  xarchiver/repos/extra-x86_64/	(properties)
  xarchiver/repos/extra-x86_64/PKGBUILD
  xarchiver/repos/extra-x86_64/xarchiver.install

-------------------+
 ChangeLog         |    9 +++++++++
 PKGBUILD          |   42 +++++++++++++++++++++++++++---------------
 xarchiver.install |   45 ++-------------------------------------------
 3 files changed, 38 insertions(+), 58 deletions(-)


Property changes on: xarchiver/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /xarchiver/trunk:1-12081
   + /xarchiver/trunk:1-20751

Copied: xarchiver/repos/extra-x86_64/ChangeLog (from rev 20747, xarchiver/trunk/ChangeLog)
===================================================================
--- extra-x86_64/ChangeLog	                        (rev 0)
+++ extra-x86_64/ChangeLog	2008-12-06 14:28:02 UTC (rev 20752)
@@ -0,0 +1,9 @@
+2008-11-27  Alexander Fehr  <pizzapunk gmail com>
+
+  * xarchiver-0.5.2-1:
+  New upstream release.
+  New maintainer.
+  Changed license to GPL.
+  Added dependencies on desktop-file-utils and hicolor-icon-theme.
+  Replaced install message with optdepends.
+  Added ChangeLog.

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-12-06 14:26:22 UTC (rev 20751)
+++ extra-x86_64/PKGBUILD	2008-12-06 14:28:02 UTC (rev 20752)
@@ -1,25 +1,37 @@
 # $Id$
+# Maintainer: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Andrew Simmons <andrew.simmons at gmail.com>
 
 pkgname=xarchiver
-pkgver=0.5.0beta1
-pkgrel=6
-pkgdesc="a GUI for multiple archive types"
-arch=(i686 x86_64)
-license=('GPL2')
+pkgver=0.5.2
+pkgrel=1
+pkgdesc="GTK+ frontend to various command line archivers"
+arch=('i686' 'x86_64')
+url="http://xarchiver.xfce.org/"
+license=('GPL')
 groups=('xfce4-goodies')
-url="http://xarchiver.xfce.org"
-depends=('gtk2')
-makedepends=('intltool' 'pkgconfig')
+depends=('gtk2' 'desktop-file-utils' 'hicolor-icon-theme')
+makedepends=('intltool')
+optdepends=('tar: TAR support'
+            'gzip: GZIP support'
+            'bzip2: BZIP2 support'
+            'zip: ZIP support'
+            'unzip: ZIP support'
+            'unrar: RAR support'
+            'p7zip: 7z support'
+            'arj: ARJ support'
+            'lha: LHA support'
+            'lzma-utils: LZMA support'
+            'lzop: LZOP support')
 options=('!libtool')
-install=${pkgname}.install
-source=(http://dl.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('d57dcae78473681d6cd3b8dcf6e5c3d1')
+install=xarchiver.install
+source=(http://downloads.sourceforge.net/xarchiver/xarchiver-$pkgver.tar.bz2)
+md5sums=('2bc7f06403cc6582dd4a8029ec9d038d')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/xfce4 \
-    --localstatedir=/var --disable-static
+  cd "$srcdir/xarchiver-$pkgver"
+
+  ./configure --prefix=/usr --libexecdir=/usr/lib/xfce4 || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR="$pkgdir" install || return 1
 }

Modified: extra-x86_64/xarchiver.install
===================================================================
--- extra-x86_64/xarchiver.install	2008-12-06 14:26:22 UTC (rev 20751)
+++ extra-x86_64/xarchiver.install	2008-12-06 14:28:02 UTC (rev 20752)
@@ -1,53 +1,12 @@
-# arg 1:  the new package version
 post_install() {
-
-  # Check to see if the user needs to know about other archive types
-  which zip &> /dev/null
-  haszip=$?
-  which unzip &> /dev/null
-  hasunzip=$?
-  which unrar &> /dev/null
-  hasrar=$?
-  which 7z &> /dev/null
-  has7z=$?
-  which arj &> /dev/null
-  hasarj=$?
-
-  if [ $haszip -eq 1 -o $hasunzip -eq 1 -o $hasrar -eq 1 -o $has7z -eq 1 -o $hasarj -eq 1 ]; then
-
-    echo ">>> Certain archive types cannot be opened without the following:"
-
-    if [ $haszip -eq 1 -o $hasunzip -eq 1 ]; then
-      echo ">>> - for zip support, install the 'zip' and 'unzip' packages."
-    fi
-
-    if [ $hasrar -eq 1 ]; then
-      echo ">>> - for rar support, install the 'unrar' package."
-    fi
-
-    if [ $has7z -eq 1 ]; then
-      echo ">>> - for 7zip (7z) support, install the 'p7zip' package."
-    fi
-
-    if [ $hasarj -eq 1 ]; then
-      echo ">>> - for arj support, install the 'arj' package."
-    fi
-  fi
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }
-
-op=$1
-shift
-$op $*