Accepting request 546405 from security:netfilter

OBS-URL: https://build.opensuse.org/request/show/546405
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/firewalld?expand=0&rev=23

firewalld.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed Nov 29 10:59:45 UTC 2017 - dimstar@opensuse.org
+
+- Replace dbus-1-python requires with dbus-1-python3: since
+  firewalld was migrated to python3, we also have to require the
+  python3 dependencies (boo#1070310).
+
+-------------------------------------------------------------------
+Tue Nov 28 12:30:59 UTC 2017 - mchandras@suse.de
+
+- Add missing python3-gobject-Gdk dependency (boo#1069952)
+
+-------------------------------------------------------------------
+Thu Nov 23 13:37:50 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Sun Nov 19 18:37:31 UTC 2017 - mpluskal@suse.com
 

firewalld.spec

@@ -16,6 +16,11 @@
 #
 
 
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
+
 Name:           firewalld
 Version:        0.4.4.6
 Release:        0
@@ -44,7 +49,7 @@ BuildRequires:  iptables
 BuildRequires:  libxslt-tools
 BuildRequires:  python3-devel
 BuildRequires:  systemd-rpm-macros
-Requires:       dbus-1-python
+Requires:       dbus-1-python3
 Requires:       ebtables
 Requires:       ipset
 Requires:       iptables
@@ -80,7 +85,7 @@ Summary:        Firewall configuration application
 Group:          Productivity/Networking/Security
 Requires:       %{name} = %{version}-%{release}
 Requires:       hicolor-icon-theme
-Requires:       python3-gobject
+Requires:       python3-gobject-Gdk
 
 %description -n firewall-config
 The firewall configuration application provides an configuration interface for
@@ -120,7 +125,7 @@ desktop-file-install --delete-original \
   %{buildroot}%{_datadir}/applications/firewall-config.desktop
 
 # fillup_only will take care of that
-%{_bindir}/install -c -D -m 600 %{buildroot}%{_sysconfdir}/sysconfig/firewalld %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
+%{_bindir}/install -c -D -m 600 %{buildroot}%{_sysconfdir}/sysconfig/firewalld %{buildroot}%{_fillupdir}/sysconfig.%{name}
 rm %{buildroot}%{_sysconfdir}/sysconfig/firewalld
 
 ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rcfirewalld
@@ -204,7 +209,7 @@ fi
 %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/ipsets
 %attr(0750,root,root) %dir %{_sysconfdir}/firewalld/helpers
 %{_unitdir}/firewalld.service
-%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
+%{_fillupdir}/sysconfig.%{name}
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/FirewallD.conf
 %attr(0755,root,root) %dir %{python3_sitelib}/firewall
 %{_datadir}/firewalld/__pycache__