[Spice-devel] [vdagent-win PATCH] Do not use dash in rpm version

[Christophe de Dinechin]

> On 26 Jul 2017, at 17:03, Frediano Ziglio <fziglio at redhat.com> wrote:
> 
> RPM does not allow dash in version string.
> Remove everything after the dash (which should be the "dirty"
> git version).
> This make easier to run "make dist" followed by rpmbuild.
> 
> Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
> ---
> configure.ac                | 2 ++
> mingw-spice-vdagent.spec.in | 6 +++---
> 2 files changed, 5 insertions(+), 3 deletions(-)
> 
> Maybe I should use sed 's,-,.,g' to just replace
> all dashes with dots ?

Yes, I think it is better to not remove the ‘dirty’ from the name.

You can use _ as Pavel suggested too.

> 
> diff --git a/configure.ac b/configure.ac
> index bb33075..dc75c25 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -38,6 +38,8 @@ AC_DEFINE_UNQUOTED([RC_PRODUCTVERSION_STR], "$RC_PRODUCTVERSION", [Resource prod
> AC_DEFINE_UNQUOTED([RC_PRODUCTVERSION], [$RC_PRODUCTVERSION], [Resource product version])
> BUILD_YEAR=`date +%Y`
> AC_DEFINE_UNQUOTED([BUILD_YEAR], "$BUILD_YEAR", [Build year])
> +RPM_VERSION=`echo $PACKAGE_VERSION | sed 's,-.*,,’`



> +AC_SUBST([RPM_VERSION])
> 
> # Check for programs
> AC_PROG_CC
> diff --git a/mingw-spice-vdagent.spec.in b/mingw-spice-vdagent.spec.in
> index d25ea31..d129a7b 100644
> --- a/mingw-spice-vdagent.spec.in
> +++ b/mingw-spice-vdagent.spec.in
> @@ -16,13 +16,13 @@
> %endif
> 
> Name:           mingw-spice-vdagent
> -Version:        @VERSION@
> +Version:        @RPM_VERSION@
> Release:        1%{?dist}%{?extra_release}
> Summary:        MinGW Windows SPICE guest agent
> 
> License:        GPLv2+
> URL:            https://www.spice-space.org/
> -Source0:        vdagent-win-%{version}%{?_version_suffix}.tar.xz
> +Source0:        vdagent-win- at VERSION@%{?_version_suffix}.tar.xz
> 
> BuildRequires:  mingw32-filesystem >= 23
> BuildRequires:  mingw64-filesystem >= 23
> @@ -84,7 +84,7 @@ Features:
>   session and the client
> 
> %prep
> -%setup -q -n vdagent-win-%{version}%{?_version_suffix}
> +%setup -q -n vdagent-win- at VERSION@%{?_version_suffix}
> 
> %{mingw_debug_package}
> 
> -- 
> 2.13.3
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel