From e4c30f3cc21d3631ca74d0d6879ce56eb3356098 Mon Sep 17 00:00:00 2001
From: jonathanspw <jonathan@almalinux.org>
Date: Fri, 15 Sep 2023 11:14:52 -0500
Subject: [PATCH] update to 1.1.0 rhbz#2233368

---
 ...992b6acb7faa6fd3b23f9bc036ea117230fc.patch | 48 -------------------
 brotli.spec                                   | 12 +++--
 sources                                       |  2 +-
 3 files changed, 8 insertions(+), 54 deletions(-)
 delete mode 100644 09b0992b6acb7faa6fd3b23f9bc036ea117230fc.patch

diff --git a/09b0992b6acb7faa6fd3b23f9bc036ea117230fc.patch b/09b0992b6acb7faa6fd3b23f9bc036ea117230fc.patch
deleted file mode 100644
index 18ddaf4..0000000
--- a/09b0992b6acb7faa6fd3b23f9bc036ea117230fc.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 09b0992b6acb7faa6fd3b23f9bc036ea117230fc Mon Sep 17 00:00:00 2001
-From: Eugene Kliuchnikov <eustas.ru@gmail.com>
-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 2f66b68..3367096 100644
--- a/brotli.spec
+++ b/brotli.spec
@@ -1,13 +1,12 @@
 Name:           brotli
-Version:        1.0.9
-Release:        13%{?dist}
+Version:        1.1.0
+Release:        1%{?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
@@ -98,7 +97,7 @@ chmod 644 c/tools/brotli.c
 %endif
 
 # I couldn't find the option to not build the static libraries
-rm "%{buildroot}%{_libdir}/"*.a
+#rm "%{buildroot}%{_libdir}/"*.a
 
 %py3_install
 install -dm755 "%{buildroot}%{_mandir}/man3"
@@ -133,7 +132,7 @@ done
 %{python3_sitearch}/brotli.py
 %{python3_sitearch}/_brotli.cpython-%{python3_version_nodots}*.so
 %{python3_sitearch}/__pycache__/brotli.cpython-%{python3_version_nodots}*.py*
-%{python3_sitearch}/Brotli-%{version}-py%{python3_version}.egg-info
+%{python3_sitearch}/Brotli-1.1.0-py%{python3_version}.egg-info/
 
 %files devel
 %{_includedir}/brotli
@@ -150,6 +149,9 @@ done
 
 
 %changelog
+* Fri Sep 15 2023 Jonathan Wright <jonathan@almalinux.org> - 1.1.0-1
+- Update to 1.1.1 rhbz#2233368
+
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/sources b/sources
index ebca323..60257d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (brotli-1.0.9.tar.gz) = b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5
+SHA512 (brotli-1.1.0.tar.gz) = 6eb280d10d8e1b43d22d00fa535435923c22ce8448709419d676ff47d4a644102ea04f488fc65a179c6c09fee12380992e9335bad8dfebd5d1f20908d10849d9