Hello community, here is the log from the commit of package rsyslog for openSUSE:Factory checked in at Thu Sep 10 13:08:58 CEST 2009. -------- --- rsyslog/rsyslog.changes 2009-09-02 20:30:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/rsyslog/rsyslog.changes 2009-09-09 22:17:48.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Sep 9 21:36:16 CEST 2009 - mt@suse.de + +- Added read-only RSYSLOGD_NATIVE_VERSION sysconfig/syslog variable, + that is set to the native mode version number for the -c parameter + while every installation and used in the /etc/init.d/syslog script, + except the user overrides this default in RSYSLOGD_COMPAT_VERSION. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rsyslog.spec ++++++ --- /var/tmp/diff_new_pack.0ZB0ue/_old 2009-09-10 13:07:55.000000000 +0200 +++ /var/tmp/diff_new_pack.0ZB0ue/_new 2009-09-10 13:07:55.000000000 +0200 @@ -23,7 +23,7 @@ %define rsyslog_docdir %{_docdir}/%{name} %define install_all_modules_in_lib 0 Version: 4.4.1 -Release: 1 +Release: 2 License: GPL v3 or later Group: System/Daemons Summary: Rsyslog, the enhanced syslogd for Linux and Unix @@ -255,7 +255,12 @@ %{buildroot}%{_sysconfdir}/rsyslog.d/remote.conf # install -d -m0755 %{buildroot}/var/adm/fillup-templates -install -m0600 %{_sourcedir}/rsyslog.sysconfig \ +# native version for the '-c <compat version>' parameter +rsyslogd_version=%{version} +rsyslogd_version=${rsyslogd_version//.*/} +sed -e "s/@RSYSLOGD_VERSION@/${rsyslogd_version}/g" \ + < %{_sourcedir}/rsyslog.sysconfig > rsyslog.sysconfig +install -m0600 rsyslog.sysconfig \ %{buildroot}/var/adm/fillup-templates/sysconfig.syslog-rsyslog # rm -f doc/Makefile* @@ -282,6 +287,7 @@ # # add syslog variables provided by klogd if needed # +%{remove_and_set -n syslog RSYSLOGD_NATIVE_VERSION} %{fillup_and_insserv -ny syslog syslog} %{fillup_and_insserv -nY syslog earlysyslog} # ++++++ rsyslog.sysconfig ++++++ --- /var/tmp/diff_new_pack.0ZB0ue/_old 2009-09-10 13:07:55.000000000 +0200 +++ /var/tmp/diff_new_pack.0ZB0ue/_new 2009-09-10 13:07:55.000000000 +0200 @@ -1,21 +1,36 @@ -## Type: integer +## Type: list(@RSYSLOGD_VERSION@) +## Default: "@RSYSLOGD_VERSION@" +## Config: "" +## ServiceRestart: syslog +# +# The native version compatibility level of the current rsyslogd. +# +# Note, that this variable is read-only -- please do not change it! +# Instead, please adopt the RSYSLOGD_COMPAT_VERSION variable. +# +# This variable will be updated while every installation/upgrade of +# the rsyslog daemon package. +# +RSYSLOGD_NATIVE_VERSION="@RSYSLOGD_VERSION@" + +## Type: integer(0:@RSYSLOGD_VERSION@) ## Default: "" ## Config: "" ## ServiceRestart: syslog # # Version compatibility level to run rsyslogd with (-c parameter). -# Default is to run in a distribution specific mode (that should be a -# native mode of the installed version). # Set to the desired version number rsyslogd shall be compatible with. # -# Note: -# Changes to this variable may need adoption of the default config file -# or break the /etc/init.d/syslog script. +# Default is to run in native mode if the currently installed rsyslog +# daemon version. +# +# Note: Changes to this variable may need adoption of the config file +# or break features used in the /etc/init.d/syslog script by default. # RSYSLOGD_COMPAT_VERSION="" -### Type: string +## Type: string ## Default: "" ## Config: "" ## ServiceRestart: syslog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org