[arch-commits] Commit in cups/repos (extra-i686 extra-i686/PKGBUILD)
andyrtr at archlinux.org
andyrtr at archlinux.org
Fri Apr 24 21:23:55 UTC 2009
Date: Friday, April 24, 2009 @ 17:23:54
Author: andyrtr
Revision: 36565
Merged revisions 36562 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/cups/trunk
........
r36562 | andyrtr | 2009-04-24 21:17:34 +0000 (Fr, 24 Apr 2009) | 2 lines
upgpkg: cups 1.3.10-2
fix pdf handling, add poppler dep, set raw printing by default; enable our optimizations
........
Modified:
cups/repos/extra-i686/ (properties)
cups/repos/extra-i686/PKGBUILD
----------+
PKGBUILD | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
Property changes on: cups/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /cups/trunk:1-35832
+ /cups/trunk:1-36564
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-04-24 21:19:31 UTC (rev 36564)
+++ extra-i686/PKGBUILD 2009-04-24 21:23:54 UTC (rev 36565)
@@ -3,12 +3,12 @@
pkgname=cups
pkgver=1.3.10
-pkgrel=1
+pkgrel=2
pkgdesc="The CUPS Printing System"
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.cups.org/"
-depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'xdg-utils' 'avahi' 'heimdal>=1.2.1-3' 'gnutls>=2.6.5')
+depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'xdg-utils' 'avahi' 'heimdal>=1.2.1-3' 'gnutls>=2.6.5' 'poppler>=0.10.6')
makedepends=('xinetd')
install=cups.install
backup=(etc/cups/{printers.conf,client.conf,cupsd.conf,mime.types,mime.convs}
@@ -25,25 +25,26 @@
'99e54c2fc138360bb7622bea4f0977bc')
build() {
- cd ${startdir}/src/${pkgname}-${pkgver}
+ cd ${srcdir}/${pkgname}-${pkgver}
patch -p1 < ../cups-1.3.7-peercred.patch || return 1
# fix french search template
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--with-logdir=/var/log/cups -with-docdir=/usr/share/cups/doc \
--with-cups-user=daemon --with-cups-group=lp --enable-ssl=yes \
- --enable-pam=yes --disable-ldap --disable-dbus
+ --enable-pam=yes --disable-ldap --disable-dbus --enable-raw-printing \
+ --enable-pdftops --with-pdftops=pdftops --with-optim="$CFLAGS"
make || return 1
#Wreck out cups library installation
sed -i -e 's/^DIRS\s=\scups/DIRS = /' Makefile
- make BUILDROOT=${startdir}/pkg install
+ make BUILDROOT=${pkgdir} install
#Wreck out some stuff included in libcups
if [ "$CARCH" = "x86_64" ]; then
- if [ -f $startdir/pkg/usr/lib64 ]; then
- rm -rf ${startdir}/pkg/usr/lib64/
+ if [ -f $pkgdir/usr/lib64 ]; then
+ rm -rf ${pkgdir}/usr/lib64/
fi
fi
rm -f ${startdir}/pkg/usr/lib/libcupsimage.so*
@@ -61,12 +62,10 @@
chmod 755 ${startdir}/pkg/var/spool
chmod 755 ${startdir}/pkg/etc
- # Enable raw printing by default [FS #2447]
- sed -i 's|^#application/octet-stream|application/octet-stream|' ${startdir}/pkg/etc/cups/{mime.types,mime.convs}
-
# add own cupsd.conf with saner defaults as normal file
rm ${startdir}/pkg/etc/cups/cupsd.conf
install -D -m 644 ${startdir}/src/cupsd.conf ${startdir}/pkg/etc/cups/cupsd.conf
+
# fix .desktop file
sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' $startdir/pkg/usr/share/applications/cups.desktop
}
More information about the arch-commits
mailing list