From bc853e147c6d59eae6a69322b6c23b28d221ec9c Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 03:55:09 +0100 Subject: [PATCH] added pkgconfig patch to fix linker arguments [release 1.0.9-2mamba;Thu Nov 19 2020] --- libbrotli-1.0-pkgconfig.patch | 24 ------------------------ libbrotli-1.0.9-pkgconfig.patch | 32 ++++++++++++++++++++++++++++++++ libbrotli.spec | 17 +++++++++++------ 3 files changed, 43 insertions(+), 30 deletions(-) delete mode 100644 libbrotli-1.0-pkgconfig.patch create mode 100644 libbrotli-1.0.9-pkgconfig.patch diff --git a/libbrotli-1.0-pkgconfig.patch b/libbrotli-1.0-pkgconfig.patch deleted file mode 100644 index d75ee21..0000000 --- a/libbrotli-1.0-pkgconfig.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nru libbrotli-1.0.orig/libbrotlidec.pc.in libbrotli-1.0/libbrotlidec.pc.in ---- libbrotli-1.0.orig/libbrotlidec.pc.in 2018-09-06 19:26:52.000000000 +0200 -+++ libbrotli-1.0/libbrotlidec.pc.in 2018-09-06 19:39:26.779968132 +0200 -@@ -1,7 +1,7 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ --includedir=@includedir@ -+includedir=@includedir@/brotli/dec - - Name: @PACKAGE_NAME@dec - Description: Brotli decoder library -diff -Nru libbrotli-1.0.orig/libbrotlienc.pc.in libbrotli-1.0/libbrotlienc.pc.in ---- libbrotli-1.0.orig/libbrotlienc.pc.in 2018-09-06 19:26:52.000000000 +0200 -+++ libbrotli-1.0/libbrotlienc.pc.in 2018-09-06 19:39:12.103898409 +0200 -@@ -1,7 +1,7 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ --includedir=@includedir@ -+includedir=@includedir@/brotli/enc - - Name: @PACKAGE_NAME@enc - Description: Brotli encoder library diff --git a/libbrotli-1.0.9-pkgconfig.patch b/libbrotli-1.0.9-pkgconfig.patch new file mode 100644 index 0000000..6ff3397 --- /dev/null +++ b/libbrotli-1.0.9-pkgconfig.patch @@ -0,0 +1,32 @@ +diff -Nru brotli-1.0.9.orig/scripts/libbrotlicommon.pc.in brotli-1.0.9/scripts/libbrotlicommon.pc.in +--- brotli-1.0.9.orig/scripts/libbrotlicommon.pc.in 2020-09-16 03:20:44.000000000 +0200 ++++ brotli-1.0.9/scripts/libbrotlicommon.pc.in 2020-11-19 09:26:00.553000000 +0100 +@@ -7,5 +7,5 @@ + URL: https://github.com/google/brotli + Description: Brotli common dictionary library + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -R${libdir} -lbrotlicommon ++Libs: -L${libdir} -Wl,-R${libdir} -lbrotlicommon + Cflags: -I${includedir} +diff -Nru brotli-1.0.9.orig/scripts/libbrotlidec.pc.in brotli-1.0.9/scripts/libbrotlidec.pc.in +--- brotli-1.0.9.orig/scripts/libbrotlidec.pc.in 2020-09-16 03:20:44.000000000 +0200 ++++ brotli-1.0.9/scripts/libbrotlidec.pc.in 2020-11-19 09:26:12.548000000 +0100 +@@ -7,6 +7,6 @@ + URL: https://github.com/google/brotli + Description: Brotli decoder library + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -R${libdir} -lbrotlidec ++Libs: -L${libdir} -Wl,-R${libdir} -lbrotlidec + Requires.private: libbrotlicommon >= 1.0.2 + Cflags: -I${includedir} +diff -Nru brotli-1.0.9.orig/scripts/libbrotlienc.pc.in brotli-1.0.9/scripts/libbrotlienc.pc.in +--- brotli-1.0.9.orig/scripts/libbrotlienc.pc.in 2020-09-16 03:20:44.000000000 +0200 ++++ brotli-1.0.9/scripts/libbrotlienc.pc.in 2020-11-19 09:26:19.302000000 +0100 +@@ -7,6 +7,6 @@ + URL: https://github.com/google/brotli + Description: Brotli encoder library + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -R${libdir} -lbrotlienc ++Libs: -L${libdir} -Wl,-R${libdir} -lbrotlienc + Requires.private: libbrotlicommon >= 1.0.2 + Cflags: -I${includedir} diff --git a/libbrotli.spec b/libbrotli.spec index 41f3f66..0ef42cc 100644 --- a/libbrotli.spec +++ b/libbrotli.spec @@ -1,19 +1,19 @@ Name: libbrotli Version: 1.0.9 -Release: 1mamba +Release: 2mamba Summary: A data format library for data streams Group: System/Libraries Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: https://github.com/bagder/libbrotli -## GITSOURCE https://github.com/bagder/libbrotli.git libbrotli-1.0 Source: https://github.com/google/brotli.git/v%{version}/brotli-%{version}.tar.bz2 #Source: https://github.com/bagder/libbrotli.git/libbrotli-%{version}/libbrotli-%{version}.tar.bz2 -Patch0: libbrotli-1.0-pkgconfig.patch +Patch0: libbrotli-1.0.9-pkgconfig.patch License: MIT ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel +BuildRequires: ldconfig ## AUTOBUILDREQ-END BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -41,10 +41,11 @@ This package contains tools that use %{name}. %prep %setup -q -n brotli-%{version} -#% patch0 -p1 +%patch0 -p1 + +./bootstrap %build -./bootstrap %configure %make @@ -63,6 +64,7 @@ This package contains tools that use %{name}. %{_libdir}/libbrotlidec.so.* %{_libdir}/libbrotlienc.so.* %{_libdir}/libbrotlicommon.so.* +%doc LICENSE %files devel %defattr(-,root,root) @@ -78,9 +80,9 @@ This package contains tools that use %{name}. %{_libdir}/libbrotlicommon.la %{_libdir}/libbrotlicommon.so %{_libdir}/pkgconfig/libbrotlicommon.pc -%{_datadir}/doc/brotli/README %{_libdir}/pkgconfig/libbrotlidec.pc %{_libdir}/pkgconfig/libbrotlienc.pc +%{_docdir}/brotli/README %doc README README.md %files tools @@ -88,6 +90,9 @@ This package contains tools that use %{name}. %{_bindir}/brotli %changelog +* Thu Nov 19 2020 Silvan Calarco 1.0.9-2mamba +- added pkgconfig patch to fix linker arguments + * Wed Sep 16 2020 Automatic Build System 1.0.9-1mamba - automatic version update by autodist