[samba4/f18] Fix Epoch related issue in RHEL builds.

asn asn at fedoraproject.org
Thu Aug 23 10:38:40 UTC 2012


commit fb3c69cbed80193cc940a3c621cf82a4bcc5b81c
Author: Andreas Schneider <asn at cryptomilk.org>
Date:   Thu Aug 23 12:15:49 2012 +0200

    Fix Epoch related issue in RHEL builds.

 samba4.spec |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/samba4.spec b/samba4.spec
index 9b97aa4..d45d54d 100644
--- a/samba4.spec
+++ b/samba4.spec
@@ -1,4 +1,4 @@
-%define main_release 134
+%define main_release 135
 
 %define samba_version 4.0.0
 %define talloc_version 2.0.7
@@ -63,8 +63,10 @@ Epoch:          2
 
 %if 0%{?epoch} > 0
 %define samba_depver %{epoch}:%{version}-%{release}
+%define samba_conflict_ver %{epoch}:3.9.9
 %else
 %define samba_depver %{version}-%{release}
+%define samba_conflict_ver 3.9.9
 %endif
 
 Summary:        Server and Client software to interoperate with Windows machines
@@ -185,7 +187,7 @@ Group: Applications/System
 Requires: %{name}-common = %{samba_depver}
 Requires: %{name}-libs = %{samba_depver}
 
-Conflicts: samba-client < 2:3.9.9
+Conflicts: samba-client < %{samba_conflict_ver}
 Provides: samba-client = %{samba_depver}
 
 %description client
@@ -218,7 +220,7 @@ Summary: Developer tools for Samba libraries
 Group: Development/Libraries
 Requires: %{name}-libs = %{samba_depver}
 
-Conflicts: samba-devel < 2:3.9.9
+Conflicts: samba-devel < %{samba_conflict_ver}
 Provides: samba-devel = %{samba_depver}
 
 %description devel
@@ -243,7 +245,7 @@ Requires: %{name}-libs = %{samba_depver}
 Requires(post): systemd
 %endif
 
-Conflicts: samba-common < 2:3.9.9
+Conflicts: samba-common < %{samba_conflict_ver}
 Provides: samba-common = %{samba_depver}
 
 %description common
@@ -264,7 +266,7 @@ Group: Applications/System
 Requires: %{name} = %{samba_depver}
 Requires: samba4-common = %{samba_depver}
 
-Conflicts: samba-winbind < 2:3.9.9
+Conflicts: samba-winbind < %{samba_conflict_ver}
 Provides: samba-winbind = %{samba_depver}
 
 %description winbind
@@ -303,7 +305,7 @@ Summary: The Samba SMB server Web configuration program
 Group: Applications/System
 Requires: %{name} = %{samba_depver}, xinetd
 
-Conflicts: samba-swat < 2:3.9.9
+Conflicts: samba-swat < %{samba_conflict_ver}
 Provides: samba-swat = %{samba_depver}
 
 %description swat
@@ -317,7 +319,7 @@ Summary: The SMB client library
 Group: Applications/System
 Requires: %{name}-common = %{samba_depver}
 
-Conflicts: libsmbclient < 2:3.9.9
+Conflicts: libsmbclient < %{samba_conflict_ver}
 Provides: libsmbclient = %{samba_depver}
 
 %description -n libsmbclient
@@ -328,7 +330,7 @@ Summary: Developer tools for the SMB client library
 Group: Development/Libraries
 Requires: libsmbclient = %{samba_depver}
 
-Conflicts: libsmbclient-devel < 2:3.9.9
+Conflicts: libsmbclient-devel < %{samba_conflict_ver}
 Provides: libsmbclient-devel = %{samba_depver}
 
 %description -n libsmbclient-devel
@@ -1304,6 +1306,9 @@ rm -rf %{buildroot}
 %endif # with_libwbclient
 
 %changelog
+* Tue Aug 21 2012 - Sumit Bose <sbose at redhat.com> - 2:4.0.0-135.beta6
+- Fix Epoch related issue in RHEL builds.
+
 * Tue Aug 21 2012 - Andreas Schneider <asn at redhat.com> - 2:4.0.0-134.beta6
 - Update to Samba 4.0.0 beta6.
 


More information about the scm-commits mailing list