testing/tar
SHA256
3
0
Fork 0
forked from pool/tar
Code Pull Requests Activity

Accepting request 1055744 from home:lnussel:usrmerge

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

OBS-URL: https://build.opensuse.org/request/show/1055744
OBS-URL: https://build.opensuse.org/package/show/Base:System/tar?expand=0&rev=118
This commit is contained in:
Danilo Spinella 2023-01-04 14:19:00 +00:00 committed by Git OBS Bridge
parent 1a8b3bd277
commit f78b56f65a
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tar.changes
View File

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

4
tar.spec
View File

@ -167,7 +167,7 @@ rm %{buildroot}%{_localstatedir}/lib/tests/tar/{atconfig,atlocal,Makefile}*
mkdir -p %{buildroot}%{_sysconfdir}/alternatives mkdir -p %{buildroot}%{_sysconfdir}/alternatives
ln -sf %{_sysconfdir}/alternatives/rmt %{buildroot}%{_bindir}/rmt ln -sf %{_sysconfdir}/alternatives/rmt %{buildroot}%{_bindir}/rmt
ln -sf %{_sysconfdir}/alternatives/rmt.1%{ext_man} %{buildroot}%{_mandir}/man1/rmt.1%{ext_man} ln -sf %{_sysconfdir}/alternatives/rmt.1%{ext_man} %{buildroot}%{_mandir}/man1/rmt.1%{ext_man}
%if !0%{?usrmerged} %if 0%{?suse_version} < 1550
mkdir -p %{buildroot}/bin mkdir -p %{buildroot}/bin
ln -s %{_bindir}/%{name} %{buildroot}/bin ln -s %{_bindir}/%{name} %{buildroot}/bin
%endif %endif
@ -218,7 +218,7 @@ fi
%files %files
%license COPYING %license COPYING
%if !0%{?usrmerged} %if 0%{?suse_version} < 1550
/bin/%{name} /bin/%{name}
%endif %endif
%{_bindir}/%{name} %{_bindir}/%{name}