[syslog-ng] No need to create the directory /etc/syslog-ng in the install section Enable the test suite (but exc

[Jose Pedro Oliveira]

commit d64b71b05fe914d0d927613081027a7bd15b5f13
Author: Jose Pedro Oliveira <jpo at di.uminho.pt>
Date:   Thu May 12 03:56:59 2011 +0100

    No need to create the directory /etc/syslog-ng in the install section
    Enable the test suite (but excluding the SQL and SSL tests)

 syslog-ng-3.2.4-disable-sql-and-ssl-tests.patch |   19 ++++++++++++++
 syslog-ng.spec                                  |   30 ++++++++++++++++-------
 syslog-ng.sysconfig                             |    4 +++
 3 files changed, 44 insertions(+), 9 deletions(-)
---
diff --git a/syslog-ng-3.2.4-disable-sql-and-ssl-tests.patch b/syslog-ng-3.2.4-disable-sql-and-ssl-tests.patch
new file mode 100644
index 0000000..633fc82
--- /dev/null
+++ b/syslog-ng-3.2.4-disable-sql-and-ssl-tests.patch
@@ -0,0 +1,19 @@
+diff -ruN syslog-ng-3.2.4/tests/functional/func_test.py syslog-ng-3.2.4-modified/tests/functional/func_test.py
+--- syslog-ng-3.2.4/tests/functional/func_test.py	2010-07-09 11:19:27.000000000 +0100
++++ syslog-ng-3.2.4-modified/tests/functional/func_test.py	2011-05-12 03:23:48.276226460 +0100
+@@ -60,11 +60,12 @@
+ # import test modules
+ import test_file_source
+ import test_filters
+-import test_input_drivers
++#import test_input_drivers
+ import test_performance
+-import test_sql
++#import test_sql
+ 
+-tests = (test_input_drivers, test_sql, test_file_source, test_filters, test_performance)
++#tests = (test_input_drivers, test_sql, test_file_source, test_filters, test_performance)
++tests = (test_file_source, test_filters, test_performance)
+ 
+ init_env()
+ seed_rnd()
diff --git a/syslog-ng.spec b/syslog-ng.spec
index 2fea05e..bee24ff 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -5,7 +5,7 @@
 
 Name: syslog-ng
 Version: 3.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -17,6 +17,8 @@ Source2: syslog-ng.service
 Source3: syslog-ng.sysconfig
 Source4: syslog-ng.logrotate
 
+Patch0: syslog-ng-3.2.4-disable-sql-and-ssl-tests.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: systemd-units
@@ -62,6 +64,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
+%patch0 -p1
 
 # fix perl path
 %{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
@@ -69,6 +72,10 @@ developing applications that use %{name}.
 # fix executable perms on contrib files
 %{__chmod} -c a-x contrib/syslog2ng
 
+# fix authors file
+/usr/bin/iconv -f iso8859-1 -t utf-8 AUTHORS > AUTHORS.conv && \
+    %{__mv} -f AUTHORS.conv AUTHORS
+
 
 %build
 %configure \
@@ -100,11 +107,12 @@ make %{_smp_mflags}
 %{__rm} -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
-%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/%{name}
+#%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/%{name}
 %{__install} -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/syslog-ng.conf
 
 # install the service script
-%{__install} -p -D -m 644 %{SOURCE2} %{buildroot}/%{_unitdir}/%{name}.service
+%{__install} -d -m 755 %{buildroot}%{_unitdir}
+%{__install} -p -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service
 
 %{__install} -d -m 755 %{buildroot}%{_sysconfdir}/sysconfig
 %{__install} -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
@@ -112,14 +120,9 @@ make DESTDIR=%{buildroot} install
 %{__install} -d -m 755 %{buildroot}%{_sysconfdir}/logrotate.d
 %{__install} -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/logrotate.d/syslog
 
-# make local state dir
+# create the local state dir
 %{__install} -d -m 755 %{buildroot}/%{_sharedstatedir}/%{name}
 
-# fix authors file
-/usr/bin/iconv -f iso8859-1 -t utf-8 AUTHORS > AUTHORS.conv && \
-    %{__mv} -f AUTHORS.conv AUTHORS
-
-
 # install vim files
 %{__install} -d -m 755 %{buildroot}%{_datadir}/%{name}
 %{__install} -p -m 644 contrib/syslog-ng.vim %{buildroot}%{_datadir}/%{name}
@@ -135,6 +138,10 @@ ldconfig -N -n %{buildroot}/%{_lib}
 find %{buildroot} -name *.la -exec rm -f '{}' \;
 
 
+%check
+LD_LIBRARY_PATH=%{buildroot}/%{_lib}:%{buildroot}/%{_lib}/%{name} make check
+
+
 %clean
 rm -rf %{buildroot}
 
@@ -194,6 +201,7 @@ fi
 %doc doc/security/*.txt
 %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
@@ -230,6 +238,10 @@ fi
 
 
 %changelog
+* Thu May 12 2011 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.4-2
+- No need to create the directory /etc/syslog-ng in the install section
+- Enable the test suite (but excluding the SQL and SSL tests)
+
 * Wed May 11 2011 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.4-1
 - Update to 3.2.4
 
diff --git a/syslog-ng.sysconfig b/syslog-ng.sysconfig
index 9dcf219..8c4dab7 100644
--- a/syslog-ng.sysconfig
+++ b/syslog-ng.sysconfig
@@ -1 +1,5 @@
+#---
+# Syslog-ng command line options
+# See syslog-ng(8) for more details
+#---
 SYSLOGNG_OPTIONS="-F -p /var/run/syslogd.pid"