Vinzenz Feenstra has uploaded a new change for review. Change subject: Release simplifications ......................................................................
Release simplifications Change-Id: I592afa87c1270f5e360f0b93a81fa47d67ff0909 Signed-off-by: Vinzenz Feenstra <[email protected]> --- M Makefile.am M configure.ac R ovirt-guest-agent.rhel6.spec.in R ovirt-guest-agent.spec.in 4 files changed, 19 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-guest-agent refs/changes/69/32369/1 diff --git a/Makefile.am b/Makefile.am index afb266f..e686db2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,15 +32,16 @@ MAINTAINERCLEANFILES = \ config.h.in \ - Makefile.in + Makefile.in \ + $(NULL) -EXTRA_DIST= \ - AUTHORS \ - README_Fedora.txt \ - ovirt-guest-agent.spec \ - ovirt-guest-agent.rhel6.spec\ - m4/fhs.m4 \ - debian \ +EXTRA_DIST= \ + AUTHORS \ + README_Fedora.txt \ + ovirt-guest-agent.spec.in \ + ovirt-guest-agent.rhel6.spec.in \ + m4/fhs.m4 \ + debian \ $(NULL) # When fixing a file to conform with pep8 add it to the WL here so it will be diff --git a/configure.ac b/configure.ac index 6f465be..cffbef4 100644 --- a/configure.ac +++ b/configure.ac @@ -2,8 +2,11 @@ AC_PREREQ([2.63]) AC_INIT([ovirt-guest-agent], - [1.0.10], + [m4_esyscmd([echo -n `git describe --tags | cut -d- -f1`])], [http://bugzilla.redhat.com]) + +AC_SUBST([PACKAGE_RELEASE], + [m4_esyscmd([echo -n `git describe --tags | cut -d- -f2`])]) AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2 -Wall]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -234,6 +237,8 @@ ovirt-guest-agent/ovirt-guest-agent ovirt-guest-agent/consoleapps/Makefile ovirt-guest-agent/pam/Makefile + ovirt-guest-agent.rhel6.spec + ovirt-guest-agent.spec scripts/Makefile scripts/diskmapper/Makefile scripts/wrappers/Makefile diff --git a/ovirt-guest-agent.rhel6.spec b/ovirt-guest-agent.rhel6.spec.in similarity index 98% rename from ovirt-guest-agent.rhel6.spec rename to ovirt-guest-agent.rhel6.spec.in index 936eca6..4ef4864 100644 --- a/ovirt-guest-agent.rhel6.spec +++ b/ovirt-guest-agent.rhel6.spec.in @@ -1,8 +1,8 @@ -%global release_version 1 +%global release_version @PACKAGE_RELEASE@ Name: ovirt-guest-agent -Version: 1.0.10 +Version: @PACAKAGE_VERSION@ Release: %{release_version}%{?dist} Summary: The oVirt Guest Agent Group: Applications/System diff --git a/ovirt-guest-agent.spec b/ovirt-guest-agent.spec.in similarity index 99% rename from ovirt-guest-agent.spec rename to ovirt-guest-agent.spec.in index 724faf9..e5e4da3 100644 --- a/ovirt-guest-agent.spec +++ b/ovirt-guest-agent.spec.in @@ -1,11 +1,11 @@ -%global release_version 1 +%global release_version @PACKAGE_RELEASE@ %global _moduledir /%{_lib}/security %global _kdmrc /etc/kde/kdm/kdmrc Name: ovirt-guest-agent -Version: 1.0.10 +Version: @PACKAGE_VERSION@ Release: %{release_version}%{?dist} Summary: The oVirt Guest Agent Group: Applications/System -- To view, visit http://gerrit.ovirt.org/32369 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I592afa87c1270f5e360f0b93a81fa47d67ff0909 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-guest-agent Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
