Accepting request 1157999 from home:dimstar:Factory

- Fix rpmlint warnings and errors:
  + rsyslog.spec:590: W: %autopatch-not-in-prep:
    - applying patches should be done in prep section and in this
      case, there is no reason not to do it. Use the opportunity to
      switch to %autosetup.
    - Do not BuildRequire libtool, autoconf, automake and don't run
      autoreconf: the comment indicates this would be needed for
      patch1, but likely for an 'older patch1': what we have now
      does not touch the build system.
  + E: superfluous-%clean-section: Drop long deprecated %clean
    section.
  + E: suse-zypp-otherproviders otherproviders(syslog): simply
    provide syslog.
  + W: non-etc-or-var-file-marked-as-conffile: do not mark files in
    /usr/share as config; admins are not supposed to change them.
  + rsyslog-doc.x86_64: E: no-binary: build rsyslog-doc as noarch.
  + E: explicit-lib-dependency librdkafka1: the dependency for one
    should be in module-kafka, but then is also auto-detected by
    RPM.

There 1 warning and 1 error left:

[   63s] rsyslog.spec:44: E: obsolete-suse-version-check 1230
[   63s] The specfile contains a comparison of %suse_version against a suse release
[   63s] that is no longer in maintenance. Consider removing obsolete parts of your
[   63s] spec file to make it more readable.

=> Not addressed, as I don't know if you care for such old code bases

 
[   63s] rsyslog.x86_64: W: obsolete-not-provided rsyslog-module-guardtime
[   63s] If a package is obsoleted by a compatible replacement, the obsoleted package
[   63s] should also be provided in order to not cause unnecessary dependency breakage.
[   63s] If the obsoleting package is not a compatible replacement for the old one,
[   63s] leave out the Provides.

=> Providing it is likely wrong.

Those warnings/errors could be suppressed by a rsyslog-rpmlintrc file and thus
acknowledging their existence.

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

rsyslog.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Thu Mar 14 13:15:09 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Fix rpmlint warnings and errors:
+  + rsyslog.spec:590: W: %autopatch-not-in-prep:
+    - applying patches should be done in prep section and in this
+      case, there is no reason not to do it. Use the opportunity to
+      switch to %autosetup.
+    - Do not BuildRequire libtool, autoconf, automake and don't run
+      autoreconf: the comment indicates this would be needed for
+      patch1, but likely for an 'older patch1': what we have now
+      does not touch the build system.
+  + E: superfluous-%clean-section: Drop long deprecated %clean
+    section.
+  + E: suse-zypp-otherproviders otherproviders(syslog): simply
+    provide syslog.
+  + W: non-etc-or-var-file-marked-as-conffile: do not mark files in
+    /usr/share as config; admins are not supposed to change them.
+  + rsyslog-doc.x86_64: E: no-binary: build rsyslog-doc as noarch.
+  + E: explicit-lib-dependency librdkafka1: the dependency for one
+    should be in module-kafka, but then is also auto-detected by
+    RPM.
+
 -------------------------------------------------------------------
 Thu Jan 18 14:04:41 UTC 2024 - Thomas Blume <thomas.blume@suse.com>
 

rsyslog.spec

@@ -86,7 +86,7 @@ URL:            http://www.rsyslog.com/
 Obsoletes:      %{name}-module-guardtime <= 8.38.0
 Provides:       syslog
 Provides:       sysvinit(syslog)
-Conflicts:      otherproviders(syslog)
+Conflicts:      syslog
 Requires(pre):  %fillup_prereq
 Requires(pre):  syslog-service >= 2.0
 %{?systemd_ordering}
@@ -94,10 +94,6 @@ BuildRequires:  pkgconfig(systemd) >= 209
 %if %{with journal}
 BuildRequires:  pkgconfig(libsystemd) >= 234
 %endif
-# for patch1
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  libtool
 #
 BuildRequires:  bison
 BuildRequires:  curl-devel
@@ -139,7 +135,6 @@ BuildRequires:  czmq-devel >= 3.0.2
 %endif
 %if %{with kafka}
 BuildRequires:  librdkafka-devel
-Requires:       librdkafka1
 %endif
 %if %{with gssapi}
 BuildRequires:  krb5-devel
@@ -245,6 +240,7 @@ setup for the novice user.
 %package doc
 Summary:        Additional documentation for rsyslog
 Group:          System/Daemons
+BuildArch:      noarch
 
 %description doc
 Rsyslog is an enhanced multi-threaded syslog daemon. See rsyslog
@@ -571,7 +567,7 @@ This module provides an output module for TCL.
 %endif
 
 %prep
-%setup -q -a 14
+%autosetup -p1 -a 14
 #
 for file in rsyslog-service-prepare; do
 	sed \
@@ -585,10 +581,6 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -W -Wall -I../grammar -I../..
 # needs java
 #        --enable-gui            \
 
-# for patch1
-autoreconf -fiv
-%autopatch -p1
-
 %configure			\
 	--with-moddirs=%{rsyslog_module_dir_withdeps} \
 	--enable-option-checking	\
@@ -844,11 +836,6 @@ install -m0600 %{SOURCE19} %{buildroot}%{_sysconfdir}/rsyslog.d/
   install -m0640 %{SOURCE9} %{buildroot}%{APPARMOR_PROFILE_PATH}/rsyslog.d/
 %endif
 
-%clean
-if [ -n "%{buildroot}" ] && [ "%{buildroot}" != "/" ] ; then
-	rm -rf "%{buildroot}"
-fi
-
 %pre
 %{service_add_pre rsyslog.service}
 
@@ -1128,7 +1115,7 @@ fi # first install
 %{_unitdir}/rsyslog.service
 %{_sbindir}/rc%{name}
 %{APPARMOR_PROFILE_PATH_DIR_COMMANDS}
-%config %{APPARMOR_PROFILE_PATH}/usr.sbin.rsyslogd
+%{APPARMOR_PROFILE_PATH}/usr.sbin.rsyslogd
 
 %files doc
 %defattr(-,root,root)
@@ -1159,7 +1146,7 @@ fi # first install
 %defattr(-,root,root)
 %doc %{rsyslogdocdir}/mysql-createDB.sql
 %{rsyslog_module_dir_withdeps}/ommysql.so
-%config %{APPARMOR_PROFILE_PATH}/rsyslog.d/module-mysql
+%{APPARMOR_PROFILE_PATH}/rsyslog.d/module-mysql
 %endif
 
 %if %{with pgsql}
@@ -1183,7 +1170,7 @@ fi # first install
 %defattr(-,root,root)
 %{rsyslog_module_dir_withdeps}/omsnmp.so
 %{rsyslog_module_dir_nodeps}/mmsnmptrapd.so
-%config %{APPARMOR_PROFILE_PATH}/rsyslog.d/module-snmp
+%{APPARMOR_PROFILE_PATH}/rsyslog.d/module-snmp
 %endif
 
 %if %{with gnutls}