packages: logrotate/logrotate.spec, logrotate/tabooext.patch (NEW)=?UTF-8?Q?=20?=- add .c...

glen glen at pld-linux.org
Thu Mar 8 15:30:40 CET 2012


Author: glen                         Date: Thu Mar  8 14:30:40 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add .cvsignore to tabooext

---- Files affected:
packages/logrotate:
   logrotate.spec (1.104 -> 1.105) , tabooext.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/logrotate/logrotate.spec
diff -u packages/logrotate/logrotate.spec:1.104 packages/logrotate/logrotate.spec:1.105
--- packages/logrotate/logrotate.spec:1.104	Sun Feb 19 11:19:52 2012
+++ packages/logrotate/logrotate.spec	Thu Mar  8 15:30:34 2012
@@ -20,7 +20,7 @@
 Summary(uk.UTF-8):	Ротує, компресує, видаляє та відправляє поштою лог-файли
 Name:		logrotate
 Version:	3.8.1
-Release:	3
+Release:	4
 License:	GPL v2
 Group:		Applications/System
 Source0:	https://fedorahosted.org/releases/l/o/logrotate/%{name}-%{version}.tar.gz
@@ -29,6 +29,7 @@
 Source2:	%{name}.sysconfig
 Patch0:		%{name}-cron.patch
 Patch1:		%{name}-man.patch
+Patch2:		tabooext.patch
 URL:		https://fedorahosted.org/logrotate/
 %{?with_acl:BuildRequires:	acl-devel}
 %{?with_selinux:BuildRequires:	libselinux-devel}
@@ -111,6 +112,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__make} \
@@ -129,8 +131,8 @@
 	BINDIR=$RPM_BUILD_ROOT%{_sbindir} \
 	MANDIR=$RPM_BUILD_ROOT%{_mandir}
 
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.conf
-cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/logrotate
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.conf
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/logrotate
 install -p examples/logrotate.cron $RPM_BUILD_ROOT/etc/cron.daily/logrotate
 > $RPM_BUILD_ROOT%{statdir}/logrotate.status
 
@@ -167,6 +169,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.105  2012/03/08 14:30:34  glen
+- add .cvsignore to tabooext
+
 Revision 1.104  2012/02/19 10:19:52  baggins
 - rel 3
 - do not redirect logrotate errors to /dev/null

================================================================
Index: packages/logrotate/tabooext.patch
diff -u /dev/null packages/logrotate/tabooext.patch:1.1
--- /dev/null	Thu Mar  8 15:30:40 2012
+++ packages/logrotate/tabooext.patch	Thu Mar  8 15:30:34 2012
@@ -0,0 +1,11 @@
+--- logrotate-3.8.1/config.c~	2011-08-31 15:39:04.000000000 +0300
++++ logrotate-3.8.1/config.c	2012-03-08 16:28:41.374130102 +0200
+@@ -110,7 +110,7 @@
+ static char *defTabooExts[] = { ".rpmsave", ".rpmorig", "~", ",v",
+     ".disabled", ".dpkg-old", ".dpkg-dist", ".dpkg-new", ".cfsaved",
+     ".ucf-old", ".ucf-dist", ".ucf-new",
+-    ".rpmnew", ".swp", ".cfsaved", ".rhn-cfg-tmp-*"
++    ".rpmnew", ".swp", ".cfsaved", ".rhn-cfg-tmp-*", ".cvsignore"
+ };
+ static int defTabooCount = sizeof(defTabooExts) / sizeof(char *);
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/logrotate/logrotate.spec?r1=1.104&r2=1.105&f=u



More information about the pld-cvs-commit mailing list