[virt-tools-list] [virt-viewer] build-sys: Always prepend '-' to build id

Christophe Fergeau cfergeau at redhat.com
Wed Apr 2 11:53:37 UTC 2014

When using the --with-buildid configure paramater, the build id which is
substituted in the MSI wxs file is automatically prepended by a '-', but
the build id which is used in the C files does not get this '-'

Currently, the linux and mingw spec files prepend a '-' on their own to the
--with-buildid argument, but this causes the MSI installer to show 2 '-'
during installation: "Please wait while Windows configures VirtViewer

This commit always prepends a '-' to the buildid strings, and removes the
'-' from the spec files. This is to ensure the separator between version
number and buildid is not forgotten, which could give a confusing version
 configure.ac              | 2 +-
 mingw-virt-viewer.spec.in | 2 +-
 virt-viewer.spec.in       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7a00bf4..c553dae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -212,7 +212,7 @@ fi
     AS_HELP_STRING([--with-buildid=id], [Set additional build version details]))
-AC_DEFINE_UNQUOTED([BUILDID], "$with_buildid", [Build version details])
+AC_DEFINE_UNQUOTED([BUILDID], "-$with_buildid", [Build version details])
 if test "x$with_buildid" != x; then
     AC_SUBST([BUILDID], "-$with_buildid")
diff --git a/mingw-virt-viewer.spec.in b/mingw-virt-viewer.spec.in
index 44d9230..fb1c9fd 100644
--- a/mingw-virt-viewer.spec.in
+++ b/mingw-virt-viewer.spec.in
@@ -85,7 +85,7 @@ MinGW Windows virt-viewer MSI
-%mingw_configure --with-gtk=2.0 --with-buildid=-%{release}
+%mingw_configure --with-gtk=2.0 --with-buildid=%{release}
 %mingw_make %{?_smp_mflags} V=1
 %mingw_make %{?_smp_mflags} V=1 -C data msi
diff --git a/virt-viewer.spec.in b/virt-viewer.spec.in
index 6b2d86b..b3b6b5e 100644
--- a/virt-viewer.spec.in
+++ b/virt-viewer.spec.in
@@ -104,7 +104,7 @@ autoreconf -if
 %define govirt_arg --with-ovirt
-%configure %{spice_arg} %{gtk_arg} %{govirt_arg} --with-buildid=-%{release} --disable-update-mimedb
+%configure %{spice_arg} %{gtk_arg} %{govirt_arg} --with-buildid=%{release} --disable-update-mimedb
 %__make %{?_smp_mflags}

More information about the virt-tools-list mailing list