From dec52ea6a2b6885b3021c8ccdfcc30ff8b6fcb76 Mon Sep 17 00:00:00 2001
From: Freddie Akeroyd <freddie.akeroyd@stfc.ac.uk>
Date: Fri, 17 Apr 2009 14:53:10 +0000
Subject: [PATCH] Add SVN revision to rpm name. Refs #529.
---
Code/RPM_Kit/make_rpm.sh | 4 +++-
Code/RPM_Kit/mantid.spec.template | 6 ++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/Code/RPM_Kit/make_rpm.sh b/Code/RPM_Kit/make_rpm.sh
index e2e974035fa..8e3b99dde4e 100755
--- a/Code/RPM_Kit/make_rpm.sh
+++ b/Code/RPM_Kit/make_rpm.sh
@@ -38,7 +38,9 @@ done
shift $(($OPTIND - 1))
#
mantid_version="1.0"
-mantid_release="0.`date +%Y%m%d`svn"
+svn_version=`svnversion --no-newline`
+#mantid_release="0.`date +%Y%m%d`svnR$svn_version"
+mantid_release="0.svnR${svn_version}.`date +%Y%m%d`"
#
mantid_svn="http://svn.mantidproject.org/mantid/trunk"
rm -f Mantid-$mantid_version.tar.gz
diff --git a/Code/RPM_Kit/mantid.spec.template b/Code/RPM_Kit/mantid.spec.template
index e42a978e479..41f974d6245 100644
--- a/Code/RPM_Kit/mantid.spec.template
+++ b/Code/RPM_Kit/mantid.spec.template
@@ -1,3 +1,9 @@
+# not used yet
+%define is_mandrake %(test -e /etc/mandrake-release && echo 1 || echo 0)
+%define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0)
+%define is_fedora %(test -e /etc/fedora-release && echo 1 || echo 0)
+%define is_rhel %(test -e /etc/redhat-release && echo 1 || echo 0)
+
Name: Mantid
Summary: Data Analysis For ISIS
Version: MANTID_VERSION
--
GitLab