File tree Expand file tree Collapse file tree 3 files changed +8
-7
lines changed
Expand file tree Collapse file tree 3 files changed +8
-7
lines changed Original file line number Diff line number Diff line change @@ -13,9 +13,9 @@ git_cfg_safe:
1313 git config --global --add safe.directory " $( shell pwd) "
1414
1515srpm : installdeps git_cfg_safe
16- # $(eval SUFFIX=$(shell sh -c " echo '.$$(date -u +%Y%m%d%H%M%S).git$$(git rev-parse --short HEAD)'"))
16+ $(eval SUFFIX=$(shell sh -c " echo '.$$(date -u +%Y%m%d%H%M%S ) .git$$(git rev-parse --short HEAD ) '") )
1717 # changing the spec file as passing -D won't preserve the suffix when rebuilding in mock
18- # sed "s:%{?release_suffix}:${SUFFIX}:" -i *.spec.in
18+ sed " s:%{?release_suffix}:${SUFFIX} :" -i * .spec.in
1919 mkdir -p tmp.repos/SOURCES
2020 autopoint
2121 autoreconf -ivf
Original file line number Diff line number Diff line change @@ -16,6 +16,7 @@ dnf builddep -y ovirt-hosted-engine-setup.spec
1616
1717rpmbuild \
1818 -D " _topdir $PWD /tmp.repos" \
19+ -D " release_suffix ${SUFFIX} " \
1920 -ta ovirt-hosted-engine-setup-* .tar.gz
2021
2122mv ./* .tar.gz exported-artifacts
Original file line number Diff line number Diff line change @@ -20,19 +20,19 @@ AC_PREREQ(2.60)
2020
2121define ( [ VERSION_MAJOR] , [ 2] )
2222define ( [ VERSION_MINOR] , [ 7] )
23- define ( [ VERSION_FIX] , [ 2 ] )
23+ define ( [ VERSION_FIX] , [ 3 ] )
2424define ( [ VERSION_NUMBER] , VERSION_MAJOR [ .] VERSION_MINOR [ .] VERSION_FIX )
25- define ( [ VERSION_RELEASE] , [ 1 ] )
26- define ( [ VERSION_SUFFIX] , [ ] )
25+ define ( [ VERSION_RELEASE] , [ 0.0 ] )
26+ define ( [ VERSION_SUFFIX] , [ master ] )
2727
2828AC_INIT (
2929 [ ovirt-hosted-engine-setup] ,
30- [ VERSION_NUMBER] ,
30+ [ VERSION_NUMBER[ - ] VERSION_RELEASE [ . ] VERSION_SUFFIX ] ,
3131 [ devel@ovirt.org] ,
3232 [ ] ,
3333 [ http://www.ovirt.org] )
3434PACKAGE_RPM_VERSION="VERSION_NUMBER"
35- PACKAGE_RPM_RELEASE="VERSION_RELEASE"
35+ PACKAGE_RPM_RELEASE="VERSION_RELEASE.VERSION_SUFFIX "
3636AC_SUBST ( [ PACKAGE_RPM_VERSION] )
3737AC_SUBST ( [ PACKAGE_RPM_RELEASE] )
3838
You can’t perform that action at this time.
0 commit comments