s3/packaging: Fix rpm build issues on RHEL4.
authorKarolin Seeger <kseeger@samba.org>
Thu, 17 Nov 2011 20:23:09 +0000 (21:23 +0100)
committerKarolin Seeger <kseeger@samba.org>
Sat, 19 Nov 2011 18:59:31 +0000 (19:59 +0100)
Second part of a fix for bug #7705 (RHEL samba.spec broken - and fix).
Based on patches of Jason Haar and DaniĆ«l van Eeden. Thanks a lot!

Karolin

Autobuild-User: Karolin Seeger <kseeger@samba.org>
Autobuild-Date: Fri Nov 18 22:13:06 CET 2011 on sn-devel-104
(cherry picked from commit 1d471ee393b0a0c1f9cc4256217acabcd98a5dbf)

packaging/RHEL/samba.spec.tmpl

index 505b1ea1ca33c6e79729a836b7b9d3a2875798cd..152bad7b99d94c9a73952a05c02092c2756ee7f4 100644 (file)
@@ -1,5 +1,11 @@
 %define initdir %{_sysconfdir}/rc.d/init.d
 %define auth %(test -f /etc/pam.d/system-auth && echo /etc/pam.d/system-auth || echo)
+%define this_is_redhat  %(test -e /etc/redhat-release && echo 1 || echo 0)
+%if %{this_is_redhat} > 0
+%define rhel_ver %(lsb_release -sr)
+%else
+%define rhel_ver 0
+%endif
 
 Summary: Samba SMB client and server
 Vendor: Samba Team
@@ -28,7 +34,13 @@ Provides: samba = %{version}
 
 Prefix: /usr
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-devel, krb5-devel, cups-devel, keyutils-devel
+BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-devel, krb5-devel, cups-devel
+
+%if %{rhel_ver} > 4
+BuildRequires:  keyutils-libs-devel
+%else
+BuildRequires:  keyutils-devel
+%endif
 
 # Working around perl dependency problem from docs
 %define __perl_requires %{SOURCE998}