rpms/squidGuard/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 squidGuard-perlwarning.patch, 1.1, 1.2 squidGuard.spec, 1.13, 1.14

[Jon Ciesla]

Author: limb

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

Modified Files:
	.cvsignore sources squidGuard-perlwarning.patch 
	squidGuard.spec 
Log Message:
1.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Feb 2009 14:13:28 -0000	1.4
+++ .cvsignore	18 Feb 2009 17:27:28 -0000	1.5
@@ -1,2 +1 @@
-squidGuard-1.3.tar.gz
-blacklists.tar.gz
+squidGuard-1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Feb 2009 14:13:29 -0000	1.4
+++ sources	18 Feb 2009 17:27:28 -0000	1.5
@@ -1,2 +1 @@
-d7c2c2e03a2835e4d1c3bef751ace76f  squidGuard-1.3.tar.gz
-7ebb53ea33459c14cbc850cd73405915  blacklists.tar.gz
+de834150998c1386c30feae196f16b06  squidGuard-1.4.tar.gz

squidGuard-perlwarning.patch:

Index: squidGuard-perlwarning.patch
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/devel/squidGuard-perlwarning.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- squidGuard-perlwarning.patch	9 Sep 2005 12:16:10 -0000	1.1
+++ squidGuard-perlwarning.patch	18 Feb 2009 17:27:28 -0000	1.2
@@ -1,7 +1,7 @@
 --- ./squidGuard-1.2.0/samples/squidGuard.cgi.in.orig   2003-04-12 14:58:38.000000000 -0700
 +++ ./squidGuard-1.2.0/samples/squidGuard.cgi.in    2003-04-12 14:58:59.000000000 -0700
 @@ -1,4 +1,4 @@
--#! @PERL@ -w
+-#! @PERL@  -w
 +#! @PERL@ 
  #
  # Explain to the user that the URL is blocked and by which rule set


Index: squidGuard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/devel/squidGuard.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- squidGuard.spec	17 Feb 2009 14:13:29 -0000	1.13
+++ squidGuard.spec	18 Feb 2009 17:27:28 -0000	1.14
@@ -6,7 +6,7 @@
 %define			_cgibin			/var/www/cgi-bin
 
 Name:			squidGuard
-Version:		1.3
+Version:		1.4
 Release:		1%{?dist}
 Summary:		Filter, redirector and access controller plugin for squid
 
@@ -34,12 +34,13 @@
 Patch3:			squidGuard-perlwarning.patch
 #Patch4:			squidGuard-sed.patch
 Patch5:			squidGuard-makeinstall.patch
-Patch6:			squidGuard-1.3-SG-2008-06-13.patch
+#Patch6:			squidGuard-1.3-SG-2008-06-13.patch
 
 URL:			http://www.squidguard.org/
 
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	db4-devel, bison, byacc, openldap-devel, flex
+BuildRequires:	bison, byacc, openldap-devel, flex, compat-db46
+#put db4-devel back and remove compat-db46 once release > 1.4
 Requires:		squid
 Requires(post):	%{_bindir}/chcon
 Requires(post):	/sbin/chkconfig
@@ -77,7 +78,7 @@
 %patch3 -p2
 #%patch4 -p1
 %patch5	-p1
-%patch6 -p0
+#%patch6 -p0
 
 %{__cp} %{SOURCE100} ./squidGuard.conf.k12ltsp.template
 %{__cp} %{SOURCE101} ./update_squidguard_blacklists.k12ltsp.sh
@@ -86,7 +87,9 @@
 %configure \
 	--with-sg-config=%{_sysconfdir}/squid/squidGuard.conf \
 	--with-sg-logdir=%{_var}/log/squid \
-	--with-sg-dbhome=%{_dbhomedir}
+	--with-sg-dbhome=%{_dbhomedir} \
+	--with-db-inc=/usr/include/db4.6.21 \
+	--with-db-lib=/usr/lib/db4.6.21
 	
 #%{__make} %{?_smp_mflags}
 %{__make}
@@ -183,6 +186,10 @@
 %{_initrddir}/transparent-proxying
 
 %changelog
+* Wed Feb 18 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-1
+- Update to 1.4, BZ 485530.
+- Building against compat-db46 until next version.
+
 * Wed Feb 11 2009 Jon Ciesla <limb at jcomserv.net> - 1.3-1
 - Update to 1.3.
 - Dropped paths, sed patches, applied upstream.