.brotli.metadata

@@ -1 +1 @@
-ddfefdf2593b3f03eec221a7f4ceaa710e5a2e6b SOURCES/brotli-1.0.9.tar.gz
+2b048546afec020cf922f6af75058cc60fcf4fbf SOURCES/brotli-1.1.0.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/brotli-1.0.9.tar.gz
+SOURCES/brotli-1.1.0.tar.gz

SOURCES/09b0992b6acb7faa6fd3b23f9bc036ea117230fc.patch

@@ -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}

SOURCES/RHEL-32153-kBrotliBitMask-bounds.patch

@@ -1,9 +1,9 @@
---- brotli-1.0.9/c/dec/bit_reader.h.RHEL-32153-kBrotliBitMask-bounds	2020-08-27 16:12:55.000000000 +0200
+--- brotli-1.1.0/c/dec/bit_reader.h.RHEL-32153-kBrotliBitMask-bounds	2023-08-29 13:00:29.000000000 +0200
-+++ brotli-1.0.9/c/dec/bit_reader.h	2024-09-11 12:42:29.143308077 +0200
++++ brotli-1.1.0/c/dec/bit_reader.h	2024-09-11 13:38:21.608972528 +0200
-@@ -28,8 +28,10 @@ static BROTLI_INLINE uint32_t BitMask(ui
+@@ -32,8 +32,10 @@ static BROTLI_INLINE brotli_reg_t BitMas
      /* Masking with this expression turns to a single
         "Unsigned Bit Field Extract" UBFX instruction on ARM. */
-     return ~((0xFFFFFFFFu) << n);
+     return ~(~((brotli_reg_t)0) << n);
 -  } else {
 +  } else if (n < 33) {
      return kBrotliBitMask[n];

SPECS/brotli.spec

@@ -1,21 +1,22 @@
 Name:           brotli
-Version:        1.0.9
+Version:        1.1.0
-Release:        7%{?dist}
+Release:        6%{?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
 Patch1:         RHEL-32153-kBrotliBitMask-bounds.patch
 
 %if 0%{?rhel} == 7
 BuildRequires:  devtoolset-7-toolchain, devtoolset-7-libatomic-devel
+BuildRequires:  cmake3
+%else
+BuildRequires:  cmake
 %endif
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
-BuildRequires:  cmake
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  python%{python3_pkgversion}-setuptools
 Requires: lib%{name}%{?_isa} = %{version}-%{release}
@@ -76,21 +77,28 @@ chmod 644 c/tools/brotli.c
 %build
 %if 0%{?rhel} == 7
 . /opt/rh/devtoolset-7/enable
-%endif
+%cmake3 \
+    -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
+    -DCMAKE_INSTALL_LIBDIR="%{_libdir}"
+%cmake3_build
+%else
 %cmake \
     -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
     -DCMAKE_INSTALL_LIBDIR="%{_libdir}"
 %cmake_build
+%endif
 %py3_build
 
 %install
 %if 0%{?rhel} == 7
 . /opt/rh/devtoolset-7/enable
-%endif
+%cmake3_install
+%else
 %cmake_install
+%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"
@@ -104,8 +112,10 @@ done
 %check
 %if 0%{?rhel} == 7
 . /opt/rh/devtoolset-7/enable
-%endif
+%ctest3
+%else
 %ctest
+%endif
 
 %files
 %{_bindir}/brotli
@@ -123,7 +133,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
@@ -140,15 +150,51 @@ done
 
 
 %changelog
-* Wed Sep 11 2024 Eike Rathke <erack@redhat.com> - 1.0.9-7
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.1.0-6
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Wed Sep 11 2024 Eike Rathke <erack@redhat.com> - 1.1.0-5
 - Check BitMask(n) n value for kBrotliBitMask[n] bounds
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.9-6
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.1.0-4
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Bump release for June 2024 mass rebuild
-  Related: rhbz#1991688
+
+* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* 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
+
+* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 1.0.9-12
+- Rebuilt for Python 3.12
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Dec 03 2022 Jonathan Wright <jonathan@almalinux.org> - 1.0.9-10
+- Fix EL7 builds
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.0.9-8
+- Rebuilt for Python 3.11
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.9-5
+* Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 1.0.9-5
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Rebuilt for Python 3.10
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild