Accepting request 1057169 from Base:System

OBS-URL: https://build.opensuse.org/request/show/1057169
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dd_rescue?expand=0&rev=55

dd_rescue.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 27 10:31:33 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check (boo#1206798)
+
 -------------------------------------------------------------------
 Tue Jul 26 19:55:25 CEST 2022 - kurt@garloff.de
 

dd_rescue.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package dd_rescue
 #
-# 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
@@ -134,7 +134,7 @@ OPT_FLAGS="%{optflags}"
 %make_install RPM_OPT_FLAGS="%{optflags}" INSTALLDIR=%{buildroot}/%{_bindir} LIB=%{_lib} LIBDIR=%{_libdir} \
     INSTASROOT= INSTALLFLAGS=
 
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 mkdir %{buildroot}/bin
 ln -sf %{_bindir}/dd_rescue %{buildroot}/bin
 %endif
@@ -146,7 +146,7 @@ ln -sf %{_bindir}/dd_rescue %{buildroot}/bin
 %doc README.dd_rescue TODO
 %license COPYING
 %{_bindir}/dd_rescue
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 /bin/dd_rescue
 %endif
 %{_libdir}/libddr_hash.so