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: I265574b32285c9596414d293a1e5b465cc223215
Signed-off-by: Alon Bar-Lev <alon.bar...@gmail.com>
---
M Makefile
M packaging/ovirt-engine-dwh.spec.in
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/71/7371/1

diff --git a/Makefile b/Makefile
index 822e193..c240d9a 100644
--- a/Makefile
+++ b/Makefile
@@ -95,8 +95,8 @@
        install_files
 
 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/ovirt-engine-dwh.spec.in 
b/packaging/ovirt-engine-dwh.spec.in
index 71c9da7..fc27f63 100644
--- a/packaging/ovirt-engine-dwh.spec.in
+++ b/packaging/ovirt-engine-dwh.spec.in
@@ -23,8 +23,8 @@
         %{?EXTRA_BUILD_FLAGS:EXTRA_BUILD_FLAGS="%{EXTRA_BUILD_FLAGS}"}
 
 Name: ovirt-engine-dwh
-Version: 3.1.0
-Release: 1%{?dist}
+Version: @PACKAGE_VERSION@
+Release: @PACKAGE_RELEASE@%{?dist}
 License: GPLv2
 Summary: %{product_name}
 Group: Virtualization/Management


--
To view, visit http://gerrit.ovirt.org/7371
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I265574b32285c9596414d293a1e5b465cc223215
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-dwh
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

Reply via email to