cups: rebuild against libpng-1.5.

This commit is contained in:
Juan RP 2012-06-06 08:33:20 +02:00
parent 0d544dfeca
commit c588f50cd2
4 changed files with 6 additions and 9 deletions

View file

@ -1,14 +1,12 @@
# Template file for 'cups-devel'. # 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" short_desc="${short_desc} -- development files"
long_desc="${long_desc} long_desc="${long_desc}
This package contains files for development, headers, static libs, etc." This package contains files for development, headers, static libs, etc."
noarch=yes
do_install() { do_install() {
vmove usr/include usr vmove usr/include usr
vmove usr/bin/cups-config usr/bin vmove usr/bin/cups-config usr/bin

View file

@ -4,7 +4,6 @@ libm.so.6
libz.so.1 libz.so.1
libc.so.6 libc.so.6
libtiff.so.5 libtiff.so.5
libpng14.so.14
libjpeg.so.8 libjpeg.so.8
libcrypt.so.1 libcrypt.so.1
libstdc++.so.6 libstdc++.so.6
@ -12,3 +11,4 @@ libgcc_s.so.1
libavahi-common.so.3 libavahi-common.so.3
libavahi-client.so.3 libavahi-client.so.3
libgnutls.so.26 libgnutls.so.26
libpng15.so.15

View file

@ -5,7 +5,6 @@ long_desc="${long_desc}
This package contains the runtime shared libraries." This package contains the runtime shared libraries."
do_install() { do_install() {
vmove "usr/lib/*.so*" usr/lib vmove "usr/lib/*.so*" usr/lib
} }

View file

@ -1,13 +1,13 @@
# Template file for 'cups' # Template file for 'cups'
pkgname=cups pkgname=cups
version=1.5.3 version=1.5.3
revision=6 revision=7
patch_args="-Np1" patch_args="-Np1"
homepage="http://www.cups.org/" homepage="http://www.cups.org/"
license="GPL-2" license="GPL-2"
distfiles="ftp://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2" distfiles="ftp://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2"
depends="libcups>=1.5.3_1 cups-filters" depends="libcups>=${version}_${revision} 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" 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" short_desc="Common Unix Printing System"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
checksum=9d716a8ffcefdaff1c37f4a4b590f1d74ff9ff72383a18f3c883c9235907f93d checksum=9d716a8ffcefdaff1c37f4a4b590f1d74ff9ff72383a18f3c883c9235907f93d