From 8e523a3f7a3066fd9a6d75630186bd2ae7f14975 Mon Sep 17 00:00:00 2001 From: Travis Kendrick Date: Thu, 1 Oct 2020 15:42:47 -0500 Subject: [PATCH] Fix pc file (#1884364) --- ...992b6acb7faa6fd3b23f9bc036ea117230fc.patch | 48 +++++++++++++++++++ brotli.spec | 8 +++- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 09b0992b6acb7faa6fd3b23f9bc036ea117230fc.patch diff --git a/09b0992b6acb7faa6fd3b23f9bc036ea117230fc.patch b/09b0992b6acb7faa6fd3b23f9bc036ea117230fc.patch new file mode 100644 index 0000000..18ddaf4 --- /dev/null +++ b/09b0992b6acb7faa6fd3b23f9bc036ea117230fc.patch @@ -0,0 +1,48 @@ +From 09b0992b6acb7faa6fd3b23f9bc036ea117230fc Mon Sep 17 00:00:00 2001 +From: Eugene Kliuchnikov +Date: Wed, 2 Sep 2020 11:38:26 +0200 +Subject: [PATCH] Revert "Add runtime linker path to pkg-config files (#740)" + (#838) + +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 10ca969e..2a8cf7a3 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 e7c3124f..6f8ef2e4 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 4dd0811b..2098afe2 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} diff --git a/brotli.spec b/brotli.spec index 3a78957..1d255ef 100644 --- a/brotli.spec +++ b/brotli.spec @@ -1,12 +1,14 @@ Name: brotli Version: 1.0.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Lossless compression algorithm License: MIT URL: https://github.com/google/brotli Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +Patch0: 09b0992b6acb7faa6fd3b23f9bc036ea117230fc.patch + %if 0%{?rhel} == 7 BuildRequires: devtoolset-7-toolchain, devtoolset-7-libatomic-devel %endif @@ -62,6 +64,7 @@ It is similar in speed with deflate but offers more dense compression. This package installs the development files %prep +%autopatch -p1 %autosetup # fix permissions for -debuginfo # rpmlint will complain if I create an extra %%files section for @@ -137,6 +140,9 @@ done %changelog +* Thu Oct 01 2020 Travis Kendrick - 1.0.9-2 +- Fix pc file (#1884364) + * Wed Sep 30 2020 Travis Kendrick - 1.0.9-1 - Update to 1.0.9 (#1872932)