Accepting request 1053594 from home:lnussel:usrmerge

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

OBS-URL: https://build.opensuse.org/request/show/1053594
OBS-URL: https://build.opensuse.org/package/show/filesystems/e2fsprogs?expand=0&rev=152

e2fsprogs.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 27 10:34:50 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check (boo#1206798)
+
 -------------------------------------------------------------------
 Thu Sep 15 10:23:25 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
 

e2fsprogs.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package e2fsprogs
 #
-# 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
@@ -243,7 +243,7 @@ make install install-libs DESTDIR=$RPM_BUILD_ROOT ELF_INSTALL_DIR=/%{_libdir}
 
 rm $RPM_BUILD_ROOT%{_libdir}/e2initrd_helper
 
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 mkdir %{buildroot}/sbin
 ln -s %{_sbindir}/badblocks %{buildroot}/sbin/badblocks
 ln -s %{_sbindir}/debugfs   %{buildroot}/sbin/debugfs
@@ -326,7 +326,7 @@ done
 %license NOTICE
 %endif
 %config /etc/mke2fs.conf
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 /sbin/badblocks
 /sbin/debugfs
 /sbin/dumpe2fs
@@ -400,7 +400,7 @@ done
 
 %files -n libext2fs2
 %defattr(-, root, root)
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 /%{_lib}/libext2fs.so.*
 /%{_lib}/libe2p.so.*
 %endif
@@ -418,7 +418,7 @@ done
 
 %files -n libcom_err2
 %defattr(-, root, root)
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 /%{_lib}/libcom_err.so.*
 /%{_lib}/libss.so.*
 %endif