jengelh/iptables
SHA256
1
0
Fork 1
forked from pool/iptables
Code Pull Requests Activity

Accepting request 919774 from home:schubi2

Browse Source 
- Removed update-alternatives dependency in libalternatives mode.

OBS-URL: https://build.opensuse.org/request/show/919774
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iptables?expand=0&rev=146
This commit is contained in:
Jan Engelhardt 2021-09-20 10:09:59 +00:00 committed by Git OBS Bridge
parent 0685558a3a
commit e4ea90ef14
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
iptables.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Sep 16 11:40:45 UTC 2021 - Stefan Schubert <schubi@suse.com>
- Removed update-alternatives dependency in libalternatives mode.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Aug 3 07:13:19 UTC 2021 - Stefan Schubert <schubi@suse.com> Tue Aug 3 07:13:19 UTC 2021 - Stefan Schubert <schubi@suse.com>

6
iptables.spec
View File

@ -51,8 +51,6 @@ Requires: netcfg >= 11.6
Requires: xtables-plugins = %version-%release Requires: xtables-plugins = %version-%release
%if %{with libalternatives} %if %{with libalternatives}
Requires: alts Requires: alts
Requires: libalternatives >= 1.2
Requires(pre): update-alternatives
%else %else
Requires(post): update-alternatives Requires(post): update-alternatives
Requires(postun):update-alternatives Requires(postun):update-alternatives
@ -246,7 +244,7 @@ done
%if %{with libalternatives} %if %{with libalternatives}
%pre %pre
# removing old update-alternatives entries # removing old update-alternatives entries
if [ "$1" > 0 ] ; then if [ "$1" -gt 0 ] && [ -f %{_sbindir}/update-alternatives ] ; then
update-alternatives --remove iptables "%_sbindir/xtables-legacy-multi" update-alternatives --remove iptables "%_sbindir/xtables-legacy-multi"
fi fi
%else %else
@ -269,7 +267,7 @@ fi
%if %{with libalternatives} %if %{with libalternatives}
%pre backend-nft %pre backend-nft
# removing old update-alternatives entries # removing old update-alternatives entries
if test "$1" = 0; then if [ "$1" -gt 0 ] && [ -f %{_sbindir}/update-alternatives ] ; then
update-alternatives --remove iptables "%_sbindir/xtables-nft-multi" update-alternatives --remove iptables "%_sbindir/xtables-nft-multi"
update-alternatives --remove arptables "%_sbindir/xtables-nft-multi" update-alternatives --remove arptables "%_sbindir/xtables-nft-multi"
update-alternatives --remove ebtables "%_sbindir/xtables-nft-multi" update-alternatives --remove ebtables "%_sbindir/xtables-nft-multi"