diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-07-30 14:59:24 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-07-30 14:59:24 +0200 |
| commit | 09dd4a97fccc4bcabe341c4e4490004385283e53 (patch) | |
| tree | d00a22a0304969ff70ecc680f3e89b5fab1ecce6 /extra/cups | |
| parent | 3a3f329b736af639fdd3c9621816bad627b96903 (diff) | |
| parent | 4982c269b318734d01ad30c6592fbb73565ceb12 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/gource/PKGBUILD
community-staging/performous/PKGBUILD
community-staging/wt/PKGBUILD
extra/cups/PKGBUILD
extra/libwacom/PKGBUILD
extra/python-urwid/PKGBUILD
multilib/lib32-dbus-core/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-mpg123/PKGBUILD
multilib/lib32-readline/PKGBUILD
staging/hugin/PKGBUILD
testing/cups/PKGBUILD
testing/cups/cups-no-gzip-man.patch
testing/cups/cups-systemd-socket.patch
testing/cups/cups.install
testing/systemd/PKGBUILD
Diffstat (limited to 'extra/cups')
| -rw-r--r-- | extra/cups/PKGBUILD | 8 | ||||
| -rw-r--r-- | extra/cups/PKGBUILD.16 | 11 |
2 files changed, 10 insertions, 9 deletions
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index acb8b9998..7b4633aef 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163972 2012-07-23 03:04:02Z allan $ +# $Id: PKGBUILD 164175 2012-07-26 17:37:45Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase="cups" pkgname=('libcups' 'cups') -pkgver=1.5.3 -pkgrel=6 +pkgver=1.5.4 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.cups.org/" @@ -22,7 +22,7 @@ source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 cups-systemd-socket.patch cups cups.logrotate cups.pam) #options=('!emptydirs') -md5sums=('e1ad15257aa6f162414ea3beae0c5df8' +md5sums=('de3006e5cf1ee78a9c6145ce62c4e982' '12c8af5bcd3b8f84240280b3dfaf9e89' 'cdc1322c8014297ae349e2db78a03c5a' '1a5112f63958643f2888abc9418dbcac' diff --git a/extra/cups/PKGBUILD.16 b/extra/cups/PKGBUILD.16 index 01faba047..eb8e26473 100644 --- a/extra/cups/PKGBUILD.16 +++ b/extra/cups/PKGBUILD.16 @@ -3,23 +3,23 @@ pkgbase="cups" pkgname=('libcups' 'cups') -pkgver=1.6b1 +pkgver=1.6.0 pkgrel=1 arch=('i686' 'x86_64') license=('GPL') url="http://www.cups.org/" -makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc' 'colord' - 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme') +makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc' + 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme') source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 cups-no-export-ssllibs.patch cups-no-gcrypt.patch cups-no-gzip-man.patch cups cups.logrotate cups.pam) #options=('!emptydirs') -md5sums=('468a40755a872d84be89111ce97a69d1' +md5sums=('07157b243dd11e90e3f654c4d62e7c8a' '9b8467a1e51d360096b70e2c3c081e6c' '3733c23e77eb503bd94cc368e02830dc' - '90c30380d4c8cd48a908cfdadae1ea24' + 'c9159ba1233902ba6ddbbe6885a46b72' '9657daa21760bb0b5fa3d8b51d5e01a1' 'f861b18f4446c43918c8643dcbbd7f6d' '96f82c38f3f540b53f3e5144900acf17') @@ -40,6 +40,7 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libdir=/usr/lib \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ --with-logdir=/var/log/cups \ --with-docdir=/usr/share/cups/doc \ --with-cups-user=daemon \ |