pool/iproute2
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1054740 from home:lnussel:usrmerge

Browse Source 
Replace transitional %usrmerged macro with regular version check (boo#1206798)

OBS-URL: https://build.opensuse.org/request/show/1054740
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=234
This commit is contained in:
Jan Engelhardt 2023-01-04 11:09:52 +00:00 committed by Git OBS Bridge
parent 9905fa8322
commit 66780624a5
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
iproute2.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 12:27:23 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 23 08:13:21 UTC 2022 - Dirk Müller <dmueller@suse.com> Fri Dec 23 08:13:21 UTC 2022 - Dirk Müller <dmueller@suse.com>

6
iproute2.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package iproute2 # spec file for package iproute2
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2023 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -123,7 +123,7 @@ chmod -x "$b/%_libdir/libnetlink.a"
install -pm0644 "include/libnetlink.h" "$b/%_includedir/" install -pm0644 "include/libnetlink.h" "$b/%_includedir/"
chmod -x "$b/%_includedir/libnetlink.h" chmod -x "$b/%_includedir/libnetlink.h"
install -Dm0644 "%SOURCE3" "$b/%_tmpfilesdir/%name.conf" install -Dm0644 "%SOURCE3" "$b/%_tmpfilesdir/%name.conf"
%if 0%{?usrmerged} %if 0%{?suse_version} >= 1550
ln -sf "%_sbindir/ip" "$b/%_bindir/ip" ln -sf "%_sbindir/ip" "$b/%_bindir/ip"
%else %else
ln -s "%_sbindir/ip" "$b/sbin/" ln -s "%_sbindir/ip" "$b/sbin/"
@ -158,7 +158,7 @@ EOF
%_tmpfilesdir/%name.conf %_tmpfilesdir/%name.conf
%ghost %dir %_rundir/netns %ghost %dir %_rundir/netns
%exclude %_sbindir/arpd %exclude %_sbindir/arpd
%if 0%{?usrmerged} %if 0%{?suse_version} >= 1550
%_bindir/ip %_bindir/ip
%else %else
/sbin/* /sbin/*