Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package firewalld for openSUSE:Factory
checked in at 2022-09-02 21:56:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/firewalld (Old)
and /work/SRC/openSUSE:Factory/.firewalld.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "firewalld"
Fri Sep 2 21:56:25 2022 rev:73 rq:1000604 version:1.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/firewalld/firewalld.changes 2022-08-03
21:16:32.855418384 +0200
+++ /work/SRC/openSUSE:Factory/.firewalld.new.2083/firewalld.changes
2022-09-02 21:56:41.784318765 +0200
@@ -1,0 +2,6 @@
+Thu Sep 1 07:55:30 UTC 2022 - Stefan Schubert <sch...@suse.com>
+
+- Migration to /usr/etc: Saving user changed configuration files
+ in /etc and restoring them while an RPM update.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ firewalld.spec ++++++
--- /var/tmp/diff_new_pack.dhGEUy/_old 2022-09-02 21:56:42.332320092 +0200
+++ /var/tmp/diff_new_pack.dhGEUy/_new 2022-09-02 21:56:42.340320111 +0200
@@ -1,7 +1,7 @@
#
# spec file for package firewalld
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -43,14 +43,14 @@
# Adding tools to BuildRequires as well so they can be autodetected
# Else the configure tool will set them to /bin/false
BuildRequires: fdupes
+BuildRequires: ebtables
BuildRequires: gettext
BuildRequires: glib2-devel
BuildRequires: gobject-introspection
BuildRequires: hicolor-icon-theme
BuildRequires: intltool
-BuildRequires: iptables
-BuildRequires: ebtables
BuildRequires: ipset
+BuildRequires: iptables
BuildRequires: libxslt-tools
BuildRequires: python3-devel
BuildRequires: systemd-rpm-macros
@@ -208,6 +208,12 @@
[ ! -f "/etc/modprobe.d/${_f}.rpmsave" ] || \
mv -f "/etc/modprobe.d/${_f}.rpmsave"
"/etc/modprobe.d/${_f}.rpmsave.old" || :
done
+%if 0%{?suse_version} > 1500
+# Prepare for migration to /usr/etc; save any old .rpmsave
+for i in logrotate.d/firewalld ; do
+ test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave
%{_sysconfdir}/${i}.rpmsave.old ||:
+done
+%endif
%post
%service_add_post firewalld.service
@@ -229,6 +235,12 @@
[ ! -f "/etc/modprobe.d/${_f}.rpmsave" ] || \
mv -fv "/etc/modprobe.d/${_f}.rpmsave" "/etc/modprobe.d/${_f}" || :
done
+%if 0%{?suse_version} > 1500
+# Migration to /usr/etc, restore just created .rpmsave
+for i in logrotate.d/firewalld ; do
+ test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave
%{_sysconfdir}/${i} ||:
+done
+%endif
%post -n firewall-applet
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
