- more localstatedir fixes

- removed aobsolete patch

Changed files:
    syslog-ng-datadir.patch -> 1.4
    syslog-ng-pyssl.patch -> 1.2
    syslog-ng.spec -> 1.207

diff --git a/syslog-ng-datadir.patch b/syslog-ng-datadir.patch
index 9447c59fc6d4caae3157225e511631a654937793..9eb46317a2ef0178d108f0fb0740beda38c09fb0 100644 (file)
--- a/syslog-ng-datadir.patch
+++ b/syslog-ng-datadir.patch
@@ -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

diff --git a/syslog-ng-pyssl.patch b/syslog-ng-pyssl.patch
deleted file mode 100644 (file)
index 3c43185..0000000
--- a/syslog-ng-pyssl.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- syslog-ng-3.0.2/tests/functional/messagegen.py.orig        2009-05-12 16:55:58.000000000 +0200
-+++ syslog-ng-3.0.2/tests/functional/messagegen.py     2009-05-12 16:52:46.000000000 +0200
-@@ -1,4 +1,5 @@
- import struct, stat, re
-+from socket import ssl
- from socket import *
- import os, sys, errno
- 

diff --git a/syslog-ng.spec b/syslog-ng.spec
index 1931f85f22fce94008e1e2e768a94bfa4dc1f2b5..02026bd6c777420f849d5dc1b4a5f8f8c13c57f7 100644 (file)
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -32,7 +32,6 @@ Source5:      %{name}-simple.conf
 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
@@ -125,7 +124,6 @@ Opis zadania Upstart dla syslog-ng.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 cp -a %{SOURCE4} doc
 cp -a %{SOURCE5} contrib/syslog-ng.conf.simple
 
@@ -164,7 +162,7 @@ cp -a %{SOURCE5} contrib/syslog-ng.conf.simple
 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
@@ -278,6 +276,7 @@ exit 0
 %{_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*