Accepting request 849588 from home:lnussel:usrmove

- prepare usrmerge (boo#1029961)

OBS-URL: https://build.opensuse.org/request/show/849588
OBS-URL: https://build.opensuse.org/package/show/Base:System/dd_rescue?expand=0&rev=48
This commit is contained in:
Marcus Meissner 2020-12-05 17:16:47 +00:00 committed by Git OBS Bridge
parent 5205dff7bf
commit b25444fc3d
2 changed files with 10 additions and 0 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Oct 19 16:01:24 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- prepare usrmerge (boo#1029961)
-------------------------------------------------------------------
Thu Sep 3 08:07:30 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>

View File

@ -15,6 +15,7 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%ifarch aarch64 %arm
# boo#1176219
%define _lto_cflags %{nil}
@ -142,8 +143,10 @@ make RPM_OPT_FLAGS="%{optflags}" LIBDIR=%{_libdir} LIB=%{_lib} %{?_smp_mflags}
%make_install RPM_OPT_FLAGS="%{optflags}" INSTALLDIR=%{buildroot}/%{_bindir} LIB=%{_lib} LIBDIR=%{_libdir} \
INSTASROOT= INSTALLFLAGS=
%if !0%{?usrmerged}
mkdir %{buildroot}/bin
ln -sf %{_bindir}/dd_rescue %{buildroot}/bin
%endif
%check
make %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags} -fcommon" check
@ -153,7 +156,9 @@ make %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags} -fcommon" check
%doc README.dd_rescue TODO
%license COPYING
%{_bindir}/dd_rescue
%if !0%{?usrmerged}
/bin/dd_rescue
%endif
%{_libdir}/libddr_hash.so
%{_libdir}/libddr_MD5.so
%{_libdir}/libddr_null.so