git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
54d5350
)
s3:packaging: Fix version detection.
author
Karolin Seeger
<kseeger@samba.org>
Thu, 10 Dec 2009 13:57:08 +0000
(14:57 +0100)
committer
Karolin Seeger
<kseeger@samba.org>
Wed, 23 Dec 2009 11:07:56 +0000
(12:07 +0100)
Adapted from
728b01fc03
.
Thanks god I was not root! It would have delted /*!
Karolin
(cherry picked from commit
0604c696a05773a439538d88f1b45aa6637766a7
)
(cherry picked from commit
fd30552aab88572b2d5944b9b87ee8ca76d29b35
)
(cherry picked from commit
24f3fb1395673883e4435ffbf999b2f309c35306
)
packaging/RHEL/makerpms.git.sh
patch
|
blob
|
history
diff --git
a/packaging/RHEL/makerpms.git.sh
b/packaging/RHEL/makerpms.git.sh
index 1b3164841569f9b60969a1ecceba8b02c106c090..68f9d96ac96d4e0307cabe372d5a41e61f7519cd 100755
(executable)
--- 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