ACK: [PATCH 3/4] fedora: Add fwts.spec.in

[Alex Hung]

On 2017-01-20 04:16 AM, Prarit Bhargava wrote:
> fwts.spec requires a manual update for the major, minor and subminor
> versions every release.  This can be avoided by dynamically updating the
> spec file every build.
>
> Add file fwts.spec.in, and remove the existing fwts.spec.
> fwts.spec.in uses __VERSION, __MAJOR, and __MINOR_SUBMINOR as version
> values.
>
> Signed-off-by: Prarit Bhargava <prarit at redhat.com>
> ---
>  fedora/{fwts.spec => fwts.spec.in} |   17 +++++++++--------
>  1 file changed, 9 insertions(+), 8 deletions(-)
>  rename fedora/{fwts.spec => fwts.spec.in} (86%)
>
> diff --git a/fedora/fwts.spec b/fedora/fwts.spec.in
> similarity index 86%
> rename from fedora/fwts.spec
> rename to fedora/fwts.spec.in
> index 9343b8ee701c..86dede39bd7c 100644
> --- a/fedora/fwts.spec
> +++ b/fedora/fwts.spec.in
> @@ -1,18 +1,16 @@
> -# Only these 4 values need to change for package version control
> -%global major 16
> -%global minor 12
> -%global subminor 00
> +# Only this value needs to change for package version control.  Note changing
> +# this value does not affect the changelog.
>  %global fedora_version 0
>
> -%global tarversion V%{major}.%{minor}.%{subminor}
> +%global tarversion {__VERSION}
>
>  Summary: Firmware Test Suite
>
>  Name:    fwts
> -Version: %{major}
> -Release: %{minor}.%{subminor}.%{fedora_version}%{?dist}
> +Version: {__MAJOR}
> +Release: {__MINOR_SUBMINOR}.%{fedora_version}%{?dist}
>  License: GPLv2, LGPL
> -Source0: http://fwts.ubuntu.com/release/fwts-%{tarversion}.tar.gz
> +Source0: http://fwts.ubuntu.com/release/fwts-V%{tarversion}.tar.gz
>  BuildRequires: acpica-tools glib-devel glib2-devel glib json-c-devel libtool automake autoconf dkms kernel-devel git bison flex
>
>  %description
> @@ -77,6 +75,9 @@ install -m 644 data/syntaxcheck.json $RPM_BUILD_ROOT/usr/local/share/fwts
>  /usr/local/share/fwts/*
>
>  %changelog
> +* Thu Jan 19 2017 Prarit Bhargava <prarit at redhat.com> {__VERSION}.0
> +- sync to stable V{__VERSION}
> +
>  * Thu Jan 19 2017 Prarit Bhargava <prarit at redhat.com> 16.12.00.0
>  - fix location of klog.json
>  - add fedora version to differentiate between fedora builds
>


Acked-by: Alex Hung <alex.hung at canonical.com>