.

OBS-URL: https://build.opensuse.org/package/show/Base:System/syslogd?expand=0&rev=83

syslogd.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Mar  7 14:22:13 UTC 2012 - werner@suse.de
+
+- Restart the syslog service only from post of the klogd package if
+  the needed script is available (bnc#750478) Thanks to Lars Müller.
+- Some cleanup due rpm lint warnings
+
 -------------------------------------------------------------------
 Tue Mar  6 12:33:27 UTC 2012 - werner@suse.de
 

syslogd.spec

@@ -24,8 +24,14 @@ Name:           syslogd
 License:        GPL-2.0+
 Group:          System/Daemons
 BuildRequires:  pkg-config systemd-devel
-PreReq:         coreutils %fillup_prereq sed
+Requires(post): %fillup_prereq
-PreReq:         klogd syslog-service
+Requires(post):   %insserv_prereq
+Requires(post): permissions
+Requires(postun): %insserv_prereq
+Requires(prereq): coreutils
+Requires(prereq): klogd
+Requires(prereq): sed
+Requires(prereq): syslog-service
 Provides:       syslog
 Provides:       sysklogd
 AutoReqProv:    on
@@ -95,7 +101,9 @@ Authors:
 %package -n klogd
 License:        GPL-2.0+
 Provides:       klogd:/sbin/klogd
-PreReq:         %insserv_prereq  %fillup_prereq
+Requires(post): %fillup_prereq
+Requires(post):   %insserv_prereq
+Requires(postun): %insserv_prereq
 Summary:        The kernel log daemon
 Group:          System/Daemons
 AutoReqProv:    on
@@ -118,7 +126,9 @@ Authors:
 
 %package -n syslog-service
 License:        GPL-2.0+
-PreReq:         %insserv_prereq  %fillup_prereq
+Requires(post): %fillup_prereq
+Requires(post): %insserv_prereq
+Requires(postun): %insserv_prereq
 Provides:       klogd:/etc/init.d/syslog
 Requires:       /etc/init.d/network logrotate
 Summary:        Syslog service files & scripts
@@ -204,7 +214,13 @@ mv sample-s390.conf sample.conf
 	> $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.syslog
 %endif
 
+%if %{defined verify_permissions}
+%verifyscript
+%verify_permissions -e /etc/syslog.conf
+%endif
+
 %post
+%set_permissions /etc/syslog.conf
 # 
 # add syslog variables provided by syslogd if needed
 #
@@ -245,7 +261,9 @@ touch var/log/news/news.notice; chmod 640 var/log/news/news.notice
 chown news:news var/log/news/news.notice
 
 %postun
+if test -x /etc/init.d/syslog ; then
    %restart_on_update syslog
+fi
 %{insserv_cleanup}
 # reset SYSLOG_DAEMON variable
 if test -f etc/sysconfig/syslog ; then
@@ -266,10 +284,14 @@ mkdir -p -m 0755 var/run/rsyslog
 mkdir -p -m 0755 var/run/syslog-ng
 
 %preun -n syslog-service
+if test -x /etc/init.d/syslog ; then
     %stop_on_removal syslog
+fi
 
 %postun -n syslog-service
+if test -x /etc/init.d/syslog ; then
    %restart_on_update syslog
+fi
 %{insserv_cleanup}
 
 %post -n klogd
@@ -277,13 +299,19 @@ mkdir -p -m 0755 var/run/syslog-ng
 # add syslog variables provided by klogd if needed
 #
 %{fillup_only -ns syslog klogd}
+if test -x /etc/init.d/syslog ; then
    %restart_on_update syslog
+fi
 
 %preun -n klogd
+if test -x /etc/init.d/syslog ; then
    %restart_on_update syslog
+fi
 
 %postun -n klogd
+if test -x /etc/init.d/syslog ; then
    %restart_on_update syslog
+fi
 %{insserv_cleanup}
 
 %files