cups: remove stuff owned by cups-filters and depend on it.

srcpkgs/cups/cups.rshlibs

@@ -3,7 +3,6 @@ libcups.so.2
 libpthread.so.0
 libc.so.6
 libm.so.6
-libcupsdriver.so.1
 libusb-1.0.so.0
 libcupscgi.so.1
 libdbus-1.so.3

srcpkgs/cups/template

@@ -1,12 +1,12 @@
 # Template file for 'cups'
 pkgname=cups
 version=1.5.3
-revision=4
+revision=5
 patch_args="-Np1"
 homepage="http://www.cups.org/"
 license="GPL-2"
 distfiles="ftp://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2"
-depends="libcups>=1.5.3_1"
+depends="libcups>=1.5.3_1 cups-filters"
 makedepends="automake acl-devel jpeg-devel libpng-devel tiff-devel openssl-devel pam-devel mit-krb5-devel poppler-devel libusb-devel avahi-libs-devel systemd-devel gnutls-devel"
 short_desc="Common Unix Printing System"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -23,6 +23,7 @@ make_dirs="
 /var/spool/cups/tmp 	0750 root root
 /etc/cups/ssl 		0700 root lp"
 
+subpackages="libcups cups-devel"
 systemd_services="cups.service on"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
@@ -37,8 +38,6 @@ conf_files="
 /etc/logrotate.d/cups
 /etc/pam.d/cups"
 
-subpackages="libcups cups-devel"
-
 pre_configure() {
 	aclocal -I config-scripts
 	autoconf -I config-scripts
@@ -81,4 +80,10 @@ do_install() {
 	# Install pam and logrotate files.
 	vinstall ${FILESDIR}/cups.pam 644 etc/pam.d cups
 	vinstall ${FILESDIR}/cups.logrotate 644 etc/logrotate.d cups
+
+	# Remove files provided by cups-filters (obsolete in 1.6 as well).
+	rm -f ${DESTDIR}/usr/lib/cups/backend/{parallel,serial}
+	rm -f ${DESTDIR}/usr/lib/cups/filter/{commandtoescpx,commandtopclx,imagetops,imagetoraster,pdftops,rastertoescpx,rastertopclx,texttops}
+	rm -f ${DESTDIR}/usr/share/cups/banners/{classified,confidential,secret,standard,topsecret,unclassified}
+	rm -f ${DESTDIR}/usr/share/cups/data/testprint
 }