Accepting request 1052843 from home:lnussel:usrmerge

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

OBS-URL: https://build.opensuse.org/request/show/1052843
OBS-URL: https://build.opensuse.org/package/show/security/cryptsetup?expand=0&rev=184
This commit is contained in:
Andreas Stieger 2023-01-04 16:08:29 +00:00 committed by Git OBS Bridge
parent 8cea81ce7b
commit cf385930c9
2 changed files with 8 additions and 3 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:30:22 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
-------------------------------------------------------------------
Mon Nov 28 13:51:24 UTC 2022 - Paolo Stivanin <info@paolostivanin.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package cryptsetup
#
# 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
@ -147,7 +147,7 @@ time via the config file %{_sysconfdir}/crypttab.
%{nil}
%make_install
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
install -dm 0755 %{buildroot}/sbin
ln -s ..%{_sbindir}/cryptsetup %{buildroot}/sbin
%endif
@ -172,7 +172,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
%files
%license COPYING*
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
/sbin/cryptsetup
%endif
%{_sbindir}/cryptsetup