SPECS: cups.spec - package more dirs/files - make rpmdb cups agree...

[glen]

Author: glen                         Date: Thu May 11 22:30:43 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- package more dirs/files
- make rpmdb cups agree on file permissions (cups wins)

---- Files affected:
SPECS:
   cups.spec (1.135 -> 1.136) 

---- Diffs:

================================================================
Index: SPECS/cups.spec
diff -u SPECS/cups.spec:1.135 SPECS/cups.spec:1.136
--- SPECS/cups.spec:1.135	Fri May 12 00:05:07 2006
+++ SPECS/cups.spec	Fri May 12 00:30:38 2006
@@ -1,12 +1,12 @@
 # $Revision$, $Date$
+# TODO:
+# - build/install java ext ?
+# - perl BRs
 #
 # Conditional build:
 %bcond_without	php	# don't build PHP extension
 %bcond_without	perl	# don't build Perl extension
 #
-# TODO:
-# - build/install java ext ?
-# - perl BRs
 %include	/usr/lib/rpm/macros.perl
 %define		pdir CUPS
 Summary:	Common Unix Printing System
@@ -14,7 +14,7 @@
 Summary(pt_BR):	Sistema Unix de Impressăo
 Name:		cups
 Version:	1.2.0
-Release:	0.1
+Release:	0.5
 Epoch:		1
 License:	GPL/LGPL
 Group:		Applications/Printing
@@ -332,6 +332,9 @@
 # windows drivers can be put there.
 install -d $RPM_BUILD_ROOT%{_datadir}/cups/drivers
 
+touch $RPM_BUILD_ROOT/var/cache/cups/{job,remote}.cache
+install -d $RPM_BUILD_ROOT/etc/cups/ssl
+
 # post-strip can't work on readonly files
 chmod u+w $RPM_BUILD_ROOT%{perl_vendorarch}/auto/CUPS/CUPS.so
 
@@ -375,8 +378,8 @@
 %attr(640,root,root) %config %verify(not md5 mtime size) /etc/pam.d/*
 %attr(754,root,root) /etc/rc.d/init.d/cups
 /etc/dbus-1/system.d/cups.conf
-%dir %{_sysconfdir}/%{name}
-%attr(640,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/classes.conf
+%dir %attr(755,root,lp) %{_sysconfdir}/%{name}
+%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(640,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/printers.conf
 %attr(640,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.convs
@@ -384,7 +387,7 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.cups
 #%dir %{_sysconfdir}/%{name}/certs
 %dir %{_sysconfdir}/%{name}/interfaces
-%dir %{_sysconfdir}/%{name}/ppd
+%dir %attr(755,root,lp) %{_sysconfdir}/%{name}/ppd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
 %attr(4755,lp,root) %{_bindir}/lppasswd
 %attr(755,root,root) %{_bindir}/cupstestppd
@@ -403,6 +406,7 @@
 %{_datadir}/cups/charmaps
 %{_datadir}/cups/charsets
 %{_datadir}/cups/data
+%{_datadir}/cups/drivers
 %{_datadir}/cups/fonts
 %{_datadir}/cups/model
 %dir %{_datadir}/cups/templates
@@ -443,7 +447,12 @@
 #%lang(uk) %{_datadir}/locale/uk/cups_uk
 #%lang(uk) %{_datadir}/locale/uk_UA/cups_uk_UA
 #%lang(zh_CN) %{_datadir}/locale/zh_CN/cups_zh_CN
-/var/spool/cups
+%dir %attr(710,root,lp) /var/spool/cups
+%dir %attr(755,root,lp) /var/run/cups
+%dir %attr(511,lp,sys) /var/run/cups/certs
+%dir %attr(775,root,lp) /var/cache/cups
+%attr(640,root,lp) %ghost /var/cache/cups/job.cache
+%attr(640,root,lp) %ghost /var/cache/cups/remote.cache
 %attr(750,root,logs) %dir /var/log/archiv/cups
 %attr(750,root,logs) %dir /var/log/cups
 %attr(640,root,logs) %ghost /var/log/cups/access_log
@@ -545,6 +554,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.136  2006/05/11 22:30:38  glen
+- package more dirs/files
+- make rpmdb cups agree on file permissions (cups wins)
+
 Revision 1.135  2006/05/11 22:05:07  glen
 - %lang for localized templates
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/cups.spec?r1=1.135&r2=1.136&f=u