Hello community,
here is the log from the commit of package shim for openSUSE:Factory checked in
at 2019-02-20 14:06:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/shim (Old)
and /work/SRC/openSUSE:Factory/.shim.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "shim"
Wed Feb 20 14:06:40 2019 rev:73 rq:676274 version:15+git47
Changes:
--------
--- /work/SRC/openSUSE:Factory/shim/shim.changes 2019-02-02
21:44:40.532218525 +0100
+++ /work/SRC/openSUSE:Factory/.shim.new.28833/shim.changes 2019-02-20
14:06:45.147030781 +0100
@@ -1,0 +2,5 @@
+Thu Feb 14 17:03:00 UTC 2019 - r...@suse.com
+
+- Fix conditions for '/usr/share/efi'-move (FATE#326960)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ shim.spec ++++++
--- /var/tmp/diff_new_pack.diBfNJ/_old 2019-02-20 14:06:46.967030156 +0100
+++ /var/tmp/diff_new_pack.diBfNJ/_new 2019-02-20 14:06:46.971030156 +0100
@@ -24,11 +24,15 @@
%else
%define grubplatform %{_target_cpu}-efi
%endif
-%if 0%{?suse_version} > 1500
+%if %{defined sle_version} && 0%{?sle_version} <= 150000
+%define sysefidir /usr/lib64/efi
+%else
%define sysefibasedir %{_datadir}/efi
%define sysefidir %{sysefibasedir}/%{_target_cpu}
-%else
-%define sysefidir /usr/lib64/efi
+%if "%{grubplatform}" == "x86_64-efi" && 0%{?sle_version} < 160000
+# provide compatibility sym-link for residual kiwi, etc.
+%define shim_lib64_share_compat 1
+%endif
%endif
Name: shim
@@ -237,14 +241,11 @@
fpr=$(openssl x509 -sha1 -fingerprint -inform DER -noout -in $file | cut
-c 18- | cut -d ":" -f 1,2,3,4 | sed 's/://g')
install -m 644 $file %{buildroot}/%{_sysconfdir}/uefi/certs/${fpr}-shim.crt
done
-%if 0%{?suse_version} > 1500 && 0%{?suse_version} < 1600
-%ifarch x86_64
-if [ "%{sysefidir}" != "/usr/lib64/efi" ]; then
- # provide compatibility sym-link for previous kiwi, etc.
+%if %{defined shim_lib64_share_compat}
+ [ "%{sysefidir}" != "/usr/lib64/efi" ] || exit 1
+ # provide compatibility sym-link for residual "consumers"
install -d %{buildroot}/usr/lib64/efi
ln -srf %{buildroot}/%{sysefidir}/*.efi %{buildroot}/usr/lib64/efi/
-fi
-%endif
%endif
# install the debug symbols
@@ -267,8 +268,10 @@
/sbin/update-bootloader --reinit || true
%endif
+%if %{defined update_bootloader_posttrans}
%posttrans
%{?update_bootloader_posttrans}
+%endif
%files
%defattr(-,root,root)
@@ -284,13 +287,11 @@
%dir %{_sysconfdir}/uefi/
%dir %{_sysconfdir}/uefi/certs/
%{_sysconfdir}/uefi/certs/*.crt
-%if 0%{?suse_version} > 1500 && 0%{?suse_version} < 1600
-%ifarch x86_64
+%if %{defined shim_lib64_share_compat}
# provide compatibility sym-link for previous kiwi, etc.
%dir /usr/lib64/efi
/usr/lib64/efi/*.efi
%endif
-%endif
%files -n shim-debuginfo
%defattr(-,root,root,-)
