From c8fe6e79dc8e4574ad265a35ec827a7bec855444 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 28 Sep 2016 11:31:35 -0400 Subject: [PATCH] Maybe even provide the *right* old linker deps. Signed-off-by: Peter Jones --- ... 0001-lib-provide-LIBEFIVAR_1.28-etc.patch | 24 +++++++++---------- efivar.spec | 7 ++++-- 2 files changed, 17 insertions(+), 14 deletions(-) rename 0001-lib-provide-LIBEFIVAR_0.28-etc.patch => 0001-lib-provide-LIBEFIVAR_1.28-etc.patch (72%) diff --git a/0001-lib-provide-LIBEFIVAR_0.28-etc.patch b/0001-lib-provide-LIBEFIVAR_1.28-etc.patch similarity index 72% rename from 0001-lib-provide-LIBEFIVAR_0.28-etc.patch rename to 0001-lib-provide-LIBEFIVAR_1.28-etc.patch index b2f35f0..7203e5e 100644 --- a/0001-lib-provide-LIBEFIVAR_0.28-etc.patch +++ b/0001-lib-provide-LIBEFIVAR_1.28-etc.patch @@ -1,7 +1,7 @@ -From 106068931a9ace55140371ade9588c60991061a0 Mon Sep 17 00:00:00 2001 +From 7ae5c70750d31d7ddce736b5979d15a1a0ccaae2 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 28 Sep 2016 09:28:24 -0400 -Subject: [PATCH] lib*: provide LIBEFIVAR_0.28 etc. +Subject: [PATCH] lib*: provide LIBEFIVAR_1.28 etc. Signed-off-by: Peter Jones --- @@ -10,7 +10,7 @@ Signed-off-by: Peter Jones 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/libefiboot.map.in b/src/libefiboot.map.in -index 51822a5..9de1232 100644 +index 51822a5..dce38a3 100644 --- a/src/libefiboot.map.in +++ b/src/libefiboot.map.in @@ -23,7 +23,13 @@ LIBEFIBOOT_0.0 { @@ -20,17 +20,17 @@ index 51822a5..9de1232 100644 -}; +} LIBEFIBOOT_0.0; + -+LIBEFIBOOT_0.28 { ++LIBEFIBOOT_1.28 { +} LIBEFIBOOT_0.24; + -+LIBEFIBOOT_0.29 { -+} LIBEFIBOOT_0.28; ++LIBEFIBOOT_1.29 { ++} LIBEFIBOOT_1.28; LIBEFIBOOT_1.@@VERSION@@ { -}; -+} LIBEFIBOOT_0.29; ++} LIBEFIBOOT_1.29; diff --git a/src/libefivar.map.in b/src/libefivar.map.in -index 6b8f996..b2743ef 100644 +index 6b8f996..033eb8d 100644 --- a/src/libefivar.map.in +++ b/src/libefivar.map.in @@ -99,8 +99,14 @@ LIBEFIVAR_0.24 { @@ -38,18 +38,18 @@ index 6b8f996..b2743ef 100644 } LIBEFIVAR_0.0; -LIBEFIVAR_1.@@VERSION@@ { -+LIBEFIVAR_0.28 { ++LIBEFIVAR_1.28 { global: efi_error_set; efi_error_get; efi_error_clear; -}; +} LIBEFIVAR_0.24; + -+LIBEFIVAR_0.29 { -+} LIBEFIVAR_0.28; ++LIBEFIVAR_1.29 { ++} LIBEFIVAR_1.28; + +LIBEFIVAR_1.@@VERSION@@ { -+} LIBEFIVAR_0.29; ++} LIBEFIVAR_1.29; -- 2.7.4 diff --git a/efivar.spec b/efivar.spec index 70a851c..3941773 100644 --- a/efivar.spec +++ b/efivar.spec @@ -1,6 +1,6 @@ Name: efivar Version: 30 -Release: 2%{?dist} +Release: 3{?dist} Summary: Tools to manage UEFI variables License: LGPLv2.1 URL: https://github.com/rhinstaller/efivar @@ -9,7 +9,7 @@ ExclusiveArch: %{ix86} x86_64 aarch64 BuildRequires: popt-devel popt-static git glibc-static Source0: https://github.com/rhinstaller/efivar/releases/download/efivar-%{version}/efivar-%{version}.tar.bz2 -Patch0001: 0001-lib-provide-LIBEFIVAR_0.28-etc.patch +Patch0001: 0001-lib-provide-LIBEFIVAR_1.28-etc.patch %description efivar provides a simple command line interface to the UEFI variable facility. @@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so.* %changelog +* Wed Sep 28 2016 Peter Jones - 30-3 +- Maybe even provide the *right* old linker deps. + * Tue Sep 27 2016 Peter Jones - 30-2 - Try not to screw up SONAME stuff quite so badly.