diff --git a/srcpkgs/cups/cups-devel.template b/srcpkgs/cups/cups-devel.template index 989c4a899b..a395fbcf5c 100644 --- a/srcpkgs/cups/cups-devel.template +++ b/srcpkgs/cups/cups-devel.template @@ -1,14 +1,12 @@ # Template file for 'cups-devel'. # -depends="gnutls-devel libcups>=1.5.3" +noarch=yes +depends="gnutls-devel libcups>=$version" short_desc="${short_desc} -- development files" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." - -noarch=yes - do_install() { vmove usr/include usr vmove usr/bin/cups-config usr/bin diff --git a/srcpkgs/cups/libcups.rshlibs b/srcpkgs/cups/libcups.rshlibs index 827c31dcb0..d60992bbec 100644 --- a/srcpkgs/cups/libcups.rshlibs +++ b/srcpkgs/cups/libcups.rshlibs @@ -4,7 +4,6 @@ libm.so.6 libz.so.1 libc.so.6 libtiff.so.5 -libpng14.so.14 libjpeg.so.8 libcrypt.so.1 libstdc++.so.6 @@ -12,3 +11,4 @@ libgcc_s.so.1 libavahi-common.so.3 libavahi-client.so.3 libgnutls.so.26 +libpng15.so.15 diff --git a/srcpkgs/cups/libcups.template b/srcpkgs/cups/libcups.template index f350462aa0..1b59033d49 100644 --- a/srcpkgs/cups/libcups.template +++ b/srcpkgs/cups/libcups.template @@ -5,7 +5,6 @@ long_desc="${long_desc} This package contains the runtime shared libraries." - do_install() { vmove "usr/lib/*.so*" usr/lib } diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template index 6bb40929b4..ed94a314ea 100644 --- a/srcpkgs/cups/template +++ b/srcpkgs/cups/template @@ -1,13 +1,13 @@ # Template file for 'cups' pkgname=cups version=1.5.3 -revision=6 +revision=7 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 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" +depends="libcups>=${version}_${revision} cups-filters" +makedepends="automake acl-devel jpeg-devel libpng-devel>=1.5.10 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 " checksum=9d716a8ffcefdaff1c37f4a4b590f1d74ff9ff72383a18f3c883c9235907f93d