pool/cryptsetup
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 849585 from security

Browse Source 
- prepare usrmerge (boo#1029961) (forwarded request 849583 from lnussel)

OBS-URL: https://build.opensuse.org/request/show/849585
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cryptsetup?expand=0&rev=111
This commit is contained in:
Dominique Leuenberger 2020-11-23 15:38:36 +00:00 committed by Git OBS Bridge
commit 8fc7ca0b5c
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cryptsetup.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Nov 4 17:33:26 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- prepare usrmerge (boo#1029961)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 4 09:49:31 CEST 2020 - Ludwig Nussel <lnussel@suse.de> Fri Sep 4 09:49:31 CEST 2020 - Ludwig Nussel <lnussel@suse.de>

4
cryptsetup.spec
View File

@ -144,8 +144,10 @@ for i in cryptsetup integritysetup veritysetup cryptsetup-reencrypt; do
done done
rm -f %{buildroot}%{_tmpfilesdir}/cryptsetup.conf rm -f %{buildroot}%{_tmpfilesdir}/cryptsetup.conf
%endif %endif
%if !0%{?usrmerged}
install -dm 0755 %{buildroot}/sbin install -dm 0755 %{buildroot}/sbin
ln -s ..%{_sbindir}/cryptsetup%{?is_backports:2} %{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 # 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 find %{buildroot} -type f -name "*.la" -delete -print
# #
@ -170,7 +172,9 @@ find %{buildroot} -type f -name "*.la" -delete -print
%files %files
%doc AUTHORS COPYING* FAQ README TODO docs/ChangeLog.old docs/*ReleaseNotes %doc AUTHORS COPYING* FAQ README TODO docs/ChangeLog.old docs/*ReleaseNotes
%if !0%{?usrmerged}
/sbin/cryptsetup%{?is_backports:2} /sbin/cryptsetup%{?is_backports:2}
%endif
%{_sbindir}/cryptsetup%{?is_backports:2} %{_sbindir}/cryptsetup%{?is_backports:2}
%{_sbindir}/veritysetup%{?is_backports:2} %{_sbindir}/veritysetup%{?is_backports:2}
%{_sbindir}/integritysetup%{?is_backports:2} %{_sbindir}/integritysetup%{?is_backports:2}