rpms/squidGuard/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 squidGuard-paths.patch, 1.1, 1.2 squidGuard.spec, 1.9, 1.10

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/squidGuard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22751

Modified Files:
	.cvsignore sources squidGuard-paths.patch squidGuard.spec 
Log Message:
1.2.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Sep 2005 10:50:41 -0000	1.2
+++ .cvsignore	12 Feb 2009 13:49:14 -0000	1.3
@@ -1,2 +1,2 @@
+squidGuard-1.2.1.tar.gz
 blacklists.tar.gz
-squidGuard-1.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Sep 2005 10:50:41 -0000	1.2
+++ sources	12 Feb 2009 13:49:14 -0000	1.3
@@ -1,2 +1,2 @@
-63190e4c21688a4185cc3c0b62aae970  blacklists.tar.gz
-c6e2e9112fdbda0602656f94c1ce31fd  squidGuard-1.2.0.tar.gz
+b6700f59c48fde5ad4d12f871acba93a  squidGuard-1.2.1.tar.gz
+7ebb53ea33459c14cbc850cd73405915  blacklists.tar.gz

squidGuard-paths.patch:

Index: squidGuard-paths.patch
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/devel/squidGuard-paths.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- squidGuard-paths.patch	6 Sep 2005 10:50:41 -0000	1.1
+++ squidGuard-paths.patch	12 Feb 2009 13:49:14 -0000	1.2
@@ -5,7 +5,7 @@
  #
  
 -dbhome @prefix@/squidGuard/db
--logdir @prefix@/squidGuard/logs
+-logdir @prefix@/squidGuard/log
 +dbhome @sg_dbhome@
 +logdir @sg_logdir@
  


Index: squidGuard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/devel/squidGuard.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- squidGuard.spec	19 Feb 2008 07:30:54 -0000	1.9
+++ squidGuard.spec	12 Feb 2009 13:49:14 -0000	1.10
@@ -1,3 +1,4 @@
+%define _default_patch_fuzz 2
 # $Id$
 
 %define			_dbtopdir		%{_var}/%{name}
@@ -5,8 +6,8 @@
 %define			_cgibin			/var/www/cgi-bin
 
 Name:			squidGuard
-Version:		1.2.0
-Release:		18%{?dist}
+Version:		1.2.1
+Release:		1%{?dist}
 Summary:		Filter, redirector and access controller plugin for squid
 
 Group:			System Environment/Daemons
@@ -27,7 +28,7 @@
 Source200:		squidGuard.te
 Source201:		squidGuard.fc
 
-Patch0:			squidGuard-upstream.patch
+#Patch0:			squidGuard-upstream.patch
 Patch1:			squidGuard-paths.patch
 Patch2:			squid-getlist.html.patch
 Patch3:			squidGuard-perlwarning.patch
@@ -69,7 +70,7 @@
 %prep
 %setup -q
 %{__cp} %{SOURCE3} .
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1 -b .paths
 %patch2 -p0
 %patch3 -p2
@@ -95,7 +96,9 @@
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 
-%{__make} DESTDIR=$RPM_BUILD_ROOT install
+#%{__make} DESTDIR=$RPM_BUILD_ROOT install
+# This broke as of 1.2.1.
+%{__install} -p -D -m 0755 src/squidGuard $RPM_BUILD_ROOT%{_bindir}/squidGuard
 
 %{__install} -p -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/squidGuard
 %{__install} -p -D -m 0644 samples/sample.conf $RPM_BUILD_ROOT%{_sysconfdir}/squid/squidGuard.conf
@@ -178,6 +181,11 @@
 %{_initrddir}/transparent-proxying
 
 %changelog
+* Wed Feb 11 2009 Jon Ciesla <limb at jcomserv.net> - 1.2.1-1
+- Update to 1.2.1, fix sg-2008-06-13 BZ 245377, 452467.
+- Dropped upstream patch.
+- Updated blacklists.
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.2.0-18
 - Autorebuild for GCC 4.3