updated 3 packages

efi-rpm-macros-4-4

efibootmgr-16-1

efivar-37-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12214 ec354946-7b23-47d6-9f5a-488ba84defc7

e/efi-rpm-macros/efi-rpm-macros-vl.spec

@@ -0,0 +1,128 @@
+%{!?_rpmmacrodir:%global _rpmmacrodir %{_sysconfdir}/rpm}
+
+Summary:        Common RPM Macros for building EFI-related packages
+Name:           efi-rpm-macros
+Version:        4
+Release:        4%{?_dist_release}
+License:        GPLv3+
+URL:            https://github.com/rhboot/%{name}/
+BuildRequires:  git sed
+BuildArch:      noarch
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
+Packager:       tomop
+
+Source0:        https://github.com/rhboot/%{name}/releases/download/%{version}/%{name}-%{version}.tar.bz2
+
+%global debug_package %{nil}
+%global _efi_vendor_ %(eval echo $(sed -n -e 's/\"//g' -e 's/^ID=//p' /etc/os-release))
+
+%description
+%{name} provides a set of RPM macros for use in EFI-related packages.
+
+%package -n efi-srpm-macros
+Summary: Common SRPM Macros for building EFI-related packages
+BuildArch: noarch
+Requires: rpm
+
+%description -n efi-srpm-macros
+efi-srpm-macros provides a set of SRPM macros for use in EFI-related packages.
+
+%package -n efi-filesystem
+Summary: The basic directory layout for EFI machines
+BuildArch: noarch
+Requires: filesystem
+
+%description -n efi-filesystem
+The efi-filesystem package contains the basic directory layout for EFI
+machine bootloaders and tools.
+
+%prep
+%autosetup -S git -n %{name}-%{version}
+
+%global rpmbin %(bash -c "command -v rpm")
+sed -i \
+  -e 's|^RPM =.*$|RPM = "%{rpmbin}"|' \
+  -e 's|^MACRODIR =.*$|MACRODIR = "%{_rpmmacrodir}"|' \
+  Makefile
+
+git config --local --add efi.vendor "%{_efi_vendor_}"
+git config --local --add efi.esp-root /boot/efi
+git config --local --add efi.arches "x86_64 aarch64 %{arm} %{ix86}"
+
+%build
+%make_build clean all
+
+%install
+%make_install
+
+#%%files
+#%%{!?_licensedir:%%global license %%%%doc}
+#%%license LICENSE
+#%%doc README
+#%%{_rpmmacrodir}/macros.efi
+
+%files -n efi-srpm-macros
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
+%doc README
+%{_rpmmacrodir}/macros.efi-srpm
+%{_rpmconfigdir}/brp-boot-efi-times
+
+%files -n efi-filesystem
+%defattr(0700,root,root,-)
+%dir /boot/efi
+%dir /boot/efi/EFI
+%dir /boot/efi/EFI/BOOT
+%dir /boot/efi/EFI/%{_efi_vendor_}
+
+%changelog
+* Thu Sep 12 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 4-4
+- initial build for Vine Linux.
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Sep 26 2018 Peter Jones <pjones@redhat.com> - 4-1
+- Provide %%{efi_build_requires} and brp-boot-efi-times
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri May 04 2018 Peter Jones <pjones@redhat.com> - 3-2
+- Always provide macros for efi_arch and efi_alt_arch (and their _upper
+  variants), and make efi_has_arch and efi_has_alt_arch 0 when they will be
+  wrong.  This ensures everything can always expand when we're on a non-efi
+  architecture.
+
+* Fri May 04 2018 Peter Jones <pjones@redhat.com> - 3-1
+- Update to version 3 to try and un-break rawhide composes due to
+  ExclusiveArch constraints.
+
+* Thu May 03 2018 Peter Jones <pjones@redhat.com> - 2-6
+- Rework the macros for better srpm use.
+
+* Wed May 02 2018 Peter Jones <pjones@redhat.com> - 2-5
+- Add efi-filesystem subpackage
+
+* Wed May 02 2018 Peter Jones <pjones@redhat.com> - 2-4
+- Add %%{efi_has_alt_arch}
+
+* Tue May 01 2018 Peter Jones <pjones@redhat.com> - 2-3
+- Make an efi-srpm-macros subpackage to pull in so %%{efi} works in
+  ExclusiveArch in koji.
+
+* Tue May 01 2018 Peter Jones <pjones@redhat.com> - 2-2
+- Fix the non-efi and non-efi-alt-arch cases, hopefully.
+- Make efi-*-macros packages not be ExclusiveArch, because they need to work
+  in non-efi-arch packages.
+
+* Tue May 01 2018 Peter Jones <pjones@redhat.com> - 2-1
+- Lots of rpmlint fixups and the like.
+
+* Mon Apr 30 2018 Peter Jones <pjones@redhat.com> - 1-1
+- First shot at building it.

e/efibootmgr/efibootmgr-vl.spec

@@ -1,16 +1,23 @@
+%global build_ldflags %{nil}
+
 Summary: EFI Boot Manager
 Name: efibootmgr
-Version: 0.12
-Release: 3%{?_dist_release}
+Version: 16
+Release: 1%{?_dist_release}
 Group: System Environment/Base
 License: GPLv2+
-URL: http://github.com/rhinstaller/%{name}/
-BuildRequires: efivar-libs >= 0.19 , efivar-devel >= 0.19
+URL: https://github.com/rhboot/efibootmgr/
+BuildRequires: git popt-devel
+BuildRequires: efivar-libs >= 37
+BuildRequires: efivar-devel >= 37
+BuildRequires: efi-srpm-macros >= 3-2
+BuildRequires: efi-filesystem
+Requires: efi-filesystem
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXXXX)
 # EFI/UEFI don't exist on PPC
 ExclusiveArch: %{ix86} x86_64 aarch64
 
-Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
+Source0: https://github.com/rhboot/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -23,29 +30,32 @@ information about EFI can be found at
 http://developer.intel.com/technology/efi/efi.htm and http://uefi.org/.
 
 %prep
-%setup -q
+%autosetup -S git
+git config --local --add efibootmgr.efidir %{efi_vendor}
 
 %build
-make %{?_smp_mflags} EXTRA_CFLAGS='%{optflags}'
+%make_build CFLAGS='%{optflags}' LDFLAGS='%{build_ldflags}'
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_sbindir} %{buildroot}%{_mandir}/man8
-install -p --mode 755 src/%{name}/%{name} %{buildroot}%{_sbindir}
-gzip -9 -c src/man/man8/%{name}.8 > src/man/man8/%{name}.8.gz
-touch -r src/man/man8/%{name}.8 src/man/man8/%{name}.8.gz
-install -p --mode 644 src/man/man8/%{name}.8.gz %{buildroot}%{_mandir}/man8
+%make_install libdir=%{_libdir} bindir=%{_bindir} mandir=%{_mandir} \
+              localedir=%{_datadir}/locale/ includedir=%{_includedir} \
+              libexecdir=%{_libexecdir} datadir=%{_datadir}
 
 %clean
 rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root,-)
-%{_sbindir}/%{name}
-%{_mandir}/man8/%{name}.8.gz
-%doc README INSTALL COPYING
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%{_sbindir}/*
+%{_mandir}/*/*.?.gz
+%doc README
     
 %changelog
+* Sat Sep 14 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 16-1
+- new upstream release.
+
 * Tue Dec 15 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.12-3
 - initial build for Vine Linux.
 

e/efivar/efivar-vl.spec

@@ -1,6 +1,6 @@
 Name:           efivar
-Version:        0.21
-Release:        3%{?_dist_release}
+Version:        37
+Release:        1%{?_dist_release}
 Summary:        Tools to manage UEFI variables
 License:        LGPLv2.1
 URL:            https://github.com/rhinstaller/efivar
@@ -10,12 +10,9 @@ ExclusiveArch:	%{ix86} x86_64 aarch64
 BuildRequires:  popt-devel
 Source0:        https://github.com/rhinstaller/efivar/releases/download/efivar-%{version}/efivar-%{version}.tar.bz2
 
-# https://github.com/rhinstaller/efivar/commit/a3606c02fd271d32e364fcc540e34ba1899309f6
-Patch0:         a3606c02fd271d32e364fcc540e34ba1899309f6.patch
-
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: tomop
+Vendor:         Project Vine
+Distribution:   Vine Linux
+Packager:       tomop
 
 %description
 efivar provides a simple command line interface to the UEFI variable facility.
@@ -35,7 +32,6 @@ development headers required to use libefivar.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .ifrn
 
 %build
 make libdir=%{_libdir} bindir=%{_bindir} OPT_FLAGS="$RPM_OPT_FLAGS"
@@ -70,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so.*
 
 %changelog
+* Sat Sep 14 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 37-1
+- dropped Patch0.
+
 * Tue Dec 15 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.21-3
 - initial build for Vine Linux.
 - added Patch0.