Hello community,

here is the log from the commit of package cryptsetup for openSUSE:Factory 
checked in at 2020-11-23 16:38:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cryptsetup (Old)
 and      /work/SRC/openSUSE:Factory/.cryptsetup.new.5913 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "cryptsetup"

Mon Nov 23 16:38:36 2020 rev:111 rq:849585 version:2.3.4

Changes:
--------
--- /work/SRC/openSUSE:Factory/cryptsetup/cryptsetup.changes    2020-09-08 
22:44:43.123440137 +0200
+++ /work/SRC/openSUSE:Factory/.cryptsetup.new.5913/cryptsetup.changes  
2020-11-23 18:40:29.136745968 +0100
@@ -1,0 +2,5 @@
+Wed Nov  4 17:33:26 UTC 2020 - Ludwig Nussel <lnus...@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ cryptsetup.spec ++++++
--- /var/tmp/diff_new_pack.PUstCW/_old  2020-11-23 18:40:29.940746798 +0100
+++ /var/tmp/diff_new_pack.PUstCW/_new  2020-11-23 18:40:29.940746798 +0100
@@ -144,8 +144,10 @@
 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 @@
 
 %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}
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives: 
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org

Reply via email to