diff --git a/srcpkgs/cups/files/cups.logrotate b/srcpkgs/cups/files/cups.logrotate deleted file mode 100644 index 773c70fd2a..0000000000 --- a/srcpkgs/cups/files/cups.logrotate +++ /dev/null @@ -1,5 +0,0 @@ -/var/log/cups/*_log { - missingok - notifempty - sharedscripts -} diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template index 40e8cfebf2..5de8aa484e 100644 --- a/srcpkgs/cups/template +++ b/srcpkgs/cups/template @@ -1,7 +1,7 @@ # Template file for 'cups' pkgname=cups version=1.6.1 -revision=2 +revision=3 patch_args="-Np1" depends="libcups>=${version}_${revision} cups-filters bc" makedepends="automake perl pkg-config acl-devel jpeg-devel libpng-devel>=1.5.10 tiff-devel @@ -28,7 +28,6 @@ make_dirs=" subpackages="libcups cups-devel" systemd_services="cups.socket on" - conf_files=" /etc/cups/cupsd.conf /etc/cups/snmp.conf @@ -36,7 +35,6 @@ conf_files=" /etc/cups/classes.conf /etc/cups/subscriptions.conf /etc/dbus-1/system.d/cups.conf -/etc/logrotate.d/cups /etc/pam.d/cups" pre_configure() { @@ -81,9 +79,8 @@ do_install() { # fix .desktop file sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' \ ${DESTDIR}/usr/share/applications/cups.desktop - # Install pam and logrotate files. + # Install pam file vinstall ${FILESDIR}/cups.pam 644 etc/pam.d cups - vinstall ${FILESDIR}/cups.logrotate 644 etc/logrotate.d cups # Remove files provided by cups-filters. rm -f ${DESTDIR}/usr/share/cups/banners/*