[syslog-ng/f15/master] mrunge: systemd fixes (by Bill Nottingham) merged from master to f15 branch

[Matthias Runge]

commit 4cad221c0560aabd622eb5fc990e4145c263665c
Author: Matthias Runge <mrunge at matthias-runge.de>
Date:   Fri May 6 19:42:12 2011 +0200

    mrunge: systemd fixes (by Bill Nottingham) merged from master to f15 branch

 syslog-ng.spec |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)
---
diff --git a/syslog-ng.spec b/syslog-ng.spec
index 64df7da..c1dd116 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -7,7 +7,7 @@
 
 Name: syslog-ng
 Version: 3.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -27,9 +27,9 @@ BuildRequires: bison
 BuildRequires: flex
 BuildRequires: eventlog-devel >= %{evtlog_ver}
 BuildRequires: glib2-devel >= 2.10.1
-BuildRequires: libdbi-devel
+#BuildRequires: libdbi-devel
 BuildRequires: libnet-devel
-BuildRequires: openssl-devel
+#BuildRequires: openssl-devel
 BuildRequires: pcre-devel >= 6.1
 BuildRequires: tcp_wrappers-devel
 
@@ -88,7 +88,8 @@ developing applications that use %{name}.
 	--disable-ssl \
 	--with-module-dir=/%{_lib}/%{name} \
 	--enable-spoof-source \
-	--enable-dynamic-linking
+	--enable-dynamic-linking \
+	--enable-systemd
 
 # remove rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -142,7 +143,7 @@ rm -rf %{buildroot}
 
 %post
 /sbin/ldconfig
-/bin/systemctl enable %{name}.service >/dev/null 2>&1 || :
+/bin/systemctl daemon-reload || :
 
 %preun
 if [ "$1" = 0 ]; then
@@ -157,6 +158,10 @@ if [ "$1" -ge 1 ]; then
 /bin/systemctl condrestart %{name}.service >/dev/null 2>&1 || :
 fi
 
+%triggerun -- syslog-ng < 3.2.3
+if /sbin/chkconfig --level 3 %{name} ; then
+	/bin/systemctl enable %{name}.service >/dev/null 2>&1 || :
+fi
 
 %triggerin -- vim-common
 VIMVERNEW=`rpm -q --qf='%%{epoch}:%%{version}\n' vim-common | sort | tail -n 1 | sed -e 's/[0-9]*://' | sed -e 's/\.[0-9]*$//' | sed -e 's/\.//'`
@@ -220,6 +225,10 @@ fi
 
 
 %changelog
+* Fri May  6 2011 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.3-2
+- Fix systemd-related scriptlets (Bill Nottingham)
+- Explicitly add --enable-systemd to configure's command line
+
 * Mon May  2 2011 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.3-1
 - updated to 3.2.3 final
 - cleaned the sysconfig file