SPECS: squidGuard.spec - use %service - use sed for inline edits -...

glen glen at pld-linux.org
Fri May 19 23:39:13 CEST 2006 

Author: glen                         Date: Fri May 19 21:39:13 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service
- use sed for inline edits
- drop non cvslog changelog
- rel 2

---- Files affected:
SPECS:
   squidGuard.spec (1.36 -> 1.37) 

---- Diffs:

================================================================
Index: SPECS/squidGuard.spec
diff -u SPECS/squidGuard.spec:1.36 SPECS/squidGuard.spec:1.37
--- SPECS/squidGuard.spec:1.36	Sun Jun  5 23:10:44 2005
+++ SPECS/squidGuard.spec	Fri May 19 23:39:08 2006
@@ -5,7 +5,7 @@
 Summary(pl):	Wtyczka z filtrem, przekierowywaniem i kontrolerem dostępu dla Squida
 Name:		squidGuard
 Version:	%{ver}_%{blist_ver}
-Release:	1
+Release:	2
 Epoch:		2
 License:	GPL
 Group:		Networking/Daemons
@@ -22,12 +22,13 @@
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	db-devel
+BuildRequires:	flex
 BuildRequires:	gettext-devel
 BuildRequires:	libtool
-BuildRequires:	flex
-Requires(post,preun):	grep
+BuildRequires:	rpmbuild(macros) >= 1.268
+Requires(post):	grep
 Requires(post,preun):	squid
-Requires(preun):	fileutils
+Requires(postun):	sed >= 4.0
 Requires:	squid
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -67,8 +68,8 @@
   listy akceptowanych serwerów lub URL-i,
 - blokowania dostępu do niektórych serwerów lub URL-i dla niektórych
   użytkowników,
-- blokowania dostępu do URL na podstawie wyrażeń regularnych lub
-  słów dla niektórych użytkowników,
+- blokowania dostępu do URL na podstawie wyrażeń regularnych lub słów
+  dla niektórych użytkowników,
 - narzucenia używania nazw domen/zabronienia używania adresów IP w
   URL-ach,
 - przekierowania zablokowanych URL-i na "inteligentną" stronę
@@ -136,22 +137,15 @@
 %post
 if [ -f /etc/squid/squid.conf ] && \
 	! grep -q "^redirect_program.*%{_bindir}/%{name}" /etc/squid/squid.conf; then
-		echo "redirect_program /usr/bin/squidGuard -c /etc/squidGuard/squidGuard.conf" >>/etc/squid/squid.conf
-		if [ -f /var/lock/subsys/squid ]; then
-			/etc/rc.d/init.d/squid reload 1>&2
-		fi
+	echo "redirect_program %{_bindir}/squidGuard -c /etc/squidGuard/squidGuard.conf" >>/etc/squid/squid.conf
+	%service -q squid reload
 fi
 
 %preun
 if [ -f /etc/squid/squid.conf ]; then
-	umask 027
-	grep -E -v "^redirect_program.*%{_bindir}/%{name}" /etc/squid/squid.conf > \
-		/etc/squid/squid.conf.tmp
-	mv -f /etc/squid/squid.conf.tmp /etc/squid/squid.conf
-	chown root:squid /etc/squid/squid.conf
-	if [ -f /var/lock/subsys/squid ]; then
-		/etc/rc.d/init.d/squid reload 1>&2
-	fi
+	%{__sed} -i -e /^redirect_program.*%(echo %{_bindir}/%{name} | sed -e 's,/,\\/,g')/d' /etc/squid/squid.conf
+	#' spec.vim sucks
+	%service -q squid reload
 fi
 
 %files
@@ -171,6 +165,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2006/05/19 21:39:08  glen
+- use %service
+- use sed for inline edits
+- drop non cvslog changelog
+- rel 2
+
 Revision 1.36  2005/06/05 21:10:44  paszczus
 - updated blacklist to 20050604 ; STBR
 
@@ -251,19 +251,19 @@
 - use more macros, some cosmetics, added missing "rm -f missing" and use new %doc
 
 Revision 1.11  2002/05/21 23:14:47  kloczek
-perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
+- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
              s/^automake -a -c -f/\%\{__automake\}/; \
-	     s/^autoconf/\%\{__autoconf\}/"
+     s/^autoconf/\%\{__autoconf\}/"
 
 Revision 1.10  2002/02/22 23:29:45  kloczek
 - removed all Group fields translations (oure rpm now can handle translating
   Group field using gettext).
 
 Revision 1.9  2002/01/18 02:15:04  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.8  2001/10/12 14:26:21  grzegorz
-- added reloading squid in %%post
+- added reloading squid in %post
 
 Revision 1.7  2001/10/12 09:54:03  grzegorz
 - typo
@@ -271,8 +271,8 @@
 Revision 1.6  2001/10/12 09:50:02  grzegorz
 - added Prereq: grep
 - s/BuildRequires:  db2-devel/BuildRequires:  db3-devel/
-- new %%post with automatic squid reconfiguration
-- added %%preun with automatic squid reconfiguration
+- new %post with automatic squid reconfiguration
+- added %preun with automatic squid reconfiguration
 - release 2
 - i think that logrotate script is needed too
 
@@ -289,54 +289,3 @@
 Revision 1.2  2001/07/24 14:12:06  waszi
 - partially rewrited
 - NFY
-
-* Wed Jul 11 2001 Florin <florin at mandrakesoft.com> 1.1.4-12mdk
-- use the new sample configfile blacklist compliant, logs and data locations
-- patch the default logdir and confdir (default_dir.patch)
-- add the blacklists-readme file
-- add the blacklist sections and databases
-- remove the whole test thing from the spec file
-- add the nullbanner.png and the squidGuard.cgi modified
-
-* Fri Feb 16 2001 Florin <florin at mandrakesoft.com> 1.1.4-11mdk
-- add banneddestination/expressions
-
-* Tue Jan 30 2001 Florin <florin at mandrakesoft.com> 1.1.4-10mdk
-- add the timerestriction section
-
-* Tue Jan 30 2001 Florin <florin at mandrakesoft.com> 1.1.4-9mdk
-- the nulbanner and the cgi go now in the httpd-naat package
-- add /etc/squid/squidGuard.conf.sample
-- create the section files from the default config file
-
-* Wed Jan 24 2001 Florin <florin at mandrakesoft.com> 1.1.4-9mdk
-- add the nulbanner.gif in the /var/www-naat/icons
-
-* Mon Jan 08 2001 Florin <florin at mandrakesoft.com> 1.1.4-8mdk
-- the /var/log/%{name} dir is now owned by squid,squid
-
-* Fri Jan 06 2001 Florin <florin at mandrakesoft.com> 1.1.4-7mdk
-- recompile for firewall distrib
-- add log,error files in /var/log/%{name}
-- copy a sample of the config file in the /etc/squid/directory
-
-* Thu Nov 23 2000 Florin <florin at mandrakesoft.com> 1.1.4-6mdk
-- added urls (Lenny compliant ;)
-
-* Thu Nov 23 2000 Florin <florin at mandrakesoft.com> 1.1.4-5mdk
-- requires squid
-- buildrequires BerkeleyDB
-
-* Tue Nov 21 2000 Florin <florin at mandrakesoft.com> 1.1.4-4mdk
-- requires BerkeleyDB package, the new db2-2.7.7 package
-- comment the postun section
-
-* Mon Sep 18 2000 Florin <florin at mandrakesoft.com> 1.1.4-3mdk
-- set up a ready to use out of the box config
-
-* Fri Sep 15 2000 Florin <florin at mandrakesoft.com> 1.1.4-2mdk
-- added the test configuration and the Makefile
-- modifying the config files
-
-* Fri Sep 15 2000 Florin <florin at mandrakesoft.com> 1.1.4-1mdk
-- first attempt
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/squidGuard.spec?r1=1.36&r2=1.37&f=u

More information about the pld-cvs-commit mailing list