Accepting request 433664 from home:jmcdough:rhbuildfix

Fix RH builds by replacing Prereq with Requires

OBS-URL: https://build.opensuse.org/request/show/433664
OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=548

samba.spec

@@ -150,7 +150,7 @@ BuildRequires:  libcephfs-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3697
+%define SOURCE_TIMESTAMP 3712
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
@@ -173,14 +173,14 @@ Source1:        vendor-files.tar.bz2
 Source2:        patches.tar.bz2
 Source4:        baselibs.conf
 Source100:      samba-client-rpmlintrc
-PreReq:         /usr/bin/getent
-PreReq:         /usr/sbin/groupadd
-PreReq:         coreutils
-PreReq:         grep
+Requires:       /usr/bin/getent
+Requires:       /usr/sbin/groupadd
+Requires:       coreutils
+Requires:       grep
 %if 0%{?suse_version} > 1220
-PreReq:         %{fillup_prereq}
+Requires:       %{fillup_prereq}
 %endif
-PreReq:         samba-client >= %{version}
+Requires:       samba-client >= %{version}
 # Choose some features / extra packages here
 ############################################
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120
@@ -263,11 +263,11 @@ Provides:       smbfs
 Obsoletes:      samba-gplv3-client < %{version}
 Obsoletes:      samba-client-gplv2 < %{version}
 %if 0%{?suse_version} > 0
-PreReq:         %{?insserv_prereq}
+Requires:       %{?insserv_prereq}
 %endif
-PreReq:         /sbin/chkconfig
-PreReq:         /sbin/ldconfig
-PreReq:         coreutils
+Requires:       /sbin/chkconfig
+Requires:       /sbin/ldconfig
+Requires:       coreutils
 %{?systemd_requires}
 Requires:       cifs-utils
 
@@ -313,8 +313,8 @@ Branch:         %{BRANCH}
 Summary:        Samba Documentation
 License:        GPL-3.0+
 Group:          Documentation/Other
-PreReq:         coreutils
-PreReq:         findutils
+Requires:       coreutils
+Requires:       findutils
 Obsoletes:      samba-gplv3-doc < %{version}
 Obsoletes:      samba-doc-gplv2 < %{version}
 %if 0%{?suse_version} > 1110
@@ -336,7 +336,7 @@ Summary:        Samba libraries
 License:        GPL-3.0+
 Group:          Development/Libraries/C and C++
 Requires:       krb5
-PreReq:         /sbin/ldconfig
+Requires:       /sbin/ldconfig
 %if 0%{?suse_version} > 1210 &&  0%{?suse_version} < 1315
 Requires:       libfam0-gamin
 %endif
@@ -391,7 +391,7 @@ License:        GPL-3.0+
 Group:          Applications/System
 Requires:       samba = %{version}
 Requires:       samba-winbind = %{version}
-PreReq:         /sbin/ldconfig
+Requires:       /sbin/ldconfig
 
 %description test
 samba-test provides testing tools for both the server and client
@@ -417,12 +417,12 @@ Recommends:     logrotate
 Recommends:     /usr/sbin/nscd
 %endif
 %if 0%{?suse_version} > 0
-PreReq:         %{?insserv_prereq}
+Requires:       %{?insserv_prereq}
 %endif
-PreReq:         /sbin/ldconfig
-PreReq:         /usr/sbin/groupadd
-PreReq:         coreutils
-PreReq:         samba-client >= %{version}
+Requires:       /sbin/ldconfig
+Requires:       /usr/sbin/groupadd
+Requires:       coreutils
+Requires:       samba-client >= %{version}
 
 %description winbind
 This is the winbind-daemon and the wbinfo-tool.
@@ -950,7 +950,7 @@ Obsoletes:      libsmbclient < %{version}
 Summary:        Samba Client Library
 License:        GPL-3.0+
 Group:          System/Libraries
-PreReq:         /sbin/ldconfig
+Requires:       /sbin/ldconfig
 
 %description -n %{libsmbclient_name}
 This package includes the libsmbclient library.
@@ -981,7 +981,7 @@ Branch:         %{BRANCH}
 Summary:        Samba netapi Library
 License:        GPL-3.0+
 Group:          System/Libraries
-PreReq:         /sbin/ldconfig
+Requires:       /sbin/ldconfig
 
 %description -n %{libnetapi_name}
 This package includes the netapi library.
@@ -1009,7 +1009,7 @@ Branch:         %{BRANCH}
 Summary:        Samba libwbclient Library
 License:        LGPL-3.0+
 Group:          System/Libraries
-PreReq:         /sbin/ldconfig
+Requires:       /sbin/ldconfig
 %if 0%{?suse_version} > 1030
 Recommends:     samba-winbind = %{version}-%{release}
 %endif
@@ -1201,7 +1201,7 @@ rm \
 %if 0%{?suse_version}
 install -m 0644 vendor-files/config/sysconfig.ctdb %{buildroot}/%{_var}/adm/fillup-templates
 %else
-install -m 0644 ctdb/config/ctdb.sysconfig ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/ctdb
+install -m 0644 vendor-files/config/sysconfig.ctdb ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/ctdb
 %endif
 %if 0%{?suse_version} > 1220
 install -m 0755 ctdb/config/ctdb.service %{buildroot}%{_unitdir}/ctdb.service
@@ -2018,6 +2018,7 @@ fi
 %{_bindir}/masktest
 %{_bindir}/ndrdump
 %{_bindir}/smbtorture
+%{_bindir}/vfstest
 %{_mandir}/man1/gentest.1.*
 %{_mandir}/man1/locktest.1.*
 %{_mandir}/man1/masktest.1.*