Post Release 2.7.1

Signed-off-by: Sandro Bonazzola <sandro.bonazzola@gmail.com>
oVirt · Nov 29, 2023 · dda363b · dda363b
1 parent 57c36b1
commit dda363b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/.copr/Makefile b/.copr/Makefile
@@ -13,9 +13,9 @@ git_cfg_safe:
 	git config --global --add safe.directory "$(shell pwd)"
 
 srpm: installdeps git_cfg_safe
-	# $(eval SUFFIX=$(shell sh -c " echo '.$$(date -u +%Y%m%d%H%M%S).git$$(git rev-parse --short HEAD)'"))
+	$(eval SUFFIX=$(shell sh -c " echo '.$$(date -u +%Y%m%d%H%M%S).git$$(git rev-parse --short HEAD)'"))
 	# changing the spec file as passing -D won't preserve the suffix when rebuilding in mock
-	# sed "s:%{?release_suffix}:${SUFFIX}:" -i *.spec.in
+	sed "s:%{?release_suffix}:${SUFFIX}:" -i *.spec.in
 	mkdir -p tmp.repos/SOURCES
 	autopoint
 	autoreconf -ivf

diff --git a/automation/build-artifacts.sh b/automation/build-artifacts.sh
@@ -16,6 +16,7 @@ dnf builddep -y ovirt-hosted-engine-setup.spec
 
 rpmbuild \
     -D "_topdir $PWD/tmp.repos" \
+    -D "release_suffix ${SUFFIX}" \
     -ta ovirt-hosted-engine-setup-*.tar.gz
 
 mv ./*.tar.gz exported-artifacts

diff --git a/configure.ac b/configure.ac
@@ -20,19 +20,19 @@ AC_PREREQ(2.60)
 
 define([VERSION_MAJOR], [2])
 define([VERSION_MINOR], [7])
-define([VERSION_FIX], [1])
+define([VERSION_FIX], [2])
 define([VERSION_NUMBER], VERSION_MAJOR[.]VERSION_MINOR[.]VERSION_FIX)
-define([VERSION_RELEASE], [1])
-define([VERSION_SUFFIX], [])
+define([VERSION_RELEASE], [0.0])
+define([VERSION_SUFFIX], [master])
 
 AC_INIT(
     [ovirt-hosted-engine-setup],
-    [VERSION_NUMBER],
+    [VERSION_NUMBER[-]VERSION_RELEASE[.]VERSION_SUFFIX],
     [devel@ovirt.org],
     [],
     [http://www.ovirt.org])
 PACKAGE_RPM_VERSION="VERSION_NUMBER"
-PACKAGE_RPM_RELEASE="VERSION_RELEASE"
+PACKAGE_RPM_RELEASE="VERSION_RELEASE.VERSION_SUFFIX"
 AC_SUBST([PACKAGE_RPM_VERSION])
 AC_SUBST([PACKAGE_RPM_RELEASE])
 

diff --git a/ovirt-hosted-engine-setup.spec.in b/ovirt-hosted-engine-setup.spec.in
@@ -168,6 +168,9 @@ print((
 ' > %{_sysconfdir}/ovirt-hosted-engine/virsh_auth.conf
 
 %changelog
+* Wed Nov 29 2023 Sandro Bonazzola <sandro.bonazzola@gmail.com> - 2.7.2-0.0.master
+- 2.7.2-0.0.master
+
 * Wed Nov 29 2023 Sandro Bonazzola <sandro.bonazzola@gmail.com> - 2.7.1-1
 - 2.7.1-1