[syslog-ng] * Drop the syslog-ng sysconfig configuration file

[Jose Pedro Oliveira]

commit 701112c8ab34c2a26b8398c3bc78955dbb0a5187
Author: Jose Pedro Oliveira <jpo at di.uminho.pt>
Date:   Thu Dec 15 02:45:27 2011 +0000

     * Drop the syslog-ng sysconfig configuration file

 syslog-ng-3.2.5-syslog-ng.service.patch |    9 +++------
 syslog-ng.spec                          |   21 ++++++++++-----------
 syslog-ng.sysconfig                     |    5 -----
 3 files changed, 13 insertions(+), 22 deletions(-)
---
diff --git a/syslog-ng-3.2.5-syslog-ng.service.patch b/syslog-ng-3.2.5-syslog-ng.service.patch
index f64ba98..0a0c563 100644
--- a/syslog-ng-3.2.5-syslog-ng.service.patch
+++ b/syslog-ng-3.2.5-syslog-ng.service.patch
@@ -1,14 +1,11 @@
-diff -ruN syslog-ng-3.2.5/contrib/systemd/syslog-ng.service syslog-ng-3.2.5-modified/contrib/systemd/syslog-ng.service
 --- syslog-ng-3.2.5/contrib/systemd/syslog-ng.service	2011-10-23 07:48:18.000000000 +0100
-+++ syslog-ng-3.2.5-modified/contrib/systemd/syslog-ng.service	2011-11-01 19:30:09.446750825 +0000
-@@ -3,8 +3,9 @@
- 
++++ syslog-ng-3.2.5-modified/contrib/systemd/syslog-ng.service	2011-12-15 02:25:38.598337205 +0000
+@@ -4,7 +4,7 @@
  [Service]
  Sockets=syslog.socket
-+EnvironmentFile=-/etc/sysconfig/syslog-ng
  ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service
 -ExecStart=/usr/sbin/syslog-ng -F
-+ExecStart=/sbin/syslog-ng $SYSLOGNG_OPTIONS
++ExecStart=/sbin/syslog-ng -F -p /var/run/syslogd.pid
  ExecReload=/bin/kill -HUP $MAINPID
  StandardOutput=null
  
diff --git a/syslog-ng.spec b/syslog-ng.spec
index 8fca0de..69114ae 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -5,7 +5,7 @@
 
 Name: syslog-ng
 Version: 3.2.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -13,9 +13,7 @@ License: GPLv2+
 Url: http://www.balabit.com/network-security/syslog-ng
 Source0: http://www.balabit.com/downloads/files?path=/syslog-ng/sources/%{version}/source/%{name}_%{version}.tar.gz
 Source1: syslog-ng.conf
-#Source2: syslog-ng.service
-Source3: syslog-ng.sysconfig
-Source4: syslog-ng.logrotate
+Source2: syslog-ng.logrotate
 
 Patch0: syslog-ng-3.2.4-disable-ssl-tests.patch
 Patch1: syslog-ng-3.2.5-syslog-ng.service.patch
@@ -133,11 +131,8 @@ make DESTDIR=%{buildroot} install
 #%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/%{name}
 %{__install} -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/syslog-ng.conf
 
-%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/sysconfig
-%{__install} -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
-
 %{__install} -d -m 755 %{buildroot}%{_sysconfdir}/logrotate.d
-%{__install} -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/logrotate.d/syslog
+%{__install} -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/syslog
 
 # create the local state dir
 %{__install} -d -m 755 %{buildroot}/%{_sharedstatedir}/%{name}
@@ -150,7 +145,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 72 73 ; do
+for vimver in 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 .
@@ -228,9 +223,8 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/%{name}/modules.conf
 %config(noreplace) %{_sysconfdir}/%{name}/scl.conf
-%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %config(noreplace) %{_sysconfdir}/logrotate.d/syslog
-%{_unitdir}/%{name}.service
+%config(noreplace) %{_unitdir}/%{name}.service
 
 %dir %{_sharedstatedir}/%{name}
 %{_sbindir}/%{name}
@@ -268,6 +262,11 @@ fi
 
 
 %changelog
+* Thu Dec 15 2011 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.5-3
+- Drop the sysconfig configuration file (use syslog-ng.service instead)
+- Make the syslog-ng.service file a configuration file
+- Drop Vim 7.2 support
+
 * Wed Dec 14 2011 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.5-2
 - Fix the freeze problems caused by the /dev/log unix socket type mismatch (#742624)
   + syslog-ng.conf: change /dev/log from unix-stream to unix-dgram