Author: baggins Date: Thu Jan 27 19:44:12 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- more localstatedir fixes
- removed aobsolete patch
---- Files affected:
packages/syslog-ng:
syslog-ng-datadir.patch (1.3 -> 1.4) , syslog-ng.spec (1.206 -> 1.207) ,
syslog-ng-pyssl.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/syslog-ng/syslog-ng-datadir.patch
diff -u packages/syslog-ng/syslog-ng-datadir.patch:1.3
packages/syslog-ng/syslog-ng-datadir.patch:1.4
--- packages/syslog-ng/syslog-ng-datadir.patch:1.3 Mon Jan 17 19:21:06 2011
+++ packages/syslog-ng/syslog-ng-datadir.patch Thu Jan 27 20:44:07 2011
@@ -15,3 +15,13 @@
#define LOG_PRIORITY_LISTEN 0
#define LOG_PRIORITY_READER 0
+--- syslog-ng-3.2.2/scripts/update-patterndb.in~ 2010-11-20
09:47:33.000000000 +0100
++++ syslog-ng-3.2.2/scripts/update-patterndb.in 2011-01-27
20:43:14.656000204 +0100
+@@ -3,6 +3,6 @@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+ sysconfdir=@sysconfdir@
+-localstatedir=@localstatedir@
++localstatedir=/var/lib/syslog-ng
+
+ ${bindir}/pdbtool merge -r --glob *.pdb -D ${sysconfdir}/patterndb.d -p
${localstatedir}/patterndb.xml
================================================================
Index: packages/syslog-ng/syslog-ng.spec
diff -u packages/syslog-ng/syslog-ng.spec:1.206
packages/syslog-ng/syslog-ng.spec:1.207
--- packages/syslog-ng/syslog-ng.spec:1.206 Thu Jan 27 20:35:11 2011
+++ packages/syslog-ng/syslog-ng.spec Thu Jan 27 20:44:07 2011
@@ -33,7 +33,6 @@
Source6: %{name}.upstart
Patch0: %{name}-link.patch
Patch1: %{name}-datadir.patch
-Patch2: %{name}-pyssl.patch
URL: http://www.balabit.com/products/syslog_ng/
BuildRequires: autoconf >= 2.53
BuildRequires: automake
@@ -126,7 +125,6 @@
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
cp -a %{SOURCE4} doc
cp -a %{SOURCE5} contrib/syslog-ng.conf.simple
@@ -165,7 +163,7 @@
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/etc/{init,sysconfig,logrotate.d,rc.d/init.d} \
$RPM_BUILD_ROOT%{_sysconfdir}/syslog-ng/patterndb.d \
- $RPM_BUILD_ROOT/var/{log,lib/%{name}}
+ $RPM_BUILD_ROOT/var/{log,lib/%{name}/xsd}
%{__make} -j1 install \
DESTDIR=$RPM_BUILD_ROOT
@@ -279,6 +277,7 @@
%{_datadir}/syslog-ng/xsd/patterndb-*.xsd
%dir %{_var}/lib/%{name}
+%dir %{_var}/lib/%{name}/xsd
%{_mandir}/man1/pdbtool.1*
%{_mandir}/man1/syslog-ng-ctl.1*
%{_mandir}/man5/syslog-ng.conf.5*
@@ -298,6 +297,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.207 2011/01/27 19:44:07 baggins
+- more localstatedir fixes
+- removed aobsolete patch
+
Revision 1.206 2011/01/27 19:35:11 baggins
- fixup sbindir path in upstart script
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/syslog-ng/syslog-ng-datadir.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/syslog-ng/syslog-ng.spec?r1=1.206&r2=1.207&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
