update to 6.12

0001-cifs-utils-Respect-DESTDIR-when-installing-smb3-stuff.patch

@@ -1,46 +0,0 @@
-From 0540dfad55f8e668ef67b03ccc709e311ca9eb04 Mon Sep 17 00:00:00 2001
-From: Mikhail Novosyolov <samba-technical@lists.samba.org>
-Date: Thu, 16 Jul 2020 17:09:42 +0800
-Subject: [PATCH] cifs-utils: Respect DESTDIR when installing smb3 stuff
-
-When make install is run during package building, DESTDIR parameter is passed, e.g.:
-$ rpm --eval %makeinstall_std
-make DESTDIR=/root/rpmbuild/BUILDROOT/%{name}-%{version}-%{release}-rosa2016.1.x86_64-buildroot install
-
-Without DESTDIR build scripts tried to create symlinks outside of the build root:
-make[3]: Entering directory '/tmp/abf/rpmbuild/BUILD/cifs-utils-6.10'
-(cd /sbin && ln -sf mount.cifs mount.smb3)
-ln: failed to create symbolic link 'mount.smb3': Permission denied
-
-The same fix was introduced in Arch Linux package when updating from 6.9 to 6.10:
-https://git.archlinux.org/svntogit/packages.git/commit/trunk/PKGBUILD?h=packages/cifs-utils&id=c75b246a762ea9b90db404dfebc6d3
-5d5b16972f
-
-backport from: https://lists.samba.org/archive/samba-technical/2020-January/134770.html
----
- Makefile.am | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index fe9cd34..09ef293 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -119,11 +119,11 @@ endif
- SUBDIRS = contrib
- 
- install-exec-hook:
--	(cd $(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3)
-+	(cd $(DESTDIR)$(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3)
- 
- install-data-hook:
--	(cd $(man8dir) && ln -sf mount.cifs.8 mount.smb3.8)
-+	(cd $(DESTDIR)$(man8dir) && ln -sf mount.cifs.8 mount.smb3.8)
- 
- uninstall-hook:
--	(cd $(ROOTSBINDIR) && rm -f $(ROOTSBINDIR)/mount.smb3)
--	(cd $(man8dir) && rm -f $(man8dir)/mount.smb3.8)
-+	(cd $(DESTDIR)$(ROOTSBINDIR) && rm -f $(ROOTSBINDIR)/mount.smb3)
-+	(cd $(DESTDIR)$(man8dir) && rm -f $(DESTDIR)$(man8dir)/mount.smb3.8)
--- 
-1.8.3.1
-

cifs-utils.spec

@@ -1,13 +1,11 @@
 Name:           cifs-utils
-Version:        6.10
+Version:        6.12
 Release:        1
 Summary:        Utilities for doing and managing mounts of the Linux CIFS filesystem
 License:        GPLv3+
 URL:            http://linux-cifs.samba.org/cifs-utils/
 Source0:        https://download.samba.org/pub/linux-cifs/cifs-utils/%{name}-%{version}.tar.bz2
 
-Patch1:         0001-cifs-utils-Respect-DESTDIR-when-installing-smb3-stuff.patch
-
 BuildRequires:  python3-docutils libcap-ng-devel libtalloc-devel krb5-devel keyutils-libs-devel autoconf
 BuildRequires:  automake libwbclient-devel pam-devel git python3-samba pkg-config fdupes gcc
 Provides:       pam_cifscreds
@@ -77,6 +75,9 @@ install -m 644 contrib/request-key.d/cifs.spnego.conf %{buildroot}%{_sysconfdir}
 %{_mandir}/man8/*
 
 %changelog
+* Fri Jan 22 2021 yanglongkang <yanglongkang@huawei.com> - 6.12-1
+- update to latest v6.12 version
+
 * Wed Jul 15 2020 Zhiqiang Liu <lzhq28@mail.ustc.edu.cn> - 6.10-1
 - update to latest v6.10 version