diff --git a/srcpkgs/cups/cups-devel.template b/srcpkgs/cups/cups-devel.template index d27f6890af..3cb7f18b25 100644 --- a/srcpkgs/cups/cups-devel.template +++ b/srcpkgs/cups/cups-devel.template @@ -5,8 +5,12 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." +Add_dependency run gnutls-devel Add_dependency run libcups ">=${version}" +revision=1 +noarch=yes + do_install() { vmove usr/include usr vmove usr/bin/cups-config usr/bin diff --git a/srcpkgs/cups/cups.rshlibs b/srcpkgs/cups/cups.rshlibs index 2845847eb7..b9613916a1 100644 --- a/srcpkgs/cups/cups.rshlibs +++ b/srcpkgs/cups/cups.rshlibs @@ -11,8 +11,6 @@ libcupsppdc.so.1 libstdc++.so.6 libgcc_s.so.1 libcupsmime.so.1 -libssl.so.1 -libcrypto.so.1 libpam.so.0 libacl.so.1 libgssapi_krb5.so.2 @@ -20,3 +18,4 @@ libkrb5.so.3 libavahi-common.so.3 libavahi-client.so.3 libsystemd-daemon.so.0 +libgnutls.so.26 diff --git a/srcpkgs/cups/depends b/srcpkgs/cups/depends index c5ed341a13..a229574c07 100644 --- a/srcpkgs/cups/depends +++ b/srcpkgs/cups/depends @@ -1,2 +1,2 @@ abi_depends=">=1.5.3" -api_depends="${abi_depends}" +api_depends=">=1.5.3_1" diff --git a/srcpkgs/cups/libcups.rshlibs b/srcpkgs/cups/libcups.rshlibs index 43018ab065..827c31dcb0 100644 --- a/srcpkgs/cups/libcups.rshlibs +++ b/srcpkgs/cups/libcups.rshlibs @@ -1,6 +1,4 @@ libgssapi_krb5.so.2 -libssl.so.1 -libcrypto.so.1 libpthread.so.0 libm.so.6 libz.so.1 @@ -13,3 +11,4 @@ libstdc++.so.6 libgcc_s.so.1 libavahi-common.so.3 libavahi-client.so.3 +libgnutls.so.26 diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template index 820373763f..5a770462a1 100644 --- a/srcpkgs/cups/template +++ b/srcpkgs/cups/template @@ -49,6 +49,7 @@ Add_dependency build poppler-devel Add_dependency build libusb-devel Add_dependency build avahi-libs-devel Add_dependency build systemd-devel +Add_dependency build gnutls-devel pre_configure() { aclocal -I config-scripts @@ -58,7 +59,7 @@ pre_configure() { do_configure() { ./configure ${CONFIGURE_SHARED_ARGS} --libdir=/usr/lib \ --enable-acl --enable-dbus --enable-raw-printing \ - --disable-gnutls --enable-threads --with-logdir=/var/log/cups \ + --enable-threads --with-logdir=/var/log/cups \ --with-docdir=/usr/share/cups/doc --with-cups-user=daemon \ --with-cups-group=lp --enable-pam=yes --disable-ldap \ --enable-avahi --enable-pam --enable-ssl \