The branch, master has been updated via 6fb91dd RHEL packaging: Try to fix makerpms.sh on RHEL. from 2a7484e panic action is defined as GLOBAL_VAR(szPanicAction) not GLOBAL_VAR(panic_action)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 6fb91dd36950151aeec69c074f4d900a6e7adba1 Author: Karolin Seeger <ksee...@samba.org> Date: Tue Sep 18 11:08:17 2012 +0200 RHEL packaging: Try to fix makerpms.sh on RHEL. Address bug #9165 - makerpms.sh can't create package fo RHEL. Karolin Autobuild-User(master): Karolin Seeger <ksee...@samba.org> Autobuild-Date(master): Tue Sep 18 12:51:01 CEST 2012 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: packaging/RHEL/samba.spec.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl index 152bad7..adbc6df 100644 --- a/packaging/RHEL/samba.spec.tmpl +++ b/packaging/RHEL/samba.spec.tmpl @@ -2,7 +2,7 @@ %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) +%define rhel_ver %(grep "release" /etc/redhat-release | sed %"s/^[^0-9]*\\([0-9]*\\).*/\\1/g") %else %define rhel_ver 0 %endif -- Samba Shared Repository