Accepting request 1055717 from home:lnussel:usrmerge

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

OBS-URL: https://build.opensuse.org/request/show/1055717
OBS-URL: https://build.opensuse.org/package/show/filesystems/ntfs-3g_ntfsprogs?expand=0&rev=48
This commit is contained in:
Dirk Mueller 2023-01-04 11:05:36 +00:00 committed by Git OBS Bridge
parent ff5d7e1037
commit f5b6656570
2 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 13:13:17 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 31 14:48:19 UTC 2022 - Michael Gorse <mgorse@suse.com> Mon Oct 31 14:48:19 UTC 2022 - Michael Gorse <mgorse@suse.com>

View File

@ -17,7 +17,7 @@
%define sover 89 %define sover 89
%if 0%{?usrmerged} %if 0%{?suse_version} >= 1550
%define sbindir %{_sbindir} %define sbindir %{_sbindir}
%else %else
%define sbindir /sbin %define sbindir /sbin
@ -129,7 +129,7 @@ export LDFLAGS="-pie"
%install %install
%make_install %make_install
%if 0%{?usrmerged} %if 0%{?suse_version} >= 1550
mv %{buildroot}/sbin/* %{buildroot}%{_sbindir} mv %{buildroot}/sbin/* %{buildroot}%{_sbindir}
%endif %endif
rm -v %{buildroot}%{_libdir}/libntfs-3g.la rm -v %{buildroot}%{_libdir}/libntfs-3g.la