Accepting request 577707 from home:avindra

- update to 6.7: * mount.cifs cleanups - includes 6.6: * cleanup/overhaul of cifs.upcall krb5 credcache handling - partial cleanup with spec-cleaner OBS-URL: https://build.opensuse.org/request/show/577707 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=149
2018-03-20 16:47:44 +00:00 · 2018-03-20 16:47:44 +00:00 · 093a2d5449
commit 093a2d5449
parent 1f92ec94b7
6 changed files with 46 additions and 51 deletions
--- a/cifs-utils-6.5.tar.bz2
+++ b/cifs-utils-6.5.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e2776578b8267c6dc0862897f5e10f87f10f8337fca9ca6a9118f5eb30cf49f7
-size 402158
--- a/cifs-utils-6.5.tar.bz2.asc
+++ b/cifs-utils-6.5.tar.bz2.asc
@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQEcBAABCAAGBQJWyzHeAAoJEFr9v7Jw87mBzCUIALAjddIyPDJ+zUP8GEPkCL5M
-esOLPP0J9jf4t5QOqKq/druS/PmC9bs6GrZ/5gsYl3uXWtztIW61L3IIX9oGEErg
-lt6lpNWl5EkUzdKZQrNKzrekyI5uoGPpPL9k1ZMn8IlSQP769CIGW5zFL0cL63YB
-4wUkM7TtoCsD7LVJDtxe9ikprZ/OmbPNeavBhY4+7YuqYOjPXTgm4fl9Cqh92zO7
-ShC9IUqT/st1LZXPcDpPcncG+0hvM0cfBKcyv8WnOoqxNPyyCLrLywD8jnOcjiEC
-1IoH9d4+psmmTqxkrC/JypfccWBnuTWBJ9uDGy0HfQ3NG58Hwv60fJazKYKraxE=
-=RVqu
-----END PGP SIGNATURE-----
--- a/cifs-utils-6.7.tar.bz2
+++ b/cifs-utils-6.7.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b2f21612474ab012e75accd167aab607a0614ff67efb56ea0f36789fa785cfab
+size 363647
--- a/cifs-utils-6.7.tar.bz2.asc
+++ b/cifs-utils-6.7.tar.bz2.asc
@ -0,0 +1,12 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEyBAABCAAcBQJYuE4QFRxjaWZzLXV0aWxzQHNhbWJhLm9yZwAKCRBa/b+ycPO5
+gZm4CAC0bjFRKw/CIiokpWzJSKyhw7Hw9KT77pEIIB6e7MYqq9KbhqcwPyvX4TTb
+2Ghy+G2eWWC0jdOlCsGQODQ133cOwgTKWkETxcPZ8GFfHFhlrc/60ITieayV+nLz
+nlc2Wg0+lp9mSVEBIHEbCtV+bWqutNCuDFIX8ETXqDuUvqzkdUWA698crkK8v/w1
+fUSCsKutd0pYslXb51vN0w38eclQOMeimbHpAfqXr0sO8ATVN3JjTkIvNSC+YKI9
+F8VxFrHU3M1fusFtOiBJDC9DIt6qqlM5HqusUiCZDHP+mZjcwGDnYpHikWuqPOoD
+kz3rf4o0EZUdJ2mpkM7iDGo1CaXb
+=6Ab6
+-----END PGP SIGNATURE-----
--- a/cifs-utils.changes
+++ b/cifs-utils.changes
@ -1,7 +1,11 @@
 -------------------------------------------------------------------
-Tue Mar  6 14:26:58 UTC 2018 - schwab@suse.de
+Sun Feb 18 08:21:58 UTC 2018 - avindra@opensuse.org

- Update BuildIgnore to break build cycle samba-client <-> cifs-utils
+- update to 6.7:
+  * mount.cifs cleanups
+- includes 6.6:
+  * cleanup/overhaul of cifs.upcall krb5 credcache handling
+- partial cleanup with spec-cleaner

 -------------------------------------------------------------------
 Thu Apr 27 10:41:50 UTC 2017 - aaptel@suse.com
--- a/cifs-utils.spec
+++ b/cifs-utils.spec
@ -17,10 +17,10 @@


 Name:           cifs-utils
-Version:        6.5
+Version:        6.7
 Release:        0
 Summary:        Utilities for doing and managing mounts of the Linux CIFS filesystem
-License:        GPL-3.0-or-later
+License:        GPL-3.0+
 Group:          System/Filesystems
 Url:            http://www.samba.org/linux-cifs/cifs-utils/
 Source:         https://ftp.samba.org/pub/linux-cifs/%{name}/%{name}-%{version}.tar.bz2
@ -64,7 +64,7 @@ BuildRequires:  libcap-ng-devel
 %else
 BuildRequires:  libcap-devel
 %endif
-#!BuildIgnore:  samba-client
+#!BuildIgnore:  samba4-libs
 BuildRequires:  libtalloc-devel
 %if 0%{?suse_version} > 1110
 BuildRequires:  fdupes
@ -76,18 +76,12 @@ BuildRequires:  libkeyutils-devel
 BuildRequires:  libwbclient-devel
 %endif
 BuildRequires:  pam-devel
-%if 0%{?suse_version} > 1020
-BuildRequires:  pkg-config
-%else
 BuildRequires:  pkgconfig
-%endif
 Requires:       keyutils
 %if ! %{defined _rundir}
 %define _rundir %{_localstatedir}/run
 %endif

