From bdc68654105f93f2bffca1263da089a56884975c Mon Sep 17 00:00:00 2001 From: Sandro Bonazzola Date: Tue, 28 Nov 2023 15:32:06 +0100 Subject: [PATCH] Post 1.7.3 release Signed-off-by: Sandro Bonazzola --- .automation/build-srpm.sh | 2 +- .copr/Makefile | 4 ++-- configure.ac | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.automation/build-srpm.sh b/.automation/build-srpm.sh index cd2270c..4d88d65 100755 --- a/.automation/build-srpm.sh +++ b/.automation/build-srpm.sh @@ -17,7 +17,7 @@ make clean # build tarballs make dist -# SUFFIX=".$(date -u +%Y%m%d%H%M%S).git$(git rev-parse --short HEAD)" +SUFFIX=".$(date -u +%Y%m%d%H%M%S).git$(git rev-parse --short HEAD)" # Build SRPMs rpmbuild \ diff --git a/.copr/Makefile b/.copr/Makefile index 89eff4d..8cb809a 100644 --- a/.copr/Makefile +++ b/.copr/Makefile @@ -29,8 +29,8 @@ git-safe: git config --global --add safe.directory "$(shell pwd)" srpm: installdeps git-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 vdsm-jsonrpc-java.spec.in + sed "s:%{?release_suffix}:${SUFFIX}:" -i vdsm-jsonrpc-java.spec.in .automation/build-srpm.sh cp rpmbuild/SRPMS/$(shell sh -c "basename '$(spec)'|cut -f1 -d.")*.src.rpm $(outdir) diff --git a/configure.ac b/configure.ac index 9d7a316..c835e32 100644 --- a/configure.ac +++ b/configure.ac @@ -21,13 +21,13 @@ AC_PREREQ(2.60) define([VERSION_MAJOR], [1]) define([VERSION_MINOR], [7]) -define([VERSION_FIX], [3]) +define([VERSION_FIX], [4]) define([VERSION_NUMBER], VERSION_MAJOR[.]VERSION_MINOR[.]VERSION_FIX) define([VERSION_SUFFIX], []) AC_INIT([vdsm-jsonrpc-java], VERSION_NUMBER[]VERSION_SUFFIX) PACKAGE_RPM_VERSION="VERSION_NUMBER" -PACKAGE_RPM_RELEASE="1" +PACKAGE_RPM_RELEASE="0" PACKAGE_MAVEN_VERSION="VERSION_MAJOR.VERSION_MINOR.VERSION_FIX" AC_SUBST([PACKAGE_RPM_VERSION]) AC_SUBST([PACKAGE_RPM_RELEASE])