packages (DEVEL): rsyslog/rsyslog.spec - use config from sources, it provid...

[lisu]

Author: lisu                         Date: Tue Oct 19 09:08:35 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- use config from sources, it provides more options for rsyslog v6

---- Files affected:
packages/rsyslog:
   rsyslog.spec (1.41.2.1 -> 1.41.2.2) 

---- Diffs:

================================================================
Index: packages/rsyslog/rsyslog.spec
diff -u packages/rsyslog/rsyslog.spec:1.41.2.1 packages/rsyslog/rsyslog.spec:1.41.2.2
--- packages/rsyslog/rsyslog.spec:1.41.2.1	Tue Oct 19 11:06:55 2010
+++ packages/rsyslog/rsyslog.spec	Tue Oct 19 11:08:30 2010
@@ -20,9 +20,8 @@
 Source0:	http://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz
 # Source0-md5:	9fefe1e486084446ffeff728e53d5001
 Source1:	%{name}.init
-Source2:	%{name}.conf
-Source3:	%{name}.sysconfig
-Source4:	%{name}.logrotate
+Source2:	%{name}.sysconfig
+Source3:	%{name}.logrotate
 URL:		http://www.rsyslog.com/
 %{?with_gssapi:BuildRequires:	heimdal-devel}
 %{?with_mysql:BuildRequires:	mysql-devel}
@@ -170,9 +169,10 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/rsyslog
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rsyslog.d/rsyslog.conf
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/rsyslog
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/rsyslog
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/rsyslog
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/rsyslog
+
+cp -a %{name}.conf $RPM_BUILD_ROOT%{_sysconfdir}/rsyslog.d/rsyslog.conf
 
 for n in debug kernel maillog messages secure syslog user spooler lpr daemon
 do
@@ -316,6 +316,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41.2.2  2010/10/19 09:08:30  lisu
+- use config from sources, it provides more options for rsyslog v6
+
 Revision 1.41.2.1  2010/10/19 09:06:55  lisu
 - moved from rsyslog6.spec. 6.x.x branch is in devel, we should keep it in cvs branch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rsyslog/rsyslog.spec?r1=1.41.2.1&r2=1.41.2.2&f=u