Merge #3610 Add year and day of year to RPM versions

KSP-CKAN · Jul 21, 2022 · 04f69ec · 04f69ec
2 parents 66c595b + d22d617
commit 04f69ec
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,7 +10,7 @@ All notable changes to this project will be documented in this file.
 
 ### Internal
 
-- [Build] Generate RPM repo for releases and under dev builds (#3605, #3609 by: HebaruSan)
+- [Build] Generate RPM repo for releases and under dev builds (#3605, #3609, #3610 by: HebaruSan)
 
 ## v1.31.0 (IKAROS)
 

diff --git a/rpm/Makefile b/rpm/Makefile
@@ -12,7 +12,7 @@ ICONSRC:=$(DEBDIR)/ckan.ico
 CONFIGURATION?=Release
 EXESRC:=$(shell pwd)/../_build/repack/$(CONFIGURATION)/ckan.exe
 CHANGELOGSRC:=../CHANGELOG.md
-VERSION:=$(shell egrep '^\s*\#\#\s+v.*$$' $(CHANGELOGSRC) | head -1 | sed -e 's/^\s*\#\#\s\+v//' -e 's/-/_/g' )
+VERSION:=$(shell egrep '^\s*\#\#\s+v.*$$' $(CHANGELOGSRC) | head -1 | sed -e 's/^\s*\#\#\s\+v//' -e 's/-/_/g' ).$(shell date +'%g%j')
 RPM:=$(TOPDIR)/RPMS/noarch/ckan-$(VERSION)-1.noarch.rpm
 
 CREATEREPO:=$(if $(shell which createrepo),createrepo,createrepo_c)