SHA256
1
0
forked from pool/firewalld

Accepting request 540025 from security:netfilter

OBS-URL: https://build.opensuse.org/request/show/540025
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/firewalld?expand=0&rev=20
This commit is contained in:
Dominique Leuenberger 2017-11-14 13:45:05 +00:00 committed by Git OBS Bridge
commit 1538e03ad1
2 changed files with 39 additions and 32 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Nov 8 17:25:40 UTC 2017 - mpluskal@suse.com
- Switch to python3
- Run spec cleaner
- Move autogen to build section
- Add systemd requirements
-------------------------------------------------------------------
Tue Jun 6 15:12:27 UTC 2017 - mchandras@suse.de

View File

@ -28,31 +28,32 @@ BuildRequires: autoconf
BuildRequires: automake
BuildRequires: desktop-file-utils
BuildRequires: docbook-xsl-stylesheets
# Adding tools to BuildRequires as well so they can be autodetected
# even though it is probably unlikely for paths to change in the future
BuildRequires: ebtables
BuildRequires: gettext
BuildRequires: ipset
BuildRequires: iptables
BuildRequires: glib2-devel
BuildRequires: gobject-introspection
BuildRequires: hicolor-icon-theme
BuildRequires: intltool
BuildRequires: libxslt-tools
BuildRequires: python-devel
BuildRequires: python3-devel
BuildRequires: systemd-rpm-macros
# Adding tools to BuildRequires as well so they can be autodetected
# even though it is probably unlikely for paths to change in the future
BuildRequires: ebtables
BuildRequires: ipset
BuildRequires: iptables
Requires: dbus-1-python
Requires: ebtables
Requires: ipset
Requires: iptables
Requires: python-decorator
Requires: python-gobject
Requires: python-slip-dbus
Requires: python3-decorator
Requires: python3-gobject
Requires: python3-slip-dbus
Requires: sysconfig
Requires(post): %fillup_prereq
Recommends: %{name}-lang
Suggests: susefirewall2-to-firewalld
BuildArch: noarch
%{?systemd_requires}
%description
firewalld is a firewall service daemon that provides a dynamic customizable
@ -64,8 +65,8 @@ Group: Productivity/Networking/Security
Requires: %{name} = %{version}-%{release}
Requires: firewall-config = %{version}-%{release}
Requires: hicolor-icon-theme
Requires: python-gobject
Requires: python-qt5
Requires: python3-gobject
Requires: python3-qt5
%description -n firewall-applet
The firewall panel applet provides a status information of firewalld and also
@ -76,7 +77,7 @@ Summary: Firewall configuration application
Group: Productivity/Networking/Security
Requires: %{name} = %{version}-%{release}
Requires: hicolor-icon-theme
Requires: python-gobject
Requires: python3-gobject
%description -n firewall-config
The firewall configuration application provides an configuration interface for
@ -86,19 +87,22 @@ firewalld.
%prep
%setup -q
./autogen.sh
%build
%configure --enable-sysconfig --enable-rpmmacros
export PYTHON="python3"
./autogen.sh
%configure \
--enable-sysconfig \
--enable-rpmmacros
# Normally documentation is shipped but this will ensure that missing
# files will be generated.
make %{?_smp_mflags}
%install
make %{?_smp_mflags} DESTDIR=%{buildroot} install
%make_install
%py_compile %{buildroot}
%py3_compile %{buildroot}
desktop-file-install --delete-original \
--dir %{buildroot}%{_sysconfdir}/xdg/autostart \
@ -167,7 +171,6 @@ fi
%{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%files
%defattr(-,root,root)
%doc COPYING README
%{_sbindir}/firewalld
%{_sbindir}/rcfirewalld
@ -191,27 +194,26 @@ fi
%attr(0750,root,root) %dir %{_sysconfdir}/firewalld/zones
%attr(0750,root,root) %dir %{_sysconfdir}/firewalld/ipsets
%attr(0750,root,root) %dir %{_sysconfdir}/firewalld/helpers
%defattr(0644,root,root)
%{_unitdir}/firewalld.service
%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/FirewallD.conf
%attr(0755,root,root) %dir %{python_sitelib}/firewall
%attr(0755,root,root) %dir %{python_sitelib}/firewall/config
%attr(0755,root,root) %dir %{python_sitelib}/firewall/core
%attr(0755,root,root) %dir %{python_sitelib}/firewall/core/io
%attr(0755,root,root) %dir %{python_sitelib}/firewall/server
%{python_sitelib}/firewall/*.py*
%{python_sitelib}/firewall/config/*.py*
%{python_sitelib}/firewall/core/*.py*
%{python_sitelib}/firewall/core/io/*.py*
%{python_sitelib}/firewall/server/*.py*
%attr(0755,root,root) %dir %{python3_sitelib}/firewall
%attr(0755,root,root) %dir %{python3_sitelib}/firewall/config
%attr(0755,root,root) %dir %{python3_sitelib}/firewall/core
%attr(0755,root,root) %dir %{python3_sitelib}/firewall/core/io
%attr(0755,root,root) %dir %{python3_sitelib}/firewall/server
%{_datadir}/firewalld/__pycache__
%{python3_sitelib}/firewall/*
%{python3_sitelib}/firewall/config/*
%{python3_sitelib}/firewall/core/*
%{python3_sitelib}/firewall/core/io/*
%{python3_sitelib}/firewall/server/*
%{_mandir}/man1/firewall*cmd*.1*
%{_mandir}/man1/firewalld*.1*
%{_mandir}/man1/firewallctl*.1*
%{_mandir}/man5/firewall*.5*
%files -n firewall-applet
%defattr(0644,root,root)
%attr(0755,root,root) %{_bindir}/firewall-applet
%dir %{_sysconfdir}/firewall
%config(noreplace) %{_sysconfdir}/firewall/applet.conf
@ -220,9 +222,7 @@ fi
%{_mandir}/man1/firewall-applet*.1*
%files -n firewall-config
%defattr(-,root,root)
%dir %{_datadir}/firewalld
%defattr(0644,root,root)
%attr(0755,root,root) %{_bindir}/firewall-config
%{_datadir}/firewalld/firewall-config.glade
%attr(0755,root,root) %{_datadir}/firewalld/gtk3_chooserbutton.py*
@ -235,6 +235,5 @@ fi
%{_mandir}/man1/firewall-config*.1*
%files lang -f %{name}.lang
%defattr(-,root,root)
%changelog