From c6c715c2f58cf73fff2a7b5ecb7dc479fe7b8e08b659038615204a6dac021ebf Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Fri, 20 Nov 2020 09:26:02 +0000 Subject: [PATCH] Accepting request 849583 from home:lnussel:usrmove - prepare usrmerge (boo#1029961) OBS-URL: https://build.opensuse.org/request/show/849583 OBS-URL: https://build.opensuse.org/package/show/security/cryptsetup?expand=0&rev=162 --- cryptsetup.changes | 5 +++++ cryptsetup.spec | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/cryptsetup.changes b/cryptsetup.changes index 44f03d3..9e3e0b1 100644 --- a/cryptsetup.changes +++ b/cryptsetup.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 4 17:33:26 UTC 2020 - Ludwig Nussel + +- prepare usrmerge (boo#1029961) + ------------------------------------------------------------------- Fri Sep 4 09:49:31 CEST 2020 - Ludwig Nussel diff --git a/cryptsetup.spec b/cryptsetup.spec index 0068e06..c0522ab 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -144,8 +144,10 @@ for i in cryptsetup integritysetup veritysetup cryptsetup-reencrypt; do done rm -f %{buildroot}%{_tmpfilesdir}/cryptsetup.conf %endif +%if !0%{?usrmerged} install -dm 0755 %{buildroot}/sbin ln -s ..%{_sbindir}/cryptsetup%{?is_backports:2} %{buildroot}/sbin +%endif # don't want this file in /lib (FHS compat check), and can't move it to /usr/lib find %{buildroot} -type f -name "*.la" -delete -print # @@ -170,7 +172,9 @@ find %{buildroot} -type f -name "*.la" -delete -print %files %doc AUTHORS COPYING* FAQ README TODO docs/ChangeLog.old docs/*ReleaseNotes +%if !0%{?usrmerged} /sbin/cryptsetup%{?is_backports:2} +%endif %{_sbindir}/cryptsetup%{?is_backports:2} %{_sbindir}/veritysetup%{?is_backports:2} %{_sbindir}/integritysetup%{?is_backports:2}