When using Epoch make sure to properly arrange requires and provides to account for Epoch as wellHEADmaster

1 files changed, 38 insertions, 26 deletions

diff --git a/samba4.spec b/samba4.spec
index fa2eee1..f3de846 100644
--- a/samba4.spec
+++ b/samba4.spec
@@ -39,6 +39,12 @@ Version:        %{samba_version}
 Release:        %{samba_release}
 Epoch:          1
 
+%if 0%{?epoch} > 0
+%define samba_depver %{epoch}:%{version}-%{release}
+%else
+%define samba_depver %{version}-%{release}
+%endif
+
 Summary:        Server and Client software to interoperate with Windows machines
 License:        GPLv3+ and LGPLv3+
 Group:          System Environment/Daemons
@@ -67,15 +73,21 @@ Patch4: samba4-external_ldap_callback.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires(pre): /usr/sbin/groupadd
+%if 0%{?fedora} > 15 || 0%{?rhel} > 6
+Requires(post): /bin/systemctl
+Requires(preun): /bin/systemctl
+%else
 Requires(post): /sbin/chkconfig, /sbin/service
 Requires(preun): /sbin/chkconfig, /sbin/service
-Requires(pre): %{name}-common = %{version}-%{release}
+%endif
+
+Requires(pre): %{name}-common = %{samba_depver}
 Requires: logrotate
 Requires: pam
 Requires: perl(Parse::Yapp)
 
-Conflicts: samba < 1:%{version}
-Provides: samba = 1:%{version}-%{release}
+Conflicts: samba < %{samba_depver}
+Provides: samba = %{samba_depver}
 
 BuildRequires: autoconf
 BuildRequires: ctdb-devel
@@ -135,11 +147,11 @@ Samba is the standard Windows interoperability suite of programs for Linux and U
 %package client
 Summary: Samba client programs
 Group: Applications/System
-Requires: %{name}-common = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-common = %{samba_depver}
+Requires: %{name}-libs = %{samba_depver}
 
 Conflicts: samba-client < 1:3.9.9
-Provides: samba-client = 1:%{version}-%{release}
+Provides: samba-client = %{samba_depver}
 
 %description client
 The samba4-client package provides some SMB/CIFS clients to complement
@@ -158,7 +170,7 @@ link against the SMB, RPC and other protocols provided by the Samba suite.
 %package python
 Summary: Samba Python libraries
 Group: Applications/System
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs = %{samba_depver}
 
 %description python
 The samba4-python package contains the Python libraries needed by programs
@@ -167,10 +179,10 @@ that use SMB, RPC and other Samba provided protocols in Python programs.
 %package devel
 Summary: Developer tools for Samba libraries
 Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs = %{samba_depver}
 
 Conflicts: samba-devel < 1:3.9.9
-Provides: samba-devel = 1:%{version}-%{release}
+Provides: samba-devel = %{samba_depver}
 
 %description devel
 The samba4-devel package contains the header files for the libraries
@@ -189,10 +201,10 @@ and Wireshark to parse IDL and similar protocols
 %package common
 Summary: Files used by both Samba servers and clients
 Group: Applications/System
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs = %{samba_depver}
 
 Conflicts: samba-common < 1:3.9.9
-Provides: samba-common = 1:%{version}-%{release}
+Provides: samba-common = %{samba_depver}
 
 %description common
 samba4-common provides files necessary for both the server and client
@@ -209,10 +221,10 @@ packages of Samba.
 %package winbind
 Summary: Samba winbind
 Group: Applications/System
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{samba_depver}
 
 Conflicts: samba-winbind < 1:3.9.9
-Provides: samba-winbind = 1:%{version}-%{release}
+Provides: samba-winbind = %{samba_depver}
 
 %description winbind
 The samba-winbind package provides the winbind NSS library, and some
@@ -221,11 +233,11 @@ domains and to use Windows user and group accounts on Linux.
 
 %package winbind-krb5-locator
 Summary: Samba winbind krb5 locator
-Requires: %{name}-winbind-clients = %{version}-%{release}
+Requires: %{name}-winbind-clients = %{samba_depver}
 Group: Applications/System
 
-Conflicts: samba-winbind-krb5-locator < 1:%{version}
-Provides: samba-winbind-krb5-locator = 1:%{version}-%{release}
+Conflicts: samba-winbind-krb5-locator < %{samba_depver}
+Provides: samba-winbind-krb5-locator = %{samba_depver}
 
 %description winbind-krb5-locator
 The winbind krb5 locator is a plugin for the system kerberos library to allow
@@ -236,7 +248,7 @@ Summary: Samba winbind clients
 Group: Applications/System
 Requires: libwbclient
 
-Conflicts: samba-winbind-clients < 1:%{version}
+Conflicts: samba-winbind-clients < %{samba_depver}
 
 %description winbind-clients
 The samba-winbind-clients package provides the NSS library and a PAM
@@ -246,7 +258,7 @@ module necessary to communicate to the Winbind Daemon
 %package swat
 Summary: The Samba SMB server Web configuration program
 Group: Applications/System
-Requires: %{name} = %{version}-%{release}, xinetd
+Requires: %{name} = %{samba_depver}, xinetd
 
 %description swat
 The samba-swat package includes the new SWAT (Samba Web Administration
@@ -256,10 +268,10 @@ Web browser.
 %package -n libsmbclient4
 Summary: The SMB client library
 Group: Applications/System
-Requires: %{name}-common = %{version}-%{release}
+Requires: %{name}-common = %{samba_depver}
 
 Conflicts: libsmbclient < 1:3.9.9
-Provides: libsmbclient = 1:%{version}-%{release}
+Provides: libsmbclient = %{samba_depver}
 
 %description -n libsmbclient4
 The libsmbclient4 contains the SMB client library from the Samba suite.
@@ -267,10 +279,10 @@ The libsmbclient4 contains the SMB client library from the Samba suite.
 %package -n libsmbclient4-devel
 Summary: Developer tools for the SMB client library
 Group: Development/Libraries
-Requires: libsmbclient4 = %{version}-%{release}
+Requires: libsmbclient4 = %{samba_depver}
 
 Conflicts: libsmbclient-devel < 1:3.9.9
-Provides: libsmbclient-devel = 1:%{version}-%{release}
+Provides: libsmbclient-devel = %{samba_depver}
 
 %description -n libsmbclient4-devel
 The libsmbclient4-devel package contains the header files and libraries needed to
@@ -286,7 +298,7 @@ The libwbclient package contains the winbind client library from the Samba suite
 %package -n libwbclient-devel
 Summary: Developer tools for the winbind library
 Group: Development/Libraries
-Requires: libwbclient = %{version}-%{release}
+Requires: libwbclient = %{samba_depver}
 
 %description -n libwbclient-devel
 The libwbclient-devel package provides developer tools for the wbclient library.
@@ -294,7 +306,7 @@ The libwbclient-devel package provides developer tools for the wbclient library.
 %package dc
 Summary: Samba AD Domain Controller
 Group: Applications/System
-Requires: samba4-dc-libs = %{version}-%{release}
+Requires: samba4-dc-libs = %{samba_depver}
 
 %description dc
 The samba-dc package provides AD Domain Controller functionality
@@ -302,8 +314,8 @@ The samba-dc package provides AD Domain Controller functionality
 %package dc-libs
 Summary: Samba AD Domain Controller Libraries
 Group: Applications/System
-Requires: samba4-libs = %{version}-%{release}
-Requires: samba4-common = %{version}-%{release}
+Requires: samba4-libs = %{samba_depver}
+Requires: samba4-common = %{samba_depver}
 
 %description dc-libs
 The samba4-dc-libs package contains the libraries needed by the DC to