Accepting request 849646 from network:samba:STABLE

OBS-URL: https://build.opensuse.org/request/show/849646
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cifs-utils?expand=0&rev=65

cifs-utils.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Nov 17 13:42:23 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
 -------------------------------------------------------------------
 Mon Aug 10 06:56:11 UTC 2020 - Aurelien Aptel <aaptel@suse.com>
 

cifs-utils.spec

@@ -139,6 +139,9 @@ cp -a ${RPM_SOURCE_DIR}/README.cifstab.migration .
 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 @@ touch %{buildroot}/%{_sysconfdir}/sysconfig/network/if-{down,up}.d/${script} \
 %endif
 
 %files
+%if 0%{?usrmerged}
+%{_sbindir}/mount.cifs
+%else
 /sbin/mount.cifs
+%endif
 %{_bindir}/getcifsacl
 %{_bindir}/setcifsacl
 %{_sbindir}/cifs.idmap