diff --git a/.cifs-utils.metadata b/.cifs-utils.metadata index 66e85f4..d24cb14 100644 --- a/.cifs-utils.metadata +++ b/.cifs-utils.metadata @@ -1 +1 @@ -f9c9c0b54b002ba17e7194e51ba5c0390af6a147 SOURCES/cifs-utils-6.11.tar.bz2 +758e5c96671761e42fbf0b28af5c535273c54991 SOURCES/cifs-utils-6.14.tar.bz2 diff --git a/.gitignore b/.gitignore index 0e4f173..3d07f73 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/cifs-utils-6.11.tar.bz2 +SOURCES/cifs-utils-6.14.tar.bz2 diff --git a/SOURCES/cifs-utils-destdir.patch b/SOURCES/cifs-utils-destdir.patch deleted file mode 100644 index 7124927..0000000 --- a/SOURCES/cifs-utils-destdir.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up cifs-utils-6.11/Makefile.am.orig cifs-utils-6.11/Makefile.am ---- cifs-utils-6.11/Makefile.am.orig 2020-11-02 10:12:50.076702518 +0200 -+++ cifs-utils-6.11/Makefile.am 2020-11-02 10:13:41.966420633 +0200 -@@ -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 $(DESTDIR)$(ROOTSBINDIR)/mount.smb3) -+ (cd $(DESTDIR)$(man8dir) && rm -f $(DESTDIR)$(man8dir)/mount.smb3.8) diff --git a/SPECS/cifs-utils.spec b/SPECS/cifs-utils.spec index c26ae2e..017310d 100644 --- a/SPECS/cifs-utils.spec +++ b/SPECS/cifs-utils.spec @@ -2,8 +2,8 @@ %define pre_release %nil Name: cifs-utils -Version: 6.11 -Release: 5%{pre_release}%{?dist} +Version: 6.14 +Release: 1%{pre_release}%{?dist} Summary: Utilities for mounting and managing CIFS mounts License: GPLv3 @@ -21,7 +21,6 @@ Requires(preun): /usr/sbin/alternatives Recommends: %{name}-info%{?_isa} = %{version}-%{release} Source0: https://download.samba.org/pub/linux-cifs/cifs-utils/%{name}-%{version}.tar.bz2 -Patch0: cifs-utils-destdir.patch %description The SMB/CIFS protocol is a standard file sharing protocol widely deployed @@ -54,7 +53,6 @@ provide these credentials to the kernel automatically at login. %prep %setup -q -n %{name}-%{version}%{pre_release} -%patch0 -p1 %build fgrep -r -l '/usr/bin/env python' | xargs -n1 sed -i 's@/usr/bin/env python.*@%python3@g' @@ -126,6 +124,10 @@ about CIFS mount. %{_mandir}/man1/smbinfo.* %changelog +* Wed Feb 02 2022 Alexander Bokovoy - 6.14 +- Update to v6.14 release +- Resolves: rhbz#1925956 + * Mon Aug 09 2021 Mohan Boddu - 6.11-5 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688