Hello community,

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

Package is "cifs-utils"

Mon Nov 23 16:39:21 2020 rev:65 rq:849646 version:6.9

Changes:
--------
--- /work/SRC/openSUSE:Factory/cifs-utils/cifs-utils.changes    2020-09-09 
17:45:55.290376831 +0200
+++ /work/SRC/openSUSE:Factory/.cifs-utils.new.5913/cifs-utils.changes  
2020-11-23 18:39:49.440704972 +0100
@@ -1,0 +2,5 @@
+Tue Nov 17 13:42:23 UTC 2020 - Ludwig Nussel <lnus...@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
+-------------------------------------------------------------------

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

Other differences:
------------------
++++++ cifs-utils.spec ++++++
--- /var/tmp/diff_new_pack.VJYyMx/_old  2020-11-23 18:39:50.512706079 +0100
+++ /var/tmp/diff_new_pack.VJYyMx/_new  2020-11-23 18:39:50.516706083 +0100
@@ -139,6 +139,9 @@
 export CFLAGS="%{optflags} -D_GNU_SOURCE -fpie"
 export LDFLAGS="-pie"
 autoreconf -i
+%if 0%{?usrmerged}
+export ROOTSBINDIR="%{_sbindir}"
+%endif
 %configure \
        --with-pamdir=/%{_lib}/security
 make %{?_smp_mflags}
@@ -175,7 +178,11 @@
 %endif
 
 %files
+%if 0%{?usrmerged}
+%{_sbindir}/mount.cifs
+%else
 /sbin/mount.cifs
+%endif
 %{_bindir}/getcifsacl
 %{_bindir}/setcifsacl
 %{_sbindir}/cifs.idmap
_______________________________________________
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