diff --git a/cifs-utils-rst2man-3.patch b/cifs-utils-rst2man-3.patch new file mode 100644 index 0000000..7610754 --- /dev/null +++ b/cifs-utils-rst2man-3.patch @@ -0,0 +1,28 @@ +From 9ef872e140e04864d6e8b42f75ba184357b79a05 Mon Sep 17 00:00:00 2001 +From: Alexander Bokovoy +Date: Tue, 17 Jul 2018 08:22:23 +0300 +Subject: [PATCH] configure.ac: support using both rst2man and rst2man-3 + +Python3 version of rst2man is called rst2man-3. + +Signed-off-by: Alexander Bokovoy +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index b0bc2b9..26d60ea 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -252,7 +252,7 @@ fi + + # if docs are not disabled, check if rst2man is available + if test $enable_man != "no"; then +- AC_CHECK_PROG(have_rst2man, rst2man, yes, no) ++ AC_CHECK_PROGS(have_rst2man, rst2man-3 rst2man, no) + if test $have_rst2man = "no"; then + if test $enable_man = "yes"; then + AC_MSG_ERROR([rst2man not found: cannot generate man pages, consider installing perl.]) +-- +2.17.1 + diff --git a/cifs-utils.spec b/cifs-utils.spec index 230b55a..bfda5e3 100644 --- a/cifs-utils.spec +++ b/cifs-utils.spec @@ -3,7 +3,7 @@ Name: cifs-utils Version: 6.8 -Release: 2%{pre_release}%{?dist} +Release: 3%{pre_release}%{?dist} Summary: Utilities for mounting and managing CIFS mounts Group: System Environment/Daemons @@ -11,13 +11,15 @@ License: GPLv3 URL: http://linux-cifs.samba.org/cifs-utils/ BuildRequires: gcc -BuildRequires: libcap-ng-devel libtalloc-devel krb5-devel keyutils-libs-devel autoconf automake libwbclient-devel pam-devel python2-docutils +BuildRequires: libcap-ng-devel libtalloc-devel krb5-devel keyutils-libs-devel autoconf automake libwbclient-devel pam-devel +BuildRequires: python3-docutils Requires: keyutils Requires(post): /usr/sbin/alternatives Requires(preun): /usr/sbin/alternatives Source0: https://download.samba.org/pub/linux-cifs/cifs-utils/%{name}-%{version}.tar.bz2 +Patch0: cifs-utils-rst2man-3.patch %description The SMB/CIFS protocol is a standard file sharing protocol widely deployed @@ -52,6 +54,8 @@ provide these credentials to the kernel automatically at login. %prep %setup -q -n %{name}-%{version}%{pre_release} +%patch0 -p1 + %build autoreconf -i @@ -104,6 +108,9 @@ fi %{_mandir}/man8/pam_cifscreds.8.gz %changelog +* Tue Jul 17 2018 Alexander Bokovoy - 6.8-3 +- Use Python 3 version of rst2man + * Thu Jul 12 2018 Fedora Release Engineering - 6.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild