From cace4cc8b2096b91487be0e8f14a588e4fa7cb0b Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 26 Aug 2019 11:49:09 -0400 Subject: [PATCH] Fix some minor rpmlint complaints Signed-off-by: Peter Jones --- gnu-efi.patches | 4 ++-- gnu-efi.spec | 23 +++++++++++++---------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/gnu-efi.patches b/gnu-efi.patches index 570e3cf..23cf567 100644 --- a/gnu-efi.patches +++ b/gnu-efi.patches @@ -13,5 +13,5 @@ Patch0012: 0012-Make-travis-build-the-right-project.patch Patch0013: 0013-Use-EFI-canonical-names-everywhere-the-compiler-does.patch Patch0014: 0014-Fix-a-minor-coverity-complaint-in-some-apps.patch Patch0015: 0015-Get-rid-of-some-unused-junk-that-has-the-BSD-4-claus.patch -Patch0017: 0016-Make-CHAR8-and-similar-be-defined-the-same-way-edk2-.patch -Patch0018: 0017-CFLAGS-add-Wno-pointer-sign.patch +Patch0016: 0016-Make-CHAR8-and-similar-be-defined-the-same-way-edk2-.patch +Patch0017: 0017-CFLAGS-add-Wno-pointer-sign.patch diff --git a/gnu-efi.spec b/gnu-efi.spec index 7b74f24..5aaa284 100644 --- a/gnu-efi.spec +++ b/gnu-efi.spec @@ -2,7 +2,7 @@ Name: gnu-efi Epoch: 1 Version: 3.0.9 %global tarball_version 3.0.9 -Release: 3%{?dist}%{?buildid} +Release: 4%{?dist}%{?buildid} Summary: Development Libraries and headers for EFI License: BSD URL: https://sourceforge.net/projects/gnu-efi/ @@ -80,8 +80,8 @@ git config --unset user.name make make apps %if %{efi_has_alt_arch} - setarch linux32 -B make ARCH=%{efi_alt_arch} PREFIX=%{_prefix} LIBDIR=%{_prefix}/%{lib} - setarch linux32 -B make ARCH=%{efi_alt_arch} PREFIX=%{_prefix} LIBDIR=%{_prefix}/%{lib} apps + setarch linux32 -B make ARCH=%{efi_alt_arch} PREFIX=%{_prefix} LIBDIR=%{_prefix}/%{lib} + setarch linux32 -B make ARCH=%{efi_alt_arch} PREFIX=%{_prefix} LIBDIR=%{_prefix}/%{lib} apps %endif %install @@ -92,12 +92,12 @@ mv %{buildroot}/%{_libdir}/*.lds %{buildroot}/%{_libdir}/*.o %{buildroot}/%{_lib mv %{efi_arch}/apps/{route80h.efi,modelist.efi} %{buildroot}%{efi_esp_dir}/%{efi_arch}/ %if %{efi_has_alt_arch} - mkdir -p %{buildroot}/%{_prefix}/%{lib}/gnuefi - mkdir -p %{buildroot}%{efi_esp_dir}/%{efi_alt_arch} + mkdir -p %{buildroot}/%{_prefix}/%{lib}/gnuefi + mkdir -p %{buildroot}%{efi_esp_dir}/%{efi_alt_arch} - setarch linux32 -B make PREFIX=%{_prefix} LIBDIR=%{_prefix}/%{lib} INSTALLROOT=%{buildroot} ARCH=%{efi_alt_arch} install - mv %{buildroot}/%{_prefix}/%{lib}/*.{lds,o} %{buildroot}/%{_prefix}/%{lib}/gnuefi/ - mv %{efi_alt_arch}/apps/{route80h.efi,modelist.efi} %{buildroot}%{efi_esp_dir}/%{efi_alt_arch}/ + setarch linux32 -B make PREFIX=%{_prefix} LIBDIR=%{_prefix}/%{lib} INSTALLROOT=%{buildroot} ARCH=%{efi_alt_arch} install + mv %{buildroot}/%{_prefix}/%{lib}/*.{lds,o} %{buildroot}/%{_prefix}/%{lib}/gnuefi/ + mv %{efi_alt_arch}/apps/{route80h.efi,modelist.efi} %{buildroot}%{efi_esp_dir}/%{efi_alt_arch}/ %endif cd %{buildroot}/%{_libdir}/gnuefi/ if [[ -f crt0-efi-x64.o ]] ; then @@ -127,11 +127,14 @@ fi %dir %attr(0700,root,root) %{efi_esp_dir}/%{efi_arch}/ %attr(0700,root,root) %{efi_esp_dir}/%{efi_arch}/*.efi %if %{efi_has_alt_arch} - %dir %attr(0700,root,root) %{efi_esp_dir}/%{efi_alt_arch}/ - %attr(0700,root,root) %{efi_esp_dir}/%{efi_alt_arch}/*.efi + %dir %attr(0700,root,root) %{efi_esp_dir}/%{efi_alt_arch}/ + %attr(0700,root,root) %{efi_esp_dir}/%{efi_alt_arch}/*.efi %endif %changelog +* Tue Jan 21 2020 Peter Jones - 3.0.9-4 +- Fix some minor rpmlint complaints + * Tue Jan 21 2020 Peter Robinson - Minor spec cleanups