commit fe3d5032484223b0a33f338c9326dc2bc3cfc23b
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Mon Jan 27 10:51:04 2020 +0100
- up to 6.10
build.patch | 18 ++++++++++++++++++
cifs-utils.spec | 17 +++++++++++++++--
2 files changed, 33 insertions(+), 2 deletions(-)
---
diff --git a/cifs-utils.spec b/cifs-utils.spec
index a5cd7b6..be1315f 100644
--- a/cifs-utils.spec
+++ b/cifs-utils.spec
@@ -1,13 +1,14 @@
Summary: Utilities for mounting and managing CIFS mounts
Summary(pl.UTF-8): Narzędzia do montowania i zarządzania montowaniami CIFS
Name: cifs-utils
-Version: 6.9
+Version: 6.10
Release: 1
License: GPL v3+
Group: Daemons
Source0:
http://ftp.samba.org/pub/linux-cifs/cifs-utils/%{name}-%{version}.tar.bz2
-# Source0-md5: 6ae854852e39ab1d5e2e3b512fdffb08
+# Source0-md5: 1cb2d653ccc77f8644213340a4f6b7dc
Patch0: %{name}-heimdal.patch
+Patch1: build.patch
URL: http://linux-cifs.samba.org/cifs-utils/
BuildRequires: heimdal-devel >= 1.5.1-3
BuildRequires: keyutils-devel
@@ -52,6 +53,14 @@ Plik nagłówkowy interfejsu wtyczek ID Mapping cifs-utils.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+
+sed -E -i -e '1s,#!\s*/usr/bin/env\s+python2(\s|$),#!%{__python}\1,' -e
'1s,#!\s*/usr/bin/env\s+python(\s|$),#!%{__python}\1,' -e
'1s,#!\s*/usr/bin/python(\s|$),#!%{__python}\1,' \
+ smb2-quota \
+ smb2-secdesc
+
+sed -E -i -e '1s,#!\s*/usr/bin/env\s+python3(\s|$),#!%{__python3}\1,' \
+ checkopts
%build
%{__aclocal}
@@ -79,9 +88,11 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc AUTHORS README
%attr(755,root,root) /sbin/mount.cifs
+%attr(755,root,root) /sbin/mount.smb3
%attr(755,root,root) %{_bindir}/cifscreds
%attr(755,root,root) %{_bindir}/getcifsacl
%attr(755,root,root) %{_bindir}/setcifsacl
+%attr(755,root,root) %{_bindir}/smb2-quota
%attr(755,root,root) %{_bindir}/smbinfo
%attr(755,root,root) %{_sbindir}/cifs.upcall
%attr(755,root,root) %{_sbindir}/cifs.idmap
@@ -91,11 +102,13 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/cifscreds.1*
%{_mandir}/man1/getcifsacl.1*
%{_mandir}/man1/setcifsacl.1*
+%{_mandir}/man1/smb2-quota.1*
%{_mandir}/man1/smbinfo.1*
%{_mandir}/man8/cifs.upcall.8*
%{_mandir}/man8/cifs.idmap.8*
%{_mandir}/man8/idmapwb.8*
%{_mandir}/man8/mount.cifs.8*
+%{_mandir}/man8/mount.smb3.8*
%{_mandir}/man8/pam_cifscreds.8*
%files devel
diff --git a/build.patch b/build.patch
new file mode 100644
index 0000000..e749ba3
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,18 @@
+--- cifs-utils-6.10/Makefile.am~ 2019-12-17 00:34:56.000000000 +0100
++++ cifs-utils-6.10/Makefile.am 2020-01-27 10:45:54.344935551 +0100
+@@ -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)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cifs-utils.git/commitdiff/fe3d5032484223b0a33f338c9326dc2bc3cfc23b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
