3
0
forked from pool/findutils

Accepting request 1053912 from home:lnussel:usrmerge

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

OBS-URL: https://build.opensuse.org/request/show/1053912
OBS-URL: https://build.opensuse.org/package/show/Base:System/findutils?expand=0&rev=100
This commit is contained in:
Bernhard Voelker 2023-01-04 10:52:34 +00:00 committed by Git OBS Bridge
parent 033a733c87
commit 0eb5962619
2 changed files with 8 additions and 3 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:36:38 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
-------------------------------------------------------------------
Wed Feb 2 01:07:20 UTC 2022 - Bernhard Voelker <mail@bernhard-voelker.de>

View File

@ -1,7 +1,7 @@
#
# spec file for package findutils
#
# Copyright (c) 2022 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
@ -88,7 +88,7 @@ export DEFAULT_ARG_SIZE="(31u * 1024u)"
rm -f %{buildroot}%{_infodir}/find-maint*
%find_lang %{name}
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
mkdir -p %{buildroot}/bin
ln -sf %{_bindir}/find %{buildroot}/bin
%endif
@ -103,7 +103,7 @@ rm %{buildroot}%{_mandir}/man5/locatedb.5*
%files
%license COPYING
%doc AUTHORS NEWS README THANKS TODO
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
/bin/find
%endif
%{_bindir}/find