Compare commits
12 Commits
40bb74d546
...
6cc740cd3a
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6cc740cd3a | ||
|
|
71b1b0cf26 | ||
|
|
9cf6a9e654 | ||
|
|
c55a00512a | ||
|
|
aee7ecebe9 | ||
|
|
e72312c7e0 | ||
|
|
19e515fb09 | ||
|
|
03e7e358a5 | ||
|
|
b0e21f257f | ||
|
|
94a23cac25 | ||
|
|
d71104dfc4 | ||
|
|
ccc2b0da93 |
@ -0,0 +1,48 @@
|
||||
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}
|
||||
61
brotli.spec
61
brotli.spec
@ -1,13 +1,16 @@
|
||||
Name: brotli
|
||||
Version: 1.0.7
|
||||
Release: 1
|
||||
Version: 1.0.9
|
||||
Release: 3
|
||||
Summary: Lossless compression algorithm
|
||||
|
||||
License: MIT
|
||||
URL: https://github.com/google/brotli
|
||||
Source0: https://github.com/google/brotli/archive/v%{version}.tar.gz
|
||||
|
||||
BuildRequires: python2-devel python3-devel gcc-c++ gcc cmake
|
||||
Patch6000: backport-Revert-Add-runtime-linker-path-to-pkg-config-files.patch
|
||||
|
||||
BuildRequires: python3-devel gcc-c++ gcc cmake
|
||||
|
||||
|
||||
%description
|
||||
Brotli is a generic-purpose lossless compression algorithm that compresses
|
||||
@ -16,14 +19,6 @@ coding and 2nd order context modeling, with a compression ratio comparable
|
||||
to the best currently available general-purpose compression methods.
|
||||
It is similar in speed with deflate but offers more dense compression.
|
||||
|
||||
%package -n python2-%{name}
|
||||
Summary: Lossless compression algorithm (python 2)
|
||||
Requires: python2
|
||||
%{?python_provide:%python_provide python2-%{name}}
|
||||
|
||||
%description -n python2-%{name}
|
||||
This package installs a Python 2 module.
|
||||
|
||||
%package -n python3-%{name}
|
||||
Requires: python3
|
||||
Summary: Lossless compression algorithm (python 3)
|
||||
@ -42,7 +37,7 @@ This package installs the development files
|
||||
%package_help
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-%{version}
|
||||
%autosetup -n %{name}-%{version} -p1
|
||||
|
||||
%{__chmod} 644 c/enc/*.[ch]
|
||||
%{__chmod} 644 c/include/brotli/*.h
|
||||
@ -56,7 +51,6 @@ pushd build
|
||||
%make_build
|
||||
popd
|
||||
|
||||
%py2_build
|
||||
%py3_build
|
||||
|
||||
%install
|
||||
@ -65,7 +59,6 @@ pushd build
|
||||
%__rm "%{buildroot}%{_libdir}/"*.a
|
||||
popd
|
||||
|
||||
%py2_install
|
||||
%py3_install
|
||||
%{__install} -dm755 "%{buildroot}%{_mandir}/man3"
|
||||
|
||||
@ -86,10 +79,6 @@ popd
|
||||
%{_bindir}/brotli
|
||||
%{_libdir}/*.so.*
|
||||
|
||||
%files -n python2-%{name}
|
||||
%license LICENSE
|
||||
%{python2_sitearch}/*
|
||||
|
||||
%files -n python3-%{name}
|
||||
%license LICENSE
|
||||
%{python3_sitearch}/*
|
||||
@ -103,6 +92,42 @@ popd
|
||||
%{_mandir}/man3/*
|
||||
|
||||
%changelog
|
||||
* Tue Oct 25 2022 yanglongkang <yanglongkang@h-partners.com> - 1.0.9-3
|
||||
- rebuild for next release
|
||||
|
||||
* Fri Feb 05 2021 shixuantong <shixuantong@huawei.com> - 1.0.9-2
|
||||
- Revert "Add runtime linker path to pkg-config files (#740)"
|
||||
|
||||
* Tue Feb 2 2021 liudabo <liudabo1@huawei.com> - 1.0.9-1
|
||||
- upgrade version to 1.0.9
|
||||
|
||||
* Wed Nov 4 2020 wangjie<wangjie294@huawei.com> -1.0.7-4
|
||||
- Type:NA
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:remove python2
|
||||
|
||||
* Mon Oct 19 2020 wangjie<wangjie294@huawei.com> -1.0.7-3
|
||||
- Type:CVE
|
||||
- CVE:CVE-2020-8927
|
||||
- SUG:NA
|
||||
- DESC:fix CVE-2020-8927
|
||||
|
||||
* Mon Oct 19 2020 wangjie<wangjie294@huawei.com> -1.0.7-2
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:Synchronize patches from community
|
||||
Verbose-CLI-start-pulling-Shared-Brotli.patch
|
||||
Ensure-decompression-consumes-all-input.patch
|
||||
fix-MSVC-configuration-and-c++-compilation-fails.patch
|
||||
fix-executable-mode-of-decode-js.patch
|
||||
Fix-include-for-EMCC-build.patch
|
||||
Add-an-option-to-avoid-building-shared-libraries.patch
|
||||
Disable-PIC-in-EMCC-mode.patch
|
||||
Add-missing-const-to-a-couple-of-kConstants.patch
|
||||
Move-TZCNT-and-BSR-intrinsics-and-add-MSVC-versions.patch
|
||||
|
||||
* Thu Apr 16 2020 chengquan<chengquan3@huawei.com> -1.0.7-1
|
||||
- Type:enhancement
|
||||
- ID:NA
|
||||
|
||||
BIN
v1.0.7.tar.gz
BIN
v1.0.7.tar.gz
Binary file not shown.
BIN
v1.0.9.tar.gz
Normal file
BIN
v1.0.9.tar.gz
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user