diff --git a/Fix-auto-detect-of-bundled-mode-704.patch b/Fix-auto-detect-of-bundled-mode-704.patch deleted file mode 100644 index e9174de5327ae8bdf4d661e148932941f3228bd3..0000000000000000000000000000000000000000 --- a/Fix-auto-detect-of-bundled-mode-704.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 6eba239a5bb553fd557b7d78f7da8f0059618b9e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B8rgen=20Ibsen?= -Date: Thu, 13 Sep 2018 19:31:23 +0200 -Subject: [PATCH 06/30] Fix auto detect of bundled mode (#704) - -Set bundled mode to ON when parent directory is not empty. Due to the -peculiarities of CMake if, comparing an undefined variable to the empty -string is false, so this likely never triggered. ---- - CMakeLists.txt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 99b9258..6f1c5a2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -11,13 +11,13 @@ project(brotli C) - # we'll use the BROTLI_BUNDLED_MODE variable to let them do that; just - # set it to OFF in your project before you add_subdirectory(brotli). - get_directory_property(BROTLI_PARENT_DIRECTORY PARENT_DIRECTORY) --if(BROTLI_BUNDLED_MODE STREQUAL "") -+if(NOT DEFINED BROTLI_BUNDLED_MODE) - # Bundled mode hasn't been set one way or the other, set the default - # depending on whether or not we are the top-level project. - if(BROTLI_PARENT_DIRECTORY) -- set(BROTLI_BUNDLED_MODE OFF) -- else() - set(BROTLI_BUNDLED_MODE ON) -+ else() -+ set(BROTLI_BUNDLED_MODE OFF) - endif() - endif() - mark_as_advanced(BROTLI_BUNDLED_MODE) --- -2.19.1 - diff --git a/brotli.spec b/brotli.spec index e39845fc0dd411df9d97d025db334f714b82f416..5f27085f4940540436acfbc538b32973fd419ac0 100644 --- a/brotli.spec +++ b/brotli.spec @@ -1,14 +1,12 @@ Name: brotli -Version: 1.0.5 -Release: 3 +Version: 1.0.7 +Release: 1 Summary: Lossless compression algorithm License: MIT URL: https://github.com/google/brotli Source0: https://github.com/google/brotli/archive/v%{version}.tar.gz -Patch6000: Fix-auto-detect-of-bundled-mode-704.patch - BuildRequires: python2-devel python3-devel gcc-c++ gcc cmake %description @@ -83,9 +81,6 @@ pushd build ctest -V popd -%{__python2} setup.py test -%{__python3} setup.py test - %files %license LICENSE %{_bindir}/brotli @@ -108,6 +103,12 @@ popd %{_mandir}/man3/* %changelog +* Thu Apr 16 2020 chengquan -1.0.7-1 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:upgrade software to v1.0.7 + * Thu Dec 19 2019 openEuler Buildteam - 1.0.5-3 - fix auto detect of bundled mode diff --git a/v1.0.5.tar.gz b/v1.0.7.tar.gz similarity index 80% rename from v1.0.5.tar.gz rename to v1.0.7.tar.gz index a0c77236ff12a5e5a1d2f3264a2879871cf1b1aa..dad2c1c8906ae8e36c63552054835e0d6fab1159 100644 Binary files a/v1.0.5.tar.gz and b/v1.0.7.tar.gz differ