Attachment 7113 Details for Bug 7705 – Proposed (extended) patch

[patch] Proposed (extended) patch

0001-s3-packaging-Fix-rpm-build-issues-on-RHEL4.patch (text/plain), 1.64 KB, created by Karolin Seeger on 2011-11-17 20:30:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Karolin Seeger

Created: 2011-11-17 20:30:43 UTC

Size: 1.64 KB

patch

obsolete

>From a2d6d88b80e4dd3ae692f7755a6af352f92449bb Mon Sep 17 00:00:00 2001
>From: Karolin Seeger <kseeger@samba.org>
>Date: Thu, 17 Nov 2011 21:23:09 +0100
>Subject: [PATCH] s3/packaging: Fix rpm build issues on RHEL4.
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>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
>---
> packaging/RHEL/samba.spec.tmpl |   14 +++++++++++++-
> 1 files changed, 13 insertions(+), 1 deletions(-)
>
>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}
>-- 
>1.7.1
>

Flags:

bjacke: review+

Actions: View

Attachments on bug 7705: 5989 | 7051 | 7057 | 7113