From 32aa54bec778f13f0c69d91f61a322c3739f6b84 Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Thu, 10 Dec 2009 14:57:08 +0100 Subject: [PATCH] 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) --- packaging/RHEL/makerpms.git.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/RHEL/makerpms.git.sh b/packaging/RHEL/makerpms.git.sh index 1b316484156..68f9d96ac96 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 -- 2.11.4.GIT