rpms/squid/devel .cvsignore, 1.25, 1.26 sources, 1.27, 1.28 squid.spec, 1.83, 1.84

[fedora-cvs-commits at redhat.com]

Author: mbacovsk

Update of /cvs/dist/rpms/squid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10347

Modified Files:
	.cvsignore sources squid.spec 
Log Message:
* Tue Mar 27 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE12-1
- update to latest upstream 2.6.STABLE12
- Resolves: #233913: squid: unowned directory



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/squid/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	29 Jan 2007 16:10:08 -0000	1.25
+++ .cvsignore	27 Mar 2007 14:06:20 -0000	1.26
@@ -1 +1 @@
-squid-2.6.STABLE9.tar.bz2
+squid-2.6.STABLE12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/squid/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	29 Jan 2007 16:10:08 -0000	1.27
+++ sources	27 Mar 2007 14:06:20 -0000	1.28
@@ -1 +1 @@
-95997d6cb38fdb562ecb790c553f9cfc  squid-2.6.STABLE9.tar.bz2
+a830ccc95cb39cdfa5e5b773add0bb0d  squid-2.6.STABLE12.tar.bz2


Index: squid.spec
===================================================================
RCS file: /cvs/dist/rpms/squid/devel/squid.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- squid.spec	29 Jan 2007 16:10:08 -0000	1.83
+++ squid.spec	27 Mar 2007 14:06:20 -0000	1.84
@@ -2,19 +2,20 @@
 %define __perl_requires %{SOURCE98}
 ## % define __find_requires %{SOURCE99}
 
-Summary: The Squid proxy caching server.
-Name: squid
-Version: 2.6.STABLE9
-Release: 1%{?dist}
-Epoch: 7
-License: GPL
-Group: System Environment/Daemons
-Source: http://www.squid-cache.org/Squid/Versions/v2/2.5/squid-%{version}.tar.bz2
-Source1: http://www.squid-cache.org/Squid/FAQ/FAQ.sgml
-Source2: squid.init
-Source3: squid.logrotate
-Source4: squid.sysconfig
-Source5: squid.pam
+Summary:  The Squid proxy caching server
+Name:     squid
+Version:  2.6.STABLE12
+Release:  1%{?dist}
+Epoch:    7
+License:  GPL
+Group:    System Environment/Daemons
+URL:      http://www.squid-cache.org
+Source:   http://www.squid-cache.org/Squid/Versions/v2/2.6/squid-%{version}.tar.bz2
+Source1:  http://www.squid-cache.org/Squid/FAQ/FAQ.sgml
+Source2:  squid.init
+Source3:  squid.logrotate
+Source4:  squid.sysconfig
+Source5:  squid.pam
 Source98: perl-requires-squid.sh
 ## Source99: filter-requires-squid.sh
 
@@ -161,7 +162,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc faq/* README ChangeLog QUICKSTART doc/*
 %doc contrib/url-normalizer.pl contrib/rredir.* contrib/user-agents.pl
 
@@ -181,11 +182,12 @@
 %config(noreplace) /etc/sysconfig/squid
 %config(noreplace) /etc/squid/msntauth.conf
 %config(noreplace) /etc/squid/mib.txt
-/etc/squid/msntauth.conf.default
-/etc/squid/squid.conf.default
-/etc/squid/mime.conf.default
+%config /etc/squid/msntauth.conf.default
+%config /etc/squid/squid.conf.default
+%config /etc/squid/mime.conf.default
 
 %config(noreplace) /etc/squid/errors
+%dir %{_datadir}/squid
 %config(noreplace) %{_datadir}/squid/errors
 %config(noreplace) /etc/squid/icons
 %config(noreplace) /etc/rc.d/init.d/squid
@@ -320,11 +322,18 @@
 fi
 
 %triggerin -- samba-common
-/usr/sbin/usermod -a -G winbind squid >/dev/null 2>&1 || \
+/usr/sbin/usermod -a -G wbpriv squid >/dev/null 2>&1 || \
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
-* Mon Jan 29 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE9-1.fc7
+* Tue Mar 27 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE12-1
+- update to latest upstream 2.6.STABLE12
+- Resolves: #233913: squid: unowned directory
+
+* Mon Feb 19 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE9-2
+- Resolves: #226431: Merge Review: squid
+
+* Mon Jan 29 2007 Martin Bacovsky <mbacovsk at redhat.com> - 7:2.6.STABLE9-1
 - update to the latest upstream
 
 * Sun Jan 14 2007 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE7-1
@@ -577,7 +586,7 @@
   so we shouldn't.
 - Remove the problematic triggerpostun trigger, since is's broken, and FC2
   never shipped with that old version.
-- add %{?_smp_mflags} to make line.
+- add %%{?_smp_mflags} to make line.
 
 * Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
 - rebuilt
@@ -586,7 +595,7 @@
 - Use ':' instead of '.' as separator for chown.
 
 * Fri Feb 20 2004 Jay Fenlason <fenlason at redhat.com> 7:2.5.STABLE4-3
-- Clean up the spec file to work on 64-bit platforms (use %{_libdir}
+- Clean up the spec file to work on 64-bit platforms (use %%{_libdir}
   instead of /usr/lib, etc)
 - Make the release number in the changelog section agree with reality.
 - use -fPIE rather than -fpie.  s390 fails with just -fpie
@@ -698,7 +707,7 @@
 * Fri Mar  2 2001 Nalin Dahyabhai <nalin at redhat.com>
 - rebuild in new environment
 
-* Tue Feb  6 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Tue Feb  6 2001 Trond Eivind Glomsrød <teg at redhat.com>
 - improve i18n
 - make the initscript use the standard OK/FAILED
 
@@ -776,7 +785,7 @@
 - buildprereq jade, sgmltools
 
 * Sun Mar 26 2000 Florian La Roche <Florian.LaRoche at redhat.com>
-- make %pre more portable
+- make %%pre more portable
 
 * Thu Mar 16 2000 Bill Nottingham <notting at redhat.com>
 - bugfix patches
@@ -865,10 +874,10 @@
 - add a serial number
 
 * Tue Mar 30 1999 Bill Nottingham <notting at redhat.com>
-- add an adduser in %pre, too
+- add an adduser in %%pre, too
 
 * Thu Mar 25 1999 Bill Nottingham <notting at redhat.com>
-- oog. chkconfig must be in %preun, not %postun
+- oog. chkconfig must be in %%preun, not %%postun
 
 * Wed Mar 24 1999 Bill Nottingham <notting at redhat.com>
 - switch to using group squid