rpms/squidGuard/F-10 squidGuard.spec,1.14,1.15 squidguard,1.1,1.2

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/squidGuard/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8720

Modified Files:
	squidGuard.spec squidguard 
Log Message:
Include babel files.



Index: squidGuard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/F-10/squidGuard.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- squidGuard.spec	24 Feb 2009 16:33:55 -0000	1.14
+++ squidGuard.spec	15 Sep 2009 14:26:23 -0000	1.15
@@ -7,7 +7,7 @@
 
 Name:			squidGuard
 Version:		1.4
-Release:		2%{?dist}
+Release:		6%{?dist}
 Summary:		Filter, redirector and access controller plugin for squid
 
 Group:			System Environment/Daemons
@@ -39,7 +39,8 @@ Patch5:			squidGuard-makeinstall.patch
 URL:			http://www.squidguard.org/
 
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	bison, byacc, openldap-devel, flex, db4-devel
+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
@@ -129,6 +130,8 @@ popd
 
 sed -i "s,dest/adult/,blacklists/porn/,g" $RPM_BUILD_ROOT%{_sysconfdir}/squid/squidGuard.conf
 
+%{__install} -p -D -m 0644 samples/babel.* $RPM_BUILD_ROOT%{_cgibin}
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -181,10 +184,23 @@ fi
 #%{_sysconfdir}/selinux/targeted/src/policy/domains/program/squidGuard.te
 #%{_sysconfdir}/selinux/targeted/src/policy/file_contexts/program/squidGuard.fc
 %attr(0755,root,root) %{_cgibin}/*.cgi
+%{_cgibin}/babel.*
 %{_initrddir}/squidGuard
 %{_initrddir}/transparent-proxying
 
 %changelog
+* Wed Sep 09 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-6
+- Include babel files, BZ 522038.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Mar 05 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-4
+- Initscript cleanup, BZ 247065.
+
+* Tue Feb 24 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-3
+- Drop chcon Req.
+
 * Mon Feb 23 2009 Jon Ciesla <limb at jcomserv.net> - 1.4-2
 - Dropping selinux policy and chcon, BZ 486634.
 - Fixed URL of Source0.


Index: squidguard
===================================================================
RCS file: /cvs/pkgs/rpms/squidGuard/F-10/squidguard,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- squidguard	9 Sep 2005 12:16:10 -0000	1.1
+++ squidguard	15 Sep 2009 14:26:23 -0000	1.2
@@ -13,6 +13,16 @@
 # pidfile: /var/run/squid.pid
 # config: /etc/squid/squid-squidGuard.conf
 
+### BEGIN INIT INFO
+# Provides: lsb-squidguard
+# Required-Start: $local_fs $network $remote_fs $squid
+# Required-Stop: $local_fs $network $remote_fs
+# Default-Start:
+# Default-Stop: 0 1 6
+# Short-Description: start and stop squidGuard
+# Description: SquidGuard - web filtering system for the Squid proxy server.
+### END INIT INFO
+
 PATH=/usr/bin:/sbin:/bin:/usr/sbin
 export PATH