[arch-commits] Commit in hplip/trunk (PKGBUILD hplip.install)

[Eric Bélanger]

    Date: Saturday, March 5, 2011 @ 00:51:53
  Author: eric
Revision: 112525

upgpkg: hplip 3.11.1-2
Rebuilt for net-snmp 5.6.1, Removed obsolete post-upgrade function in .install file

Modified:
  hplip/trunk/PKGBUILD
  hplip/trunk/hplip.install

---------------+
 PKGBUILD      |   35 ++++++++++++++++++-----------------
 hplip.install |   15 ---------------
 2 files changed, 18 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-05 05:24:13 UTC (rev 112524)
+++ PKGBUILD	2011-03-05 05:51:53 UTC (rev 112525)
@@ -4,27 +4,29 @@
 
 pkgname=hplip
 pkgver=3.11.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
 arch=('i686' 'x86_64')
 url="http://hplipopensource.com"
 license=('GPL')
 makedepends=('python2-qt' 'pygobject' 'pkgconfig' 'sane' 'rpcbind' 'cups')
 depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
-	'libcups>=1.3.10-3' 'net-snmp>=5.5')
-replaces=('hpijs')
-options=('!libtool')
-install=hplip.install
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz)
+	'libcups>=1.3.10-3' 'net-snmp>=5.6.1' 'libusb-compat')
 optdepends=('cups: for printing support'
             'dbus-python: for dbus support'
             'sane: for scanner support'
             'rpcbind: for network support'
             'python2-qt: for running hp-toolbox'
             'pygobject: for running hp-toolbox')
+replaces=('hpijs')
+options=('!libtool')
+install=hplip.install
+source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz)
+md5sums=('86f63a00c911313206fef6a147f7faad')
+sha1sums=('6b06567373cadc7dff48134c6b58f90a4d72582a')
 
 build() {
- cd $srcdir/$pkgname-$pkgver
+ cd "$srcdir/$pkgname-$pkgver"
  find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
  ./configure --prefix=/usr \
              --enable-qt4 \
@@ -41,19 +43,18 @@
 }
 
 package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir/ install
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir/" install
 
- rm -rf $pkgdir/etc/sane.d
+ rm -rf "$pkgdir/etc/sane.d"
  # remove autostart of hp-daemon
- rm -r $pkgdir/etc/xdg
+ rm -r "$pkgdir/etc/xdg"
  # move udev rules to /lib/udev/rules.d
- mkdir -p $pkgdir/lib/udev/rules.d
- mv $pkgdir/etc/udev/rules.d/* $pkgdir/lib/udev/rules.d/
- rm -r $pkgdir/etc/udev
+ mkdir -p "$pkgdir/lib/udev/rules.d"
+ mv "$pkgdir"/etc/udev/rules.d/* "$pkgdir/lib/udev/rules.d/"
+ rm -r "$pkgdir/etc/udev"
  # remove lp user, it's not used on archlinux
- sed -i 's|OWNER="lp", ||g' $pkgdir/lib/udev/rules.d/40-hplip.rules
+ sed -i 's|OWNER="lp", ||g' "$pkgdir/lib/udev/rules.d/40-hplip.rules"
  # fix sysfs rules
- sed -i -e "s|SYSFS|ATTRS|g" -e "s|sysfs|attrs|g" $pkgdir/lib/udev/rules.d/56-hpmud_support.rules
+ sed -i -e "s|SYSFS|ATTRS|g" -e "s|sysfs|attrs|g" "$pkgdir/lib/udev/rules.d/56-hpmud_support.rules"
 }
-md5sums=('86f63a00c911313206fef6a147f7faad')

Modified: hplip.install
===================================================================
--- hplip.install	2011-03-05 05:24:13 UTC (rev 112524)
+++ hplip.install	2011-03-05 05:51:53 UTC (rev 112525)
@@ -7,19 +7,4 @@
 #  echo "hpaio" >> /etc/sane.d/dll.conf
 
 EOF
-  /bin/true
 }
-
-post_upgrade() {
-  post_install $1
-
-  cat << EOF
-
-UPGRADING
-----
-# This version no longer uses an init script. You should remove hplip
-# from the /etc/rc.conf daemon list.
-
-EOF
-  /bin/true
-}