From 3f098799f2c5b5687b1cb766919c96347a3bcf2a3bc5cf4ec23c3d3ac291897f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 1 Sep 2020 13:56:58 +0000 Subject: [PATCH] - Add 0001-Revert-Add-runtime-linker-path-to-pkg-config-files-7.patch OBS-URL: https://build.opensuse.org/package/show/Archiving/brotli?expand=0&rev=28 --- ...me-linker-path-to-pkg-config-files-7.patch | 51 +++++++++++++++++++ brotli.changes | 5 ++ brotli.spec | 1 + 3 files changed, 57 insertions(+) create mode 100644 0001-Revert-Add-runtime-linker-path-to-pkg-config-files-7.patch diff --git a/0001-Revert-Add-runtime-linker-path-to-pkg-config-files-7.patch b/0001-Revert-Add-runtime-linker-path-to-pkg-config-files-7.patch new file mode 100644 index 0000000..d67ed63 --- /dev/null +++ b/0001-Revert-Add-runtime-linker-path-to-pkg-config-files-7.patch @@ -0,0 +1,51 @@ +From 525e5afc873f17b5891239f188811a2b6d9cf8a2 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Tue, 1 Sep 2020 15:55:52 +0200 +Subject: [PATCH] Revert "Add runtime linker path to pkg-config files (#740)" +References: https://github.com/google/brotli/issues/836 + +This reverts commit 31754d4ffce14153b5c2addf7a11019ec23f51c1. +--- + scripts/libbrotlicommon.pc.in | 2 +- + scripts/libbrotlidec.pc.in | 2 +- + scripts/libbrotlienc.pc.in | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/scripts/libbrotlicommon.pc.in b/scripts/libbrotlicommon.pc.in +index 10ca969..2a8cf7a 100644 +--- a/scripts/libbrotlicommon.pc.in ++++ b/scripts/libbrotlicommon.pc.in +@@ -7,5 +7,5 @@ Name: libbrotlicommon + URL: https://github.com/google/brotli + Description: Brotli common dictionary library + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -R${libdir} -lbrotlicommon ++Libs: -L${libdir} -lbrotlicommon + Cflags: -I${includedir} +diff --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in +index e7c3124..6f8ef2e 100644 +--- a/scripts/libbrotlidec.pc.in ++++ b/scripts/libbrotlidec.pc.in +@@ -7,6 +7,6 @@ Name: libbrotlidec + URL: https://github.com/google/brotli + Description: Brotli decoder library + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -R${libdir} -lbrotlidec ++Libs: -L${libdir} -lbrotlidec + Requires.private: libbrotlicommon >= 1.0.2 + Cflags: -I${includedir} +diff --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in +index 4dd0811..2098afe 100644 +--- a/scripts/libbrotlienc.pc.in ++++ b/scripts/libbrotlienc.pc.in +@@ -7,6 +7,6 @@ Name: libbrotlienc + URL: https://github.com/google/brotli + Description: Brotli encoder library + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -R${libdir} -lbrotlienc ++Libs: -L${libdir} -lbrotlienc + Requires.private: libbrotlicommon >= 1.0.2 + Cflags: -I${includedir} +-- +2.28.0 + diff --git a/brotli.changes b/brotli.changes index 5780c17..18256f6 100644 --- a/brotli.changes +++ b/brotli.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 1 13:56:47 UTC 2020 - Jan Engelhardt + +- Add 0001-Revert-Add-runtime-linker-path-to-pkg-config-files-7.patch + ------------------------------------------------------------------- Thu Aug 27 14:32:26 UTC 2020 - Jan Engelhardt diff --git a/brotli.spec b/brotli.spec index 8dacefd..2a747ec 100644 --- a/brotli.spec +++ b/brotli.spec @@ -27,6 +27,7 @@ Group: Productivity/Archiving/Compression URL: https://github.com/google/brotli Source: https://github.com/google/brotli/archive/v%version.tar.gz Source99: baselibs.conf +Patch1: 0001-Revert-Add-runtime-linker-path-to-pkg-config-files-7.patch BuildRequires: cmake >= 2.8.6 BuildRequires: gcc-c++ BuildRequires: gzip