From 516c9c418ee498757d66f846669e5bf1b0bff50e Mon Sep 17 00:00:00 2001 From: Jose Pedro Oliveira Date: Mon, 9 May 2011 20:01:32 +0100 Subject: [PATCH] * Overrided the default _localstatedir value (configure --localstatedir) (value hardcoded in update-patterndb) * Manually created the patterndb.d configuration directory (update-patterndb) (see also https://bugzilla.balabit.com/show_bug.cgi?id=119 comments >= 4) * Dropped support for Vim 7.0 and 7.1 --- syslog-ng.spec | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/syslog-ng.spec b/syslog-ng.spec index 4d70678..a85da4b 100644 --- a/syslog-ng.spec +++ b/syslog-ng.spec @@ -5,7 +5,7 @@ Name: syslog-ng Version: 3.2.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Next-generation syslog server Group: System Environment/Daemons @@ -76,6 +76,7 @@ developing applications that use %{name}. --libdir=/%{_lib} \ --includedir=%{_includedir} \ --sysconfdir=%{_sysconfdir}/%{name} \ + --localstatedir=%{_sharedstatedir}/%{name} \ --with-module-dir=/%{_lib}/%{name} \ --enable-ipv6 \ --enable-tcp-wrapper \ @@ -114,6 +115,9 @@ make DESTDIR=%{buildroot} install # make local state dir %{__install} -d -m 755 %{buildroot}/%{_sharedstatedir}/%{name} +# create the patterndb.d configuration directory (should be fixed in 3.2.4) +%{__install} -d -m 755 %{buildroot}/%{_sysconfdir}/%{name}/patterndb.d + # fix authors file /usr/bin/iconv -f iso8859-1 -t utf-8 AUTHORS > AUTHORS.conv && \ %{__mv} -f AUTHORS.conv AUTHORS @@ -122,7 +126,7 @@ make DESTDIR=%{buildroot} install # install vim files %{__install} -d -m 755 %{buildroot}%{_datadir}/%{name} %{__install} -p -m 644 contrib/syslog-ng.vim %{buildroot}%{_datadir}/%{name} -for vimver in 70 71 72 73 ; do +for vimver in 72 73 ; do %{__install} -d -m 755 %{buildroot}%{_datadir}/vim/vim$vimver/syntax cd %{buildroot}%{_datadir}/vim/vim$vimver/syntax ln -s ../../../%{name}/syslog-ng.vim . @@ -194,6 +198,7 @@ fi %doc doc/examples/syslog-ng.conf.sample %doc contrib/{relogger.pl,syslog2ng,syslog-ng.conf.doc} %dir %{_sysconfdir}/%{name} +%dir %{_sysconfdir}/%{name}/patterndb.d %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %config(noreplace) %{_sysconfdir}/%{name}/modules.conf %config(noreplace) %{_sysconfdir}/%{name}/scl.conf @@ -228,6 +233,13 @@ fi %changelog +* Mon May 9 2011 Jose Pedro Oliveira - 3.2.3-5 +- Overrided the default _localstatedir value (configure --localstatedir) + (value hardcoded in update-patterndb) +- Manually created the patterndb.d configuration directory (update-patterndb) + (see also https://bugzilla.balabit.com/show_bug.cgi?id=119 comments >= 4) +- Dropped support for Vim 7.0 and 7.1 + * Mon May 9 2011 Jose Pedro Oliveira - 3.2.3-4 - Dropped the bison and flex build requirements - Corrected a couple of macro references in changelog entries (rpmlint)