remove python2-firewall subpackage
This commit is contained in:
Eric Garver
parent
a86d697d59
commit
40f23213c9
104
firewalld.spec
104
firewalld.spec
@ -1,14 +1,7 @@
|
||||
%if (0%{?fedora} >= 13 || 0%{?rhel} > 7)
|
||||
%global with_python3 1
|
||||
%if (0%{?fedora} >= 23 || 0%{?rhel} >= 8)
|
||||
%global use_python3 1
|
||||
%endif
|
||||
%endif
|
||||
|
||||
Summary: A firewall daemon with D-Bus interface providing a dynamic firewall
|
||||
Name: firewalld
|
||||
Version: 0.5.2
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
URL: http://www.firewalld.org
|
||||
License: GPLv2+
|
||||
Source0: https://github.com/firewalld/firewalld/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
@ -30,21 +23,14 @@ BuildRequires: glib2, glib2-devel
|
||||
BuildRequires: systemd-units
|
||||
BuildRequires: docbook-style-xsl
|
||||
BuildRequires: libxslt
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: iptables, ebtables, ipset
|
||||
%if 0%{?with_python3}
|
||||
BuildRequires: python3-devel
|
||||
%endif #0%{?with_python3}
|
||||
Requires: iptables, ebtables, ipset
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
Requires: firewalld-filesystem = %{version}-%{release}
|
||||
%if 0%{?use_python3}
|
||||
Requires: python3-firewall = %{version}-%{release}
|
||||
%else #0%{?use_python3}
|
||||
Requires: python-firewall = %{version}-%{release}
|
||||
%endif #0%{?use_python3}
|
||||
%if 0%{?fedora} == 23
|
||||
Conflicts: selinux-policy < 3.13.1-158.25
|
||||
%endif
|
||||
@ -79,22 +65,10 @@ Obsoletes: firewalld-config-workstation <= 0.3.15
|
||||
firewalld is a firewall service daemon that provides a dynamic customizable
|
||||
firewall with a D-Bus interface.
|
||||
|
||||
%package -n python2-firewall
|
||||
%{?python_provide:%python_provide python2-firewall}
|
||||
Summary: Python2 bindings for firewalld
|
||||
Provides: python2-firewall
|
||||
Obsoletes: python2-firewall
|
||||
Requires: dbus-python
|
||||
Requires: python-slip-dbus
|
||||
Requires: python-decorator
|
||||
Requires: pygobject3-base
|
||||
|
||||
%description -n python2-firewall
|
||||
Python2 bindings for firewalld.
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%package -n python3-firewall
|
||||
Summary: Python3 bindings for firewalld
|
||||
Obsoletes: python-firewall < 0.5.2-2
|
||||
Obsoletes: python2-firewall < 0.5.2-2
|
||||
Requires: python3-dbus
|
||||
Requires: python3-slip-dbus
|
||||
Requires: python3-decorator
|
||||
@ -106,7 +80,6 @@ Requires: python3-gobject
|
||||
|
||||
%description -n python3-firewall
|
||||
Python3 bindings for firewalld.
|
||||
%endif #0%{?with_python3}
|
||||
|
||||
%package -n firewalld-filesystem
|
||||
Summary: Firewalld directory layout and rpm macros
|
||||
@ -120,17 +93,12 @@ Summary: Firewall panel applet
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: firewall-config = %{version}-%{release}
|
||||
Requires: hicolor-icon-theme
|
||||
%if 0%{?use_python3}
|
||||
%if 0%{?fedora} >= 26
|
||||
Requires: python3-qt5-base
|
||||
%else
|
||||
Requires: python3-qt5
|
||||
%endif
|
||||
Requires: python3-gobject
|
||||
%else
|
||||
Requires: python-qt5
|
||||
Requires: pygobject3-base
|
||||
%endif
|
||||
Requires: libnotify
|
||||
Requires: NetworkManager-libnm
|
||||
Requires: dbus-x11
|
||||
@ -144,11 +112,7 @@ Summary: Firewall configuration application
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: hicolor-icon-theme
|
||||
Requires: gtk3
|
||||
%if 0%{?use_python3}
|
||||
Requires: python3-gobject
|
||||
%else
|
||||
Requires: pygobject3-base
|
||||
%endif
|
||||
Requires: NetworkManager-libnm
|
||||
Requires: dbus-x11
|
||||
|
||||
@ -162,54 +126,17 @@ firewalld.
|
||||
%patch0 -p1
|
||||
%endif
|
||||
./autogen.sh
|
||||
|
||||
%if 0%{?with_python3}
|
||||
rm -rf %{py3dir}
|
||||
cp -a . %{py3dir}
|
||||
%if 0%{?use_python3}
|
||||
sed -i -e 's|/usr/bin/python -Es|%{__python3} -Es|' %{py3dir}/fix_python_shebang.sh
|
||||
sed -i 's|/usr/bin/python|%{__python3}|' %{py3dir}/config/lockdown-whitelist.xml
|
||||
%endif #0%{?use_python3}
|
||||
%endif #0%{?with_python3}
|
||||
sed -i -e 's|/usr/bin/python -Es|%{__python3} -Es|' ./fix_python_shebang.sh
|
||||
sed -i 's|/usr/bin/python|%{__python3}|' ./config/lockdown-whitelist.xml
|
||||
|
||||
%build
|
||||
%configure --enable-sysconfig --enable-rpmmacros
|
||||
%configure --enable-sysconfig --enable-rpmmacros PYTHON=%{__python3}
|
||||
# Enable the make line if there are patches affecting man pages to
|
||||
# regenerate them
|
||||
%if 0%{?use_python3}
|
||||
make -C src %{?_smp_mflags}
|
||||
%else
|
||||
make %{?_smp_mflags}
|
||||
%endif
|
||||
|
||||
%if 0%{?with_python3}
|
||||
pushd %{py3dir}
|
||||
%configure --enable-sysconfig --enable-rpmmacros PYTHON=%{__python3}
|
||||
%if 0%{?use_python3}
|
||||
make %{?_smp_mflags}
|
||||
%else
|
||||
make -C src %{?_smp_mflags}
|
||||
%endif
|
||||
popd
|
||||
%endif #0%{?with_python3}
|
||||
|
||||
%install
|
||||
%if 0%{?use_python3}
|
||||
make -C src install-nobase_dist_pythonDATA PYTHON=%{__python2} DESTDIR=%{buildroot}
|
||||
%else
|
||||
make install PYTHON=%{__python2} DESTDIR=%{buildroot}
|
||||
%endif #0%{?use_python3}
|
||||
|
||||
%if 0%{?with_python3}
|
||||
pushd %{py3dir}
|
||||
%if 0%{?use_python3}
|
||||
make install PYTHON=%{__python3} DESTDIR=%{buildroot}
|
||||
%else
|
||||
make -C src install-nobase_dist_pythonDATA PYTHON=%{__python3} DESTDIR=%{buildroot}
|
||||
%endif #0%{?use_python3}
|
||||
popd
|
||||
%endif #0%{?with_python3}
|
||||
|
||||
make install DESTDIR=%{buildroot}
|
||||
desktop-file-install --delete-original \
|
||||
--dir %{buildroot}%{_sysconfdir}/xdg/autostart \
|
||||
%{buildroot}%{_sysconfdir}/xdg/autostart/firewall-applet.desktop
|
||||
@ -336,19 +263,6 @@ fi
|
||||
%{_mandir}/man5/firewall*.5*
|
||||
%{_sysconfdir}/modprobe.d/firewalld-sysctls.conf
|
||||
|
||||
%files -n python2-firewall
|
||||
%attr(0755,root,root) %dir %{python2_sitelib}/firewall
|
||||
%attr(0755,root,root) %dir %{python2_sitelib}/firewall/config
|
||||
%attr(0755,root,root) %dir %{python2_sitelib}/firewall/core
|
||||
%attr(0755,root,root) %dir %{python2_sitelib}/firewall/core/io
|
||||
%attr(0755,root,root) %dir %{python2_sitelib}/firewall/server
|
||||
%{python2_sitelib}/firewall/*.py*
|
||||
%{python2_sitelib}/firewall/config/*.py*
|
||||
%{python2_sitelib}/firewall/core/*.py*
|
||||
%{python2_sitelib}/firewall/core/io/*.py*
|
||||
%{python2_sitelib}/firewall/server/*.py*
|
||||
|
||||
%if 0%{?with_python3}
|
||||
%files -n python3-firewall
|
||||
%attr(0755,root,root) %dir %{python3_sitelib}/firewall
|
||||
%attr(0755,root,root) %dir %{python3_sitelib}/firewall/__pycache__
|
||||
@ -370,7 +284,6 @@ fi
|
||||
%{python3_sitelib}/firewall/core/io/__pycache__/*.py*
|
||||
%{python3_sitelib}/firewall/server/*.py*
|
||||
%{python3_sitelib}/firewall/server/__pycache__/*.py*
|
||||
%endif #0%{?with_python3}
|
||||
|
||||
%files -n firewalld-filesystem
|
||||
%dir %{_prefix}/lib/firewalld
|
||||
@ -404,6 +317,9 @@ fi
|
||||
%{_mandir}/man1/firewall-config*.1*
|
||||
|
||||
%changelog
|
||||
* Wed Mar 21 2018 Eric Garver <egarver@redhat.com> - 0.5.2-2
|
||||
- remove python2-firewall subpackage
|
||||
|
||||
* Mon Mar 19 2018 Eric Garver <egarver@redhat.com> - 0.5.2-1
|
||||
- rebase package to v0.5.2
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user