diff --git a/dd_rescue.changes b/dd_rescue.changes index d67127f..a4555b8 100644 --- a/dd_rescue.changes +++ b/dd_rescue.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 19 16:01:24 UTC 2020 - Ludwig Nussel + +- prepare usrmerge (boo#1029961) + ------------------------------------------------------------------- Thu Sep 3 08:07:30 UTC 2020 - Guillaume GARDET diff --git a/dd_rescue.spec b/dd_rescue.spec index 80e494b..f568616 100644 --- a/dd_rescue.spec +++ b/dd_rescue.spec @@ -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