- Fixed (reverted?) to use variables in rsyslog.conf.in

- Added comments with bugzilla / fate references

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

rsyslog.conf.in

@@ -43,12 +43,12 @@ $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
 # using the SYSLOGD_ADDITIONAL_SOCKET* variables in the
 # /etc/sysconfig/syslog file.
 #
-$IncludeConfig /var/run/rsyslog/additional-log-sockets.conf
+$IncludeConfig ADDITIONAL_SOCKETS
 
 #
 # Include config files, that the admin provided? :
 #
-$IncludeConfig /etc/rsyslog.d/*.conf
+$IncludeConfig ETC_RSYSLOG_D_GLOB
 
 
 ###

rsyslog.spec

@@ -58,7 +58,7 @@ BuildRequires:  libnet
 %if 0%{?with_systemd}
 # The systemd package provides
 #   /usr/share/doc/packages/systemd/sd-daemon.[ch]
-# files instead of a lib ...
+# files instead of a lib ... See also bug 656259.
 BuildRequires:  systemd
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -214,6 +214,7 @@ This module provides a UDP forwarder that allows changing the sender address.
 %prep
 %setup -q -n %{name}-%{upstream_version}
 %if 0%{?with_systemd}
+# Bug: https://bugzilla.novell.com/show_bug.cgi?id=656259
 # install the files systemd provides rather than what we provide.
 cp -a /usr/share/doc/packages/systemd/sd-daemon.[ch] runtime/
 %endif
@@ -326,6 +327,7 @@ install -m644 plugins/ompgsql/createDB.sql \
 	%{buildroot}%{rsyslogdocdir}/pgsql-createDB.sql
 #
 %if 0%{?with_systemd}
+# TODO: https://features.opensuse.org/311316
 rm -v %{buildroot}/lib/systemd/system/rsyslog.service
 %endif