Release of version 4.0.0

cea-hpc · Oct 16, 2017 · 1f06f22 · 1f06f22
1 parent a7dbbf2
commit 1f06f22
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -66,6 +66,10 @@ ifneq ($(MODULES_RELEASE_SUFFIX),)
 MODULES_LAST_RPM_RELEASE := $(subst .$(MODULES_RELEASE_SUFFIX),,$(MODULES_LAST_RPM_RELEASE))
 endif
 
+# use last release if we currently sat on tag
+ifeq ($(GIT_CURRENT_TAG),$(GIT_CURRENT_DESC))
+MODULES_RPM_RELEASE := $(MODULES_LAST_RPM_RELEASE)
+else
 MODULES_LAST_RPM_RELEASE_P1 := $(firstword $(subst ., ,$(MODULES_LAST_RPM_RELEASE)))
 MODULES_LAST_RPM_RELEASE_P2 := $(subst $(MODULES_LAST_RPM_RELEASE_P1).,,$(MODULES_LAST_RPM_RELEASE))
 
@@ -80,6 +84,7 @@ ifneq ($(MODULES_RELEASE_SUFFIX),)
 MODULES_RPM_RELEASE := $(MODULES_RPM_RELEASE).$(MODULES_RELEASE_SUFFIX)
 endif
 MODULES_RPM_RELEASE := $(MODULES_RPM_RELEASE)$(subst -,.,$(MODULES_BUILD))
+endif
 
 else
 # source version definitions shared across the Makefiles of this project

diff --git a/NEWS.rst b/NEWS.rst
@@ -7,7 +7,7 @@ This file describes changes in recent versions of Modules. It primarily
 documents those changes that are of interest to users and admins.
 
 
-Modules 4.0.0 (2017-XX-XX)
+Modules 4.0.0 (2017-10-16)
 --------------------------
 
 Starting with this release, modules-tcl has become Modules. The following

diff --git a/contrib/rpm/environment-modules.spec.in b/contrib/rpm/environment-modules.spec.in
@@ -207,6 +207,10 @@ fi
 
 
 %changelog
+* Mon Oct 16 2017 Xavier Delaruelle <xavier.delaruelle@cea.fr> - 4.0.0-1
+- Update to 4.0.0
+- Add Obsoletes/Provides rules for modules-tcl package
+
 * Tue Sep 26 2017 Xavier Delaruelle <xavier.delaruelle@cea.fr> - 4.0.0-0.2.beta
 - Integrate createmodule.sh and createmodule.py in distribution tarball