ACK: [PATCH 1/4] fedora: Fix location of klog.json file in fwts.spec

Alex Hung alex.hung at canonical.com
Mon Jan 23 07:13:25 UTC 2017


On 2017-01-20 04:15 AM, Prarit Bhargava wrote:
> Running 'fwts klog' results in
>
> Cannot read file /usr/local/share/fwts/klog.json
>
> because the file has been incorrectly installed in
> /usr/local/share/klog.json.  I have changed the fedora rpm spec file to
> move the file to the correct location.
>
> v2: fix changelog
>
> Signed-off-by: Prarit Bhargava <prarit at redhat.com>
> ---
>  fedora/fwts.spec |    7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/fedora/fwts.spec b/fedora/fwts.spec
> index 3d6011c461a1..fc5bcea3e60a 100644
> --- a/fedora/fwts.spec
> +++ b/fedora/fwts.spec
> @@ -55,13 +55,13 @@ install -m 755 live-image/fwts-frontend-text $RPM_BUILD_ROOT/%{_bindir}
>  install -m 755 scripts/fwts-collect $RPM_BUILD_ROOT/%{_bindir}
>
>  install -m 644 live-image/fwts-live-dialogrc $RPM_BUILD_ROOT/%{_datarootdir}/fwts
> -install -m 644 data/klog.json $RPM_BUILD_ROOT/%{_datarootdir}/fwts
>  install -m 777 src/lib/src/.libs/libfwts.so.* $RPM_BUILD_ROOT/%{_lib}
>  install -m 777 src/acpica/.libs/libfwtsacpica.so* $RPM_BUILD_ROOT/%{_lib}
>  install -m 777 src/acpica/source/compiler/.libs/libfwtsiasl.so* $RPM_BUILD_ROOT/%{_lib}
>  install -m 644 doc/fwts-frontend-text.1 $RPM_BUILD_ROOT/%{_mandir}/man1
>  install -m 644 doc/fwts.1 $RPM_BUILD_ROOT/%{_mandir}/man1
>  install -m 644 doc/fwts-collect.1 $RPM_BUILD_ROOT/%{_mandir}/man1
> +install -m 644 data/klog.json $RPM_BUILD_ROOT/usr/local/share/fwts
>  install -m 644 data/syntaxcheck.json $RPM_BUILD_ROOT/usr/local/share/fwts
>
>  %clean
> @@ -73,9 +73,12 @@ install -m 644 data/syntaxcheck.json $RPM_BUILD_ROOT/usr/local/share/fwts
>  %{_datarootdir}/fwts
>  /%{_lib}/*
>  %{_mandir}/*/*
> -/usr/local/share/fwts/syntaxcheck.json
> +/usr/local/share/fwts/*
>
>  %changelog
> +* Tue Jan 17 2017 Prarit Bhargava <prarit at redhat.com> 16.12.00
> +- fix location of klog.json
> +
>  * Thu Jan 12 2017 Prarit Bhargava <prarit at redhat.com> 16.12.00
>  - initial specfile creation
>  - sync to stable V16.12.00
>
Acked-by: Alex Hung <alex.hung at canonical.com>



More information about the fwts-devel mailing list