[SCM] Samba Shared Repository - branch v3-6-test updated

Karolin Seeger kseeger at samba.org
Fri Sep 21 01:20:27 MDT 2012


The branch, v3-6-test has been updated
       via  6357c59 RHEL packaging: Try to fix makerpms.sh on RHEL.
      from  03a93b8 configure: fix wrong test == syntax

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 6357c591b62ca275d861d80a651977e16fce949d
Author: Karolin Seeger <kseeger at 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 <kseeger at samba.org>
    Autobuild-Date(master): Tue Sep 18 12:51:01 CEST 2012 on sn-devel-104
    (cherry picked from commit 6fb91dd36950151aeec69c074f4d900a6e7adba1)

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

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


More information about the samba-cvs mailing list