hplip-libre-3.12.11-2: updating version

1 files changed, 25 insertions, 17 deletions

diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index aa7dea706..069fa612d 100755
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 144357 2011-12-05 03:44:51Z eric $
+# $Id: PKGBUILD 172168 2012-11-30 14:31:06Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
-# Maintainer : Rémy Oudompheng <remy@archlinux.org>
+# Contributor : Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
 # Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
 
 _pkgname=hplip
 pkgname=hplip-libre
-pkgver=3.12.6
-pkgrel=3
+pkgver=3.12.11
+pkgrel=2
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet (without hplip-plugin binary blobs recommendation)"
 arch=('i686' 'x86_64')
 url="http://hplipopensource.com"
 license=('GPL')
 depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
-	 'net-snmp>=5.7.1')
+	 'net-snmp>=5.7.1' 'wget')
 makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 'libusbx')
 optdepends=('cups: for printing support'
             'python2-dbus: for dbus support'
             'sane: for scanner support'
-            'python-imaging: for commandline scanning support'
-            'python-notify: for Desktop notification support'
+            'python2-imaging: for commandline scanning support'
+            'python2-notify: for Desktop notification support'
             'rpcbind: for network support'
             'python2-pyqt: for running hp-toolbox'
             'python2-gobject2: for running hp-toolbox'
@@ -29,16 +29,19 @@ conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver}")
 options=('!libtool')
 install=hplip.install
-source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc})
-md5sums=('5303938e8630775ea6fb383af85775e5'
-         'b562457e4c713d8609b3d6dd2be10baf')
+source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc}
+        cups-1.6-buildfix.diff)
 
 build() {
  cd "$srcdir/$_pkgname-$pkgver"
+
+ # fix build with cups 1.6 - FC hplip-ipp-accessors.patch
+ patch -p1 -i "${srcdir}/cups-1.6-buildfix.diff"
+ 
  export PYTHON=python2
  
  find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
- sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' setup.py makeuri.py base/magic.py
+ sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' setup.py makeuri.py logcapture.py base/magic.py
  sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py uninstall.py upgrade.py config_usb_printer.py
  sed -i 's|python ./print.py|python2 ./print.py|' scan.py
  sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
@@ -46,7 +49,9 @@ build() {
  sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
  sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
  
-
+ # fix rc script path - FS#31921
+ sed -i 's|\/etc\/init.d\/cupsys|\/etc\/rc.d\/cupsd|g' setup.py
+ 
  # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
  # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
  # The hpcups driver does not use foomatic-rip
@@ -78,13 +83,16 @@ build() {
 }
 
 package() {
- cd "$srcdir/$_pkgname-$pkgver"
- make rulesdir=/lib/udev/rules.d DESTDIR="$pkgdir/" install
+ #cd "$srcdir/$_pkgname-$pkgver"
+ cd "$srcdir/$_pkgname-${pkgver/.a/a}"
+ make rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install
  # remove config provided by sane and autostart of hp-daemon
  rm -rf "$pkgdir"/etc/{sane.d,xdg}
  # remove HAL .fdi file because HAL is no longer used
  rm -rf "$pkgdir"/usr/share/hal
- # move to /usr
- mv "$pkgdir"/lib/udev "$pkgdir"/usr/lib/
- rm "$pkgdir"/lib -r
+ # log dir should not be world writeable
+ chmod 775 "$pkgdir"/var/log/hp{,/tmp}
 }
+md5sums=('6caadc4a9e49076c284b146e2dce2937'
+         '835d3b854d097f229a32291338fa2320'
+         'ef64578c6cb3ce252dbdcb0f1c2f4a47')