diff --git a/ntfs-3g_ntfsprogs.changes b/ntfs-3g_ntfsprogs.changes index 2a12730..d151c90 100644 --- a/ntfs-3g_ntfsprogs.changes +++ b/ntfs-3g_ntfsprogs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 27 13:13:17 UTC 2022 - Ludwig Nussel + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + ------------------------------------------------------------------- Mon Oct 31 14:48:19 UTC 2022 - Michael Gorse diff --git a/ntfs-3g_ntfsprogs.spec b/ntfs-3g_ntfsprogs.spec index 2cbb302..31a5961 100644 --- a/ntfs-3g_ntfsprogs.spec +++ b/ntfs-3g_ntfsprogs.spec @@ -17,7 +17,7 @@ %define sover 89 -%if 0%{?usrmerged} +%if 0%{?suse_version} >= 1550 %define sbindir %{_sbindir} %else %define sbindir /sbin @@ -129,7 +129,7 @@ export LDFLAGS="-pie" %install %make_install -%if 0%{?usrmerged} +%if 0%{?suse_version} >= 1550 mv %{buildroot}/sbin/* %{buildroot}%{_sbindir} %endif rm -v %{buildroot}%{_libdir}/libntfs-3g.la