Generate the memcached.spec along with the version number.

3 files changed, 7 insertions, 2 deletions

diff --git a/.gitignore b/.gitignore
index 38b61e9..1dbb041 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ doc/protocol-binary.txt
 /testapp
 /timedrun
 /doc/doxy
+/memcached.spec
diff --git a/memcached.spec b/memcached.spec.in
index 481555e..4683527 100644
--- a/memcached.spec
+++ b/memcached.spec.in
@@ -1,5 +1,5 @@
 Name:           memcached
-Version:        1.3.2
+Version:        @VERSION@
 Release:        1%{?dist}
 Summary:        High Performance, Distributed Memory Object Cache
 
@@ -93,6 +93,9 @@ exit 0
 
 
 %changelog
+* Sat Aug 29 2009 Dustin Sallings <dustin@spy.net> - 1.4.1-1
+- Autogenerate the version number from tags.
+
 * Wed Jul  4 2007 Paul Lindner <lindner@inuus.com> - 1.2.2-5
 - Use /var/run/memcached/ directory to hold PID file
 
diff --git a/version.sh b/version.sh
index 5fc7418..a286017 100755
--- a/version.sh
+++ b/version.sh
@@ -1,10 +1,11 @@
 #!/bin/sh
 
-if git describe > version.num.tmp
+if git describe | sed s/-/_/g > version.num.tmp
 then
     mv version.num.tmp version.num
     echo "m4_define([VERSION_NUMBER], [`tr -d '\n' < version.num`])" \
         > version.m4
+    sed s/@VERSION@/`cat version.num`/ < memcached.spec.in > memcached.spec
 else
     rm version.num.tmp
 fi