Alon Bar-Lev has uploaded a new change for review.
Change subject: packaging: use place holders for version/release
......................................................................
packaging: use place holders for version/release
Currently Makefile substitutes complete lines within spec in order to
inject version information.
The hard coded version information within the spec is misleading.
Modify process to use substitute variables to ease maintenance.
Change-Id: I4904106bb6f0f20f289ad13b21db29bcf3cd28d8
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M Makefile
M packaging/fedora/spec/ovirt-engine.spec.in
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/69/7369/1
diff --git a/Makefile b/Makefile
index c9b3b39..14845aa 100644
--- a/Makefile
+++ b/Makefile
@@ -146,8 +146,8 @@
install_service
tarball:
- sed -e 's/^Version:.*/Version: $(RPM_VERSION)/' \
- -e 's/^Release:.*/Release: $(RPM_RELEASE_VERSION)%{?dist}/'
$(SPEC_FILE_IN) > $(SPEC_FILE)
+ sed -e 's/@PACKAGE_VERSION@/$(RPM_VERSION)/g' \
+ -e 's/@PACKAGE_RELEASE@/$(RPM_RELEASE_VERSION)/g' $(SPEC_FILE_IN)
> $(SPEC_FILE)
tar zcf $(TARBALL) `git ls-files` $(SPEC_FILE)
rm -f $(SPEC_FILE)
@echo
diff --git a/packaging/fedora/spec/ovirt-engine.spec.in
b/packaging/fedora/spec/ovirt-engine.spec.in
index ec64842..276e5be 100644
--- a/packaging/fedora/spec/ovirt-engine.spec.in
+++ b/packaging/fedora/spec/ovirt-engine.spec.in
@@ -77,8 +77,8 @@
%{?EXTRA_BUILD_FLAGS:EXTRA_BUILD_FLAGS="%{EXTRA_BUILD_FLAGS}"}
Name: ovirt-engine
-Version: 3.1.0
-Release: 3%{?dist}
+Version: @PACKAGE_VERSION@
+Release: @PACKAGE_RELEASE@%{?dist}
Summary: Management server for Open Virtualization
Group: Virtualization/Management
License: ASL 2.0
--
To view, visit http://gerrit.ovirt.org/7369
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4904106bb6f0f20f289ad13b21db29bcf3cd28d8
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
