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

[Karolin Seeger]

The branch, v3-4-test has been updated
       via  24f3fb1... s3:packaging: Fix version detection.
      from  f39cde6... s3:packaging: Fix source dir.

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


- Log -----------------------------------------------------------------
commit 24f3fb1395673883e4435ffbf999b2f309c35306
Author: Karolin Seeger <kseeger at samba.org>
Date:   Thu Dec 10 14:57:08 2009 +0100

    s3:packaging: Fix version detection.
    
    Adapted from 728b01fc03.
    Thanks god I was not root! It would have delted /*!
    
    Karolin
    (cherry picked from commit 0604c696a05773a439538d88f1b45aa6637766a7)
    (cherry picked from commit fd30552aab88572b2d5944b9b87ee8ca76d29b35)

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

Summary of changes:
 packaging/RHEL/makerpms.git.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RHEL/makerpms.git.sh b/packaging/RHEL/makerpms.git.sh
index 1b31648..68f9d96 100755
--- a/packaging/RHEL/makerpms.git.sh
+++ b/packaging/RHEL/makerpms.git.sh
@@ -61,8 +61,8 @@ if [ ! -f ${VERSION_H} ] ; then
 	exit 1
 fi
 
-VERSION=`grep SAMBA_VERSION_OFFICIAL_STRING ${VERSION_H} | awk '{print $3}'`
-vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX ${VERSION_H} | awk '{print $3}'`
+VERSION=`grep "^#define SAMBA_VERSION_OFFICIAL_STRING " ${VERSION_H} | awk '{print $3}'`
+vendor_version=`grep "^#define SAMBA_VERSION_VENDOR_SUFFIX " ${VERSION_H} | awk '{print $3}'`
 if test "x${vendor_version}"  != "x" ; then
 	VERSION="${VERSION}-${vendor_version}"
 fi


-- 
Samba Shared Repository