Hello community, here is the log from the commit of package rsyslog for openSUSE:Factory checked in at Wed Aug 24 17:17:10 CEST 2011.
-------- --- rsyslog/rsyslog.changes 2011-08-19 15:08:32.000000000 +0200 +++ rsyslog/rsyslog.changes 2011-08-24 13:21:41.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Aug 24 11:05:18 UTC 2011 - m...@suse.de + +- Adopted to require new syslog-service package on 12.x, that + provides the /etc/init.d/syslog LSB init script and systemd + syslog.service service file. Removed rsyslog.service file + installation from spec file. (fate#311316). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rsyslog.spec ++++++ --- /var/tmp/diff_new_pack.9qfv4b/_old 2011-08-24 17:16:08.000000000 +0200 +++ /var/tmp/diff_new_pack.9qfv4b/_new 2011-08-24 17:16:08.000000000 +0200 @@ -21,7 +21,7 @@ Name: rsyslog Summary: The enhanced syslogd for Linux and Unix Version: 5.8.4 -Release: 1 +Release: 4 # for setting those bcond_with* configs see # http://lizards.opensuse.org/2008/09/12/conditional-features-aka-use-flags/ %if 0%{?suse_version} >= 1140 @@ -34,6 +34,11 @@ %else %bcond_with systemd %endif +%if 0%{?suse_version} >= 1210 +%bcond_without syslogservice +%else +%bcond_with syslogservice +%endif %if 0%{?suse_version} >= 1130 %bcond_without relp %else @@ -56,8 +61,13 @@ Url: http://www.rsyslog.com/ AutoReqProv: on Provides: syslog -PreReq: %insserv_prereq %fillup_prereq /sbin/klogd /etc/init.d/syslog /sbin/checkproc +%if %{with syslogservice} +Requires(pre): %insserv_prereq %fillup_prereq syslog-service /sbin/checkproc +BuildRequires: syslog-service +%else +Requires(pre): %insserv_prereq %fillup_prereq /sbin/klogd /etc/init.d/syslog /sbin/checkproc BuildRequires: klogd +%endif BuildRequires: dos2unix BuildRequires: openssl-devel BuildRequires: pcre-devel @@ -416,6 +426,13 @@ %{buildroot}%{rsyslogdocdir}/pgsql-createDB.sql %endif # +# Note: On 11.4 we do not ship any systemd service file. +# On 12.x, the syslog.service file is provided by +# the syslog-service package. +# +if test -e %{buildroot}/lib/systemd/system/rsyslog.service ; then + rm -f %{buildroot}/lib/systemd/system/rsyslog.service +fi %clean if [ -n "%{buildroot}" ] && [ "%{buildroot}" != "/" ] ; then @@ -428,7 +445,7 @@ # /sbin/ldconfig # -# add syslog variables provided by klogd if needed +# add syslog variables provided by klogd/syslog-service # %{remove_and_set -n syslog RSYSLOGD_NATIVE_VERSION} %{fillup_and_insserv -ny syslog syslog} @@ -522,9 +539,6 @@ %config(noreplace) %attr(600,root,root) %{_sysconfdir}/rsyslog.early.conf %config(noreplace) %attr(600,root,root) %{_sysconfdir}/rsyslog.d/remote.conf %{_sbindir}/rsyslogd -%if %{with systemd} -/lib/systemd/system/rsyslog.service -%endif %dir %{rsyslog_module_dir_nodeps} %{rsyslog_module_dir_nodeps}/imfile.so %{rsyslog_module_dir_nodeps}/imklog.so ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
