SPECS: logwatch.spec - fix archive/* patchs for pld

[glen]

Author: glen                         Date: Mon Oct  6 06:28:23 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix archive/* patchs for pld

---- Files affected:
SPECS:
   logwatch.spec (1.176 -> 1.177) 

---- Diffs:

================================================================
Index: SPECS/logwatch.spec
diff -u SPECS/logwatch.spec:1.176 SPECS/logwatch.spec:1.177
--- SPECS/logwatch.spec:1.176	Thu Jun 19 23:27:16 2008
+++ SPECS/logwatch.spec	Mon Oct  6 08:28:18 2008
@@ -4,7 +4,7 @@
 Summary(pl.UTF-8):	Logwatch - analizator logów systemowych
 Name:		logwatch
 Version:	7.3.6
-Release:	2
+Release:	3
 License:	MIT
 Group:		Applications/System
 # Path for stable versions:
@@ -16,9 +16,10 @@
 Source2:	%{name}.sysconfig
 Source3:	%{name}.tmpwatch
 # https://po2.uni-stuttgart.de/~rusjako/logwatch/default.html
-Source4:	https://po2.uni-stuttgart.de/~rusjako/logwatch/logwatch-syslog-ng.tar.gz
+Source4:	https://po2.uni-stuttgart.de/~rusjako/logwatch/%{name}-syslog-ng.tar.gz
 # Source4-md5:	491e353044e93d8c31484cff8f252a68
 Patch0:		%{name}-log_conf.patch
+Patch1:		%{name}-archives.patch
 URL:		http://www.logwatch.org/
 BuildRequires:	rpm-perlprov
 Requires:	crondaemon
@@ -46,8 +47,10 @@
 %prep
 %setup -q -a4
 %patch0 -p1
+%patch1 -p1
 
-find -name '*~' | xargs -r rm
+# cleanup backups after patching
+find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -80,8 +83,8 @@
 install logwatch.8 $RPM_BUILD_ROOT%{_mandir}/man8
 
 # Cleanup junk:
-rm -f $RPM_BUILD_ROOT%{_logwatchdir}/default.conf/services/pureftpd.conf.orig
-rm -f $RPM_BUILD_ROOT%{_logwatchconf}/conf/services/pureftpd.conf.orig
+rm $RPM_BUILD_ROOT%{_logwatchdir}/default.conf/services/pureftpd.conf.orig
+rm $RPM_BUILD_ROOT%{_logwatchconf}/conf/services/pureftpd.conf.orig
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -98,8 +101,6 @@
 	if [ ! -d /etc/logwatch/conf ]; then
 		mkdir -p /etc/logwatch/conf
 	fi
-#	mkdir /etc/logwatch/conf/logfiles
-#	mkdir /etc/logwatch/conf/services
 	mv -f /etc/log.d/logwatch.conf* /etc/logwatch/conf/ || :
 	mv -f /etc/log.d/services /etc/logwatch/conf/ || :
 	mv -f /etc/log.d/logfiles /etc/logwatch/conf/ || :
@@ -132,6 +133,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.177  2008/10/06 06:28:18  glen
+- fix archive/* patchs for pld
+
 Revision 1.176  2008/06/19 21:27:16  wolvverine
 - add script for syslog-ng
 
@@ -623,14 +627,14 @@
 
 Revision 1.27  2002/06/30 18:14:34  blues
 - 3.3 (more filters, few fixes)
-STBR
+  STBR
 
 Revision 1.26  2002/06/18 10:00:43  blues
 - 3.2 (many bugfixes, few new features)
-STBR
+  STBR
 
 Revision 1.25  2002/05/23 14:13:12  pioklo
-- up to 3.1, new %%doc
+- up to 3.1, new %doc
 
 Revision 1.24  2002/05/05 13:36:06  kloczek
 - License changed to MIT.
@@ -642,7 +646,7 @@
 - 2.9 (more rules added)
 - URL added
 - mktemp patch commented out - it's empty...
-STBR
+  STBR
 
 Revision 1.21  2002/04/19 12:09:58  pioklo
 
@@ -652,7 +656,7 @@
 - 2.8
 
 Revision 1.19  2002/04/05 14:55:45  pioklo
--up to 2.7,STBR
+- up to 2.7,STBR
 
 Revision 1.18  2002/04/04 07:59:56  kloczek
 - merge mktemp rawhide patch.
@@ -672,7 +676,7 @@
   Group field using gettext).
 
 Revision 1.13  2002/01/18 02:13:45  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.12  2001/09/23 13:08:45  orzech
 - group{pl,de} in logwatch.spec
@@ -682,7 +686,7 @@
 - use rpm new automation suit.
 
 Revision 1.10  2000/10/03 11:20:43  wiget
-2.1.1
+- 2.1.1
 
 Revision 1.9  2000/04/01 11:14:53  zagrodzki
 - changed all BuildRoot definitons
@@ -700,20 +704,10 @@
 - scripts/services/zz-fortune is clean POSIX sh csript (no bash).
 
 Revision 1.5  1999/07/13 22:17:45  kloczek
-- %%clean before %%files.
+- %clean before %files.
 
 Revision 1.4  1999/07/13 22:09:56  wiget
-updated to 1.6.6
+- updated to 1.6.6
 
 Revision 1.3  1999/07/12 23:06:06  kloczek
 - added using CVS keywords in %changelog (for automating them).
-
-* Sat Sep 12 1998 Wojtek Ślusarczyk <wojtek at shadow.eu.org>
-[1.1-2]
-- build against PLD,
-- added buildroot suport,
-- translation modified for pl,
-- fixed files permissions,
-- build from non root's account,
-- made a noarch package,
-- minor changes of spec file.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/logwatch.spec?r1=1.176&r2=1.177&f=u