rpm/cpio
SHA256
1
0
Fork 0
forked from pool/cpio
Code Pull Requests Activity

Accepting request 1052771 from home:lnussel:usrmerge

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

OBS-URL: https://build.opensuse.org/request/show/1052771
OBS-URL: https://build.opensuse.org/package/show/Archiving/cpio?expand=0&rev=89
This commit is contained in:
Danilo Spinella 2023-01-04 14:19:35 +00:00 committed by Git OBS Bridge
parent 75edb86779
commit 7ca12313db
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cpio.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:29:29 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
-------------------------------------------------------------------
Thu Oct 28 13:13:33 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>

6
cpio.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package cpio
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -110,7 +110,7 @@ mkdir -p %{buildroot}/{usr/bin,bin}
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
ln -sf %{_sysconfdir}/alternatives/mt %{buildroot}%{_bindir}/mt
ln -sf %{_sysconfdir}/alternatives/mt.1%{ext_man} %{buildroot}%{_mandir}/man1/mt.1%{ext_man}
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
ln -sf %{_bindir}/cpio %{buildroot}/bin
%endif
@ -138,7 +138,7 @@ fi
%files
%license COPYING
%doc NEWS ChangeLog
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
/bin/cpio
%endif
%{_bindir}/cpio