-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
 %description
 The cifs-utils package consist of utilities for doing and managing mounts of
 the Linux CIFS filesystem.
@ -122,21 +116,20 @@ cp -a ${RPM_SOURCE_DIR}/README.cifstab.migration .
 %patch1 -p1

 %build
-export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fpie"
+export CFLAGS="%{optflags} -D_GNU_SOURCE -fpie"
 export LDFLAGS="-pie"
 autoreconf -i
-%{configure} \
+%configure \
 	--with-pamdir=/%{_lib}/security
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}

 %install
 %if ! %{systemd}
 mkdir -p \
-	${RPM_BUILD_ROOT}/%{_sysconfdir}/init.d
+	%{buildroot}/%{_sysconfdir}/init.d
 %endif

-%{__make} install \
-	DESTDIR=${RPM_BUILD_ROOT}
+%make_install
 %if 0%{?centos_version} > 599 || 0%{?fedora_version} > 14 || 0%{?mandriva_version} > 201100 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 1020
 mkdir -p %{buildroot}%{_sysconfdir}/%{name}
 ln -s %{_libdir}/%{name}/idmapwb.so %{buildroot}%{_sysconfdir}/%{name}/idmap-plugin
@ -146,42 +139,41 @@ install -m 644 -p contrib/request-key.d/cifs.idmap.conf %{buildroot}%{_sysconfdi
 install -m 644 -p contrib/request-key.d/cifs.spnego.conf %{buildroot}%{_sysconfdir}/request-key.d
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1221
 mkdir -p \
-	${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d \
-	${RPM_BUILD_ROOT}/%{_sysconfdir}/samba \
-	${RPM_BUILD_ROOT}/%{_sbindir} \
-	${RPM_BUILD_ROOT}/%{_rundir}
+	%{buildroot}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d \
+	%{buildroot}/%{_sysconfdir}/samba \
+	%{buildroot}/%{_sbindir} \
+	%{buildroot}/%{_rundir}

 %if ! %{systemd}
-install -m 0755 -p ${RPM_SOURCE_DIR}/cifs.init ${RPM_BUILD_ROOT}/%{_sysconfdir}/init.d/cifs
-ln -s service ${RPM_BUILD_ROOT}/%{_sbindir}/rccifs
+install -m 0755 -p ${RPM_SOURCE_DIR}/cifs.init %{buildroot}/%{_sysconfdir}/init.d/cifs
+ln -s service %{buildroot}/%{_sbindir}/rccifs
 %endif

-touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/${script} \
-	${RPM_BUILD_ROOT}%{_rundir}/cifs
+touch %{buildroot}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/${script} \
+	%{buildroot}%{_rundir}/cifs
 %endif
 # Hardlink duplicate files
 %if 0%{?suse_version} > 1110
-%fdupes ${RPM_BUILD_ROOT}
+%fdupes %{buildroot}
 %endif

 %files
-%defattr(-,root,root)
 /sbin/mount.cifs
 %if 0%{?centos_version} > 599 || 0%{?fedora_version} > 14 || 0%{?mandriva_version} > 201100 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 1020
 %{_bindir}/getcifsacl
 %{_bindir}/setcifsacl
 %{_sbindir}/cifs.idmap
-%{_mandir}/man1/getcifsacl.1.*
-%{_mandir}/man1/setcifsacl.1.*
-%{_mandir}/man8/cifs.idmap.8.*
+%{_mandir}/man1/getcifsacl.1%{ext_man}
+%{_mandir}/man1/setcifsacl.1%{ext_man}
+%{_mandir}/man8/cifs.idmap.8%{ext_man}
 %endif
 %if 0%{?centos_version} > 499 || 0%{?fedora_version} > 14 || 0%{?mandriva_version} > 201100 || 0%{?rhel_version} > 499 || 0%{?suse_version} > 1020
 %{_bindir}/cifscreds
 %{_sbindir}/cifs.upcall
-%{_mandir}/man1/cifscreds.1.*
-%{_mandir}/man8/cifs.upcall.8.*
+%{_mandir}/man1/cifscreds.1%{ext_man}
+%{_mandir}/man8/cifs.upcall.8%{ext_man}
 %endif
-%{_mandir}/man8/mount.cifs.8.*
+%{_mandir}/man8/mount.cifs.8%{ext_man}
 %dir %{_sysconfdir}/request-key.d
 %config(noreplace) %{_sysconfdir}/request-key.d/cifs.idmap.conf
 %config(noreplace) %{_sysconfdir}/request-key.d/cifs.spnego.conf
@ -190,7 +182,7 @@ touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/${
 %dir %{_sysconfdir}/cifs-utils
 %config(noreplace) %{_sysconfdir}/cifs-utils/idmap-plugin
 %{_libdir}/%{name}/idmapwb.so
-%{_mandir}/man8/idmapwb.8.*
+%{_mandir}/man8/idmapwb.8%{ext_man}
 %endif
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1221
 %if ! %{systemd}
@ -203,12 +195,10 @@ touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/${
 %doc README.cifstab.migration

 %files devel
-%defattr(-,root,root)
 %{_includedir}/cifsidmap.h

 %files -n pam_cifscreds
-%defattr(-,root,root)
 /%{_lib}/security/pam_cifscreds.so
-%{_mandir}/man8/pam_cifscreds.8.*
+%{_mandir}/man8/pam_cifscreds.8%{ext_man}

 %changelog