SPECS: cups.spec - s/-templates_pl.patch/-templates.patch/ ; updat...

[charles]

Author: charles                      Date: Mon Dec 18 14:05:42 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- s/-templates_pl.patch/-templates.patch/ ; updated
- added -certs_FHS.patch (moved /certs to /var/lib/cups)
- added -str2111.patch (fixed extra EOF in pstops output)
- rel. 4

---- Files affected:
SPECS:
   cups.spec (1.180 -> 1.181) 

---- Diffs:

================================================================
Index: SPECS/cups.spec
diff -u SPECS/cups.spec:1.180 SPECS/cups.spec:1.181
--- SPECS/cups.spec:1.180	Thu Dec 14 23:57:38 2006
+++ SPECS/cups.spec	Mon Dec 18 15:05:37 2006
@@ -17,7 +17,7 @@
 Summary(pt_BR):	Sistema Unix de Impressăo
 Name:		cups
 Version:	1.2.7
-Release:	3
+Release:	4
 Epoch:		1
 License:	GPL/LGPL
 Group:		Applications/Printing
@@ -31,7 +31,9 @@
 Patch2:		%{name}-options.patch
 Patch3:		%{name}-man_pages_linking.patch
 Patch4:		%{name}-nostrip.patch
-Patch5:		%{name}-templates_pl.patch
+Patch5:		%{name}-templates.patch
+Patch6:		%{name}-certs_FHS.patch
+Patch7:		%{name}-str2111.patch
 URL:		http://www.cups.org/
 BuildRequires:	acl-devel
 BuildRequires:	autoconf
@@ -255,6 +257,8 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 %{__aclocal} -I config-scripts
@@ -293,6 +297,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,logrotate.d,security} \
+	$RPM_BUILD_ROOT/var/run/cups \
 	$RPM_BUILD_ROOT/var/log/{,archiv/}cups
 
 %{__make} install \
@@ -471,8 +476,9 @@
 %lang(sv) %{_datadir}/locale/sv/cups_sv.po
 
 %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
 %dir %attr(755,root,lp) /var/run/cups
-%dir %attr(511,lp,sys) /var/run/cups/certs
 %dir %attr(710,root,lp) /var/spool/cups
 %dir %attr(1770,root,lp) /var/spool/cups/tmp
 %attr(600,lp,lp) %ghost /var/cache/cups/help.index
@@ -588,6 +594,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.181  2006/12/18 14:05:37  charles
+- s/-templates_pl.patch/-templates.patch/ ; updated
+- added -certs_FHS.patch (moved /certs to /var/lib/cups)
+- added -str2111.patch (fixed extra EOF in pstops output)
+- rel. 4
+
 Revision 1.180  2006/12/14 22:57:38  glen
 - fix php dep; rel 3
 
================================================================

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