Author: baggins Date: Sun Feb 5 15:47:31 2012 GMT Module: packages Tag: HEAD ---- Log message: - 1.5.2 will be released later today - revert avahi (works with real 1.5.1) - added systemd service - added new translations
---- Files affected: packages/cups: cups.spec (1.318 -> 1.319) ---- Diffs: ================================================================ Index: packages/cups/cups.spec diff -u packages/cups/cups.spec:1.318 packages/cups/cups.spec:1.319 --- packages/cups/cups.spec:1.318 Sun Feb 5 14:42:31 2012 +++ packages/cups/cups.spec Sun Feb 5 16:47:26 2012 @@ -2,8 +2,8 @@ # # Conditional build: %bcond_with gnutls # use GNU TLS for SSL/TLS support (instead of OpenSSL) -%bcond_without dnssd # DNS Service Discovery support (obsoleted by Avahi patch) -%bcond_with avahi # DNS Service Discovery support via Avahi +%bcond_with dnssd # DNS Service Discovery support (obsoleted by Avahi patch) +%bcond_without avahi # DNS Service Discovery support via Avahi %bcond_without ldap # do not include LDAP support %bcond_without gssapi # do not include GSSAPI support %bcond_without php # don't build PHP extension/support in web interface @@ -17,13 +17,13 @@ Summary(pl.UTF-8): Ogólny system druku dla Uniksa Summary(pt_BR.UTF-8): Sistema Unix de Impressão Name: cups -Version: 1.5.1 +Version: 1.5.2 Release: 0.1 Epoch: 1 License: LGPL v2 (libraries), GPL v2 (the rest) + openssl exception Group: Applications/Printing Source0: http://ftp.easysw.com/pub/cups/%{version}/%{name}-%{version}-source.tar.bz2 -# Source0-md5: 7e7026f5b6392deae46f889129b196a7 +# Source0-md5: - Source1: %{name}.init Source2: %{name}.pamd Source3: %{name}.logrotate @@ -31,6 +31,7 @@ Source5: %{name}-lpd.inetd Source6: %{name}-modprobe.conf Source7: %{name}.tmpfiles +Source8: %{name}.service # svn diff http://svn.easysw.com/public/cups/tags/release-1.4.3/ http://svn.easysw.com/public/cups/branches/branch-1.4/ > cups-branch.diff # + drop config-scripts/cups-common.m4 change Patch0: %{name}-config.patch @@ -74,13 +75,14 @@ %{?with_php:BuildRequires: php-devel >= 4:5.0.0} BuildRequires: pkgconfig BuildRequires: rpm-perlprov -BuildRequires: rpmbuild(macros) >= 1.344 +BuildRequires: rpmbuild(macros) >= 1.641 Requires(post,preun): /sbin/chkconfig Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: openssl-tools Requires: pam >= 0.77.3 Requires: perl-modules Requires: rc-scripts +Requires: systemd-units Suggests: ImageMagick-coder-pdf Suggests: cups-filter-pstoraster Suggests: ghostscript-cups @@ -391,7 +393,7 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,logrotate.d,modprobe.d,security,sysconfig/rc-inetd} \ $RPM_BUILD_ROOT/var/run/cups \ $RPM_BUILD_ROOT/var/log/{,archive/}cups \ - $RPM_BUILD_ROOT/usr/lib/tmpfiles.d + $RPM_BUILD_ROOT{%{systemdunitdir},%{systemdtmpfilesdir}} %{__make} install \ BUILDROOT=$RPM_BUILD_ROOT \ @@ -427,7 +429,8 @@ install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/cups/mailto.conf sed -e 's|__ULIBDIR__|%{_ulibdir}|g' %{SOURCE5} > $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/cups-lpd install %{SOURCE6} $RPM_BUILD_ROOT/etc/modprobe.d/cups.conf -install %{SOURCE7} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf +install %{SOURCE7} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf +install %{SOURCE8} $RPM_BUILD_ROOT%{systemdunitdir}/cups.service touch $RPM_BUILD_ROOT/var/log/cups/{access_log,error_log,page_log} touch $RPM_BUILD_ROOT/etc/security/blacklist.cups @@ -465,12 +468,20 @@ /sbin/chkconfig --add cups %service cups restart "cups daemon" /sbin/rmmod usblp > /dev/null 2>&1 || : +%systemd_post cups.service %preun if [ "$1" = "0" ]; then %service cups stop /sbin/chkconfig --del cups fi +%systemd_preun cups.service + +%postun +%systemd_reload + +%triggerpostun -- cups < 1.5.2-1 +%systemd_trigger cups.service %post lib -p /sbin/ldconfig %postun lib -p /sbin/ldconfig @@ -500,6 +511,8 @@ %attr(754,root,root) /etc/rc.d/init.d/cups /etc/dbus-1/system.d/cups.conf /etc/modprobe.d/cups.conf +%{systemdunitdir}/cups.service +%{systemdtmpfilesdir}/%{name}.conf %attr(600,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/classes.conf %attr(640,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/cupsd.conf %attr(600,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/printers.conf @@ -529,6 +542,8 @@ %lang(de) %{_ulibdir}/cups/cgi-bin/de %lang(es) %{_ulibdir}/cups/cgi-bin/es %lang(eu) %{_ulibdir}/cups/cgi-bin/eu +%lang(fr) %{_ulibdir}/cups/cgi-bin/fr +%lang(hu) %{_ulibdir}/cups/cgi-bin/hu %lang(id) %{_ulibdir}/cups/cgi-bin/id %lang(it) %{_ulibdir}/cups/cgi-bin/it %lang(ja) %{_ulibdir}/cups/cgi-bin/ja @@ -577,6 +592,8 @@ %lang(de) %{_datadir}/cups/templates/de %lang(es) %{_datadir}/cups/templates/es %lang(eu) %{_datadir}/cups/templates/eu +%lang(fr) %{_datadir}/cups/templates/fr +%lang(hu) %{_datadir}/cups/templates/hu %lang(id) %{_datadir}/cups/templates/id %lang(it) %{_datadir}/cups/templates/it %lang(ja) %{_datadir}/cups/templates/ja @@ -601,7 +618,6 @@ %{_mandir}/man8/cupsfilter.8* %{_mandir}/man8/lp* -/usr/lib/tmpfiles.d/%{name}.conf %dir %attr(775,root,lp) /var/cache/cups %dir %attr(755,root,lp) /var/lib/cups %dir %attr(511,lp,sys) /var/lib/cups/certs @@ -633,6 +649,7 @@ %lang(eu) %{_datadir}/locale/eu/cups_eu.po %lang(fi) %{_datadir}/locale/fi/cups_fi.po %lang(fr) %{_datadir}/locale/fr/cups_fr.po +%lang(hu) %{_datadir}/locale/hu/cups_hu.po %lang(id) %{_datadir}/locale/id/cups_id.po %lang(it) %{_datadir}/locale/it/cups_it.po %lang(ko) %{_datadir}/locale/ko/cups_ko.po @@ -757,6 +774,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.319 2012/02/05 15:47:26 baggins +- 1.5.2 will be released later today +- revert avahi (works with real 1.5.1) +- added systemd service +- added new translations + Revision 1.318 2012/02/05 13:42:31 baggins - revert last commit - looks like iProgrammers put 1.6rc as 1.5.1, we'll have to wait for proper tar.bz2 :/ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cups/cups.spec?r1=1.318&r2=1.319&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
