[SCM] Samba Shared Repository - branch master updated

[Karolin Seeger]

The branch, master has been updated
       via  1d471ee s3/packaging: Fix rpm build issues on RHEL4.
      from  20df0f3 s3:libsmb: verify num_setup for SMBnttrans in cli_pull_trans()

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1d471ee393b0a0c1f9cc4256217acabcd98a5dbf
Author: Karolin Seeger <kseeger at samba.org>
Date:   Thu Nov 17 21:23:09 2011 +0100

    s3/packaging: Fix rpm build issues on RHEL4.
    
    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 at samba.org>
    Autobuild-Date: Fri Nov 18 22:13:06 CET 2011 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 packaging/RHEL/samba.spec.tmpl |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index 505b1ea..152bad7 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -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}


-- 
Samba Shared Repository