Merge branch 'release-2.1.4'

CHANGELOG

@@ -1,5 +1,7 @@
 Changelog for ssm
 =================
+ * Fri Aug 08 2014 Adrian Coveney <[email protected]> - 2.1.4-1
+ - Corrected version number used in Python code.
 
  * Mon Jul 21 2014 Adrian Coveney <[email protected]> - 2.1.3-1
  - (No changes from pre-release version.)

apel-ssm.spec

@@ -4,15 +4,15 @@
 %endif
 
 Name:           apel-ssm
-Version:        2.1.3
-Release:        1%{?dist}
+Version:        2.1.4
+%define releasenumber 1
+Release:        %{releasenumber}%{?dist}
 Summary:        Secure stomp messenger
 
 Group:          Development/Languages
 License:        ASL 2.0
 URL:            https://wiki.egi.eu/wiki/APEL/SSM
-# Value between %{version} and extension must match "Release" without %{dist}
-Source0:        %{name}-%{version}-1.tar.gz
+Source:         %{name}-%{version}-%{releasenumber}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -30,8 +30,7 @@ can act as either a sender or receiver.
 The SSM is written in python.
 
 %prep
-# Value after %{version} must match "Release" without %{dist}
-%setup -q -n %{name}-%{version}-1
+%setup -q -n %{name}-%{version}-%{releasenumber}
 
 %build
 
@@ -93,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %_defaultdocdir/%{name}
 
 %changelog
+ * Fri Aug 08 2014 Adrian Coveney <[email protected]> - 2.1.4-1
+ - Corrected version number used in Python code.
+
  * Mon Jul 21 2014 Adrian Coveney <[email protected]> - 2.1.3-1
  - (No changes from pre-release version.)
 

ssm/__init__.py

@@ -19,7 +19,7 @@
 import logging
 import sys
 
-__version__ = (2, 1, 3)
+__version__ = (2, 1, 4)
 
 LOG_BREAK = '========================================'