SPECS: squid.spec - package *.conf.default into %doc

[glen]

Author: glen                         Date: Tue Jan 27 13:44:00 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- package *.conf.default into %doc

---- Files affected:
SPECS:
   squid.spec (1.309 -> 1.310) 

---- Diffs:

================================================================
Index: SPECS/squid.spec
diff -u SPECS/squid.spec:1.309 SPECS/squid.spec:1.310
--- SPECS/squid.spec:1.309	Sun Jan 25 13:22:46 2009
+++ SPECS/squid.spec	Tue Jan 27 14:43:55 2009
@@ -539,9 +539,8 @@
 rm -f $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/cachemgr.conf.default
 
 cd $RPM_BUILD_ROOT/etc/squid
-cp -f squid.conf{,.default}
 %{__patch} -p0 < %{SOURCE5}
-rm -f *~ *.orig
+rm -f *~ *.orig mime.conf.default squid.conf.default
 cd -
 
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/squid
@@ -631,7 +630,7 @@
 %files
 %defattr(644,root,root,755)
 %doc CONTRIBUTORS COPYRIGHT CREDITS README ChangeLog QUICKSTART RELEASENOTES.html SPONSORS
-%doc docs/* src/mib.txt FAQ*.html book-full.html
+%doc docs/* src/mib.txt FAQ*.html book-full.html src/squid.conf.default src/mime.conf.default
 %attr(755,root,root) %{_bindir}/squidclient
 %attr(755,root,root) %{_libexecdir}/diskd
 # YES, it has to be suid root, it sends ICMP packets.
@@ -640,15 +639,13 @@
 %attr(755,root,root) %{_libexecdir}/fakeauth_auth
 %attr(755,root,root) %{_sbindir}/*
 
-%dir %{_sysconfdir}
-
 %attr(754,root,root) /etc/rc.d/init.d/squid
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/squid
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/squid
+
+%dir %{_sysconfdir}
 %attr(640,root,squid) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/squid.conf
 %attr(640,root,squid) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mime.conf
-%attr(640,root,root) %{_sysconfdir}/mime.conf.default
-%attr(640,root,root) %{_sysconfdir}/squid.conf.default
 
 %dir %{_datadir}/squid
 %dir %{_datadir}/squid/errors
@@ -801,6 +798,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.310  2009/01/27 13:43:55  glen
+- package *.conf.default into %doc
+
 Revision 1.309  2009/01/25 12:22:46  dzeus
 - up to 3.0.STABLE12
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/squid.spec?r1=1.309&r2=1.310&f=u