diff --git a/cryptsetup.changes b/cryptsetup.changes index af45102..2f76ec1 100644 --- a/cryptsetup.changes +++ b/cryptsetup.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 27 10:30:22 UTC 2022 - Ludwig Nussel + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + ------------------------------------------------------------------- Mon Nov 28 13:51:24 UTC 2022 - Paolo Stivanin diff --git a/cryptsetup.spec b/cryptsetup.spec index c7af718..09f5ef5 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -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