Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package firewalld for openSUSE:Factory
checked in at 2025-05-01 15:22:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/firewalld (Old)
and /work/SRC/openSUSE:Factory/.firewalld.new.30101 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "firewalld"
Thu May 1 15:22:35 2025 rev:93 rq:1273679 version:2.1.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/firewalld/firewalld.changes 2025-04-20
19:52:16.161625006 +0200
+++ /work/SRC/openSUSE:Factory/.firewalld.new.30101/firewalld.changes
2025-05-01 15:22:45.089337035 +0200
@@ -1,0 +2,8 @@
+Wed Apr 30 11:57:21 UTC 2025 - Antonio Larrosa <alarr...@suse.com>
+
+- Split the package to build the firewalld-rpmmacros subpackage in
+ a _multibuild flavor so that we can build it in Factory/i586 by
+ itself instead of building the whole package, which has more
+ dependencies (like python-PyQt6).
+
+-------------------------------------------------------------------
New:
----
_multibuild
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ firewalld.spec ++++++
--- /var/tmp/diff_new_pack.JzEkVt/_old 2025-05-01 15:22:45.645360335 +0200
+++ /var/tmp/diff_new_pack.JzEkVt/_new 2025-05-01 15:22:45.645360335 +0200
@@ -16,6 +16,14 @@
#
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "macros"
+%define pkg_suffix -macros
+%bcond_without macros
+%else
+%bcond_with macros
+%endif
+
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir %{_localstatedir}/adm/fillup-templates
@@ -26,7 +34,7 @@
%endif
%global modprobe_d_files firewalld-sysctls.conf
-Name: firewalld
+Name: firewalld%{?pkg_suffix}
Version: 2.1.2
Release: 0
Summary: A firewall daemon with D-Bus interface providing a dynamic
firewall
@@ -145,7 +153,7 @@
%lang_package
%prep
-%autosetup -p1
+%autosetup -p1 -n "firewalld-%{version}"
# bsc#1078223
rm config/services/high-availability.xml
@@ -155,14 +163,24 @@
autoreconf -fiv
%configure \
--enable-sysconfig \
+%if 0%{with macros}
--enable-rpmmacros \
+%endif
--with-ifcfgdir="%{_sysconfdir}/sysconfig/network"
# Normally documentation is shipped but this will ensure that missing
# files will be generated.
+%if 0%{without macros}
%make_build
+%endif
%install
+%if 0%{with macros}
+cd config
+%{__make} install-rpmmacros DESTDIR=%{?buildroot} INSTALL="%{__install} -p"
+exit 0
+%endif
+
%make_install
%py3_compile %{buildroot}
@@ -275,6 +293,7 @@
%{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+%if 0%{without macros}
%files
%doc README.md
%license COPYING
@@ -344,9 +363,6 @@
%{python3_sitelib}/firewall/core/io/*.py*
%{python3_sitelib}/firewall/core/*.py*
-%files -n firewall-macros
-%{_rpmmacrodir}/macros.firewalld
-
%files -n firewall-applet
%attr(0755,root,root) %{_bindir}/firewall-applet
%dir %{_sysconfdir}/firewall
@@ -392,3 +408,10 @@
%files lang -f %{name}.lang
%exclude %{_datadir}/locale/en_*/LC_MESSAGES/firewalld.mo
+%else
+# with macros
+
+%files -n firewall-macros
+%{_rpmmacrodir}/macros.firewalld
+%endif
+
++++++ _multibuild ++++++
<multibuild>
<flavor>macros</flavor>
</multibuild>
