diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-15 10:55:52 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-15 10:55:52 +0100 |
| commit | 1f8bbc40bc42f162b7b62e0dca5176ba3d0b39a4 (patch) | |
| tree | b19a7be5f8a23cdf854c9694f968a531244204d2 /libre/hplip-libre | |
| parent | 2e3ca4b49391dc8484dd6064828ee42cbe66ed03 (diff) | |
| parent | eebfa6ebe1522831767019e496b0c094b2e15a5c (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/audex/PKGBUILD
community/gimp-ufraw/PKGBUILD
community/ogmrip/PKGBUILD
community/oss/PKGBUILD
community/ruby-gtk2/PKGBUILD
community/soundkonverter/PKGBUILD
core/iptables/PKGBUILD
core/libffi/PKGBUILD
extra/clamav/PKGBUILD
extra/ecasound/PKGBUILD
extra/mariadb/PKGBUILD
extra/mesa/PKGBUILD
Diffstat (limited to 'libre/hplip-libre')
| -rw-r--r-- | libre/hplip-libre/PKGBUILD | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index 84e67ff44..0191964f8 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179659 2013-03-09 09:20:06Z andyrtr $ +# $Id: PKGBUILD 180013 2013-03-14 18:45:58Z andyrtr $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor : Rémy Oudompheng <remy@archlinux.org> # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org> @@ -7,7 +7,7 @@ _pkgname=hplip pkgname=hplip-libre pkgver=3.13.3 -pkgrel=1 +pkgrel=2 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet (without hplip-plugin binary blobs recommendation)" arch=('i686' 'x86_64' 'mips64el') url="http://hplipopensource.com" @@ -24,9 +24,9 @@ optdepends=('cups: for printing support' 'python2-pyqt: for running hp-toolbox' 'python2-gobject2: for running hp-toolbox' 'libusbx: for advanced usb support') -replaces=("${_pkgname}") -conflicts=("${_pkgname}") -provides=("${_pkgname}=${pkgver}") +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver options=('!libtool') install=hplip.install source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc} @@ -94,4 +94,7 @@ package() { chmod 775 "$pkgdir"/var/log/hp{,/tmp} # remove rc script rm -rf "$pkgdir"/etc/init.d + + # fix broken udev rule - FS#34282 + sed -i "s:\$attrs:\$attr:g" $pkgdir/usr/lib/udev/rules.d/56-hpmud_support.rules } |