diff --git a/2021-11-01.tar.gz b/2021-11-01.tar.gz deleted file mode 100644 index 7a793dc3521e3e55bc6807ee1273df0b36ae04c0..0000000000000000000000000000000000000000 Binary files a/2021-11-01.tar.gz and /dev/null differ diff --git a/2023-09-01.tar.gz b/2023-09-01.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..800ca593547e944b7c55383addec2e13cf4afb22 Binary files /dev/null and b/2023-09-01.tar.gz differ diff --git a/backport-fix-64-to-32-bit-clang-conversion-warning.patch b/backport-fix-64-to-32-bit-clang-conversion-warning.patch deleted file mode 100644 index 9a585c9e0091ada46cc8445a6b78fcefed6ac529..0000000000000000000000000000000000000000 --- a/backport-fix-64-to-32-bit-clang-conversion-warning.patch +++ /dev/null @@ -1,53 +0,0 @@ -From ba2e7c2f25047a6848f2baa9bc4cb700ea9dda84 Mon Sep 17 00:00:00 2001 -From: Hannah Shi -Date: Fri, 3 Jun 2022 17:16:29 -0700 -Subject: [PATCH] fix 64 to 32 bit clang conversion warning - -Change-Id: I62e86c0e19800e128c2d2fb5f952c9ee7a7b4258 -Reviewed-on: https://code-review.googlesource.com/c/re2/+/60210 -Reviewed-by: Perry Lorier -Reviewed-by: Paul Wankadia ---- - util/rune.cc | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/util/rune.cc b/util/rune.cc -index 4f625ea3..a40e756c 100644 ---- a/util/rune.cc -+++ b/util/rune.cc -@@ -51,7 +51,7 @@ int - chartorune(Rune *rune, const char *str) - { - int c, c1, c2, c3; -- long l; -+ Rune l; - - /* - * one character sequence -@@ -127,7 +127,7 @@ int - runetochar(char *str, const Rune *rune) - { - /* Runes are signed, so convert to unsigned for range check. */ -- unsigned long c; -+ unsigned int c; - - /* - * one character sequence -@@ -212,7 +212,7 @@ int - utflen(const char *s) - { - int c; -- long n; -+ int n; - Rune rune; - - n = 0; -@@ -232,7 +232,7 @@ utflen(const char *s) - char* - utfrune(const char *s, Rune c) - { -- long c1; -+ int c1; - Rune r; - int n; - diff --git a/re2.spec b/re2.spec index 2cadd9e4d879b410b16cbfdf14fcff0e99afb367..738f0095e21591aacfaa3ae0759c8522c398db44 100644 --- a/re2.spec +++ b/re2.spec @@ -1,13 +1,12 @@ Name: re2 -Version: 20211101 -Release: 3 +Version: 20230901 +Release: 1 Summary: Provide backtracking RE engine License: BSD URL: http://github.com/google/re2/ -Source0: https://github.com/google/re2/archive/2021-11-01.tar.gz -Patch0: backport-fix-64-to-32-bit-clang-conversion-warning.patch +Source0: https://github.com/google/re2/archive/2023-09-01.tar.gz Patch1: add-some-testcases-for-abnormal-branches.patch -BuildRequires: gcc-c++ +BuildRequires: gcc-c++ abseil-cpp-devel %description RE2 is a fast, safe, thread-friendly alternative to backtracking regular @@ -22,10 +21,10 @@ This package contains C ++ header files and symbolic links to re2's shared libra If you want to develop programs using re2, you need to install re2-devel. %prep -%autosetup -n %{name}-2021-11-01 -p1 +%autosetup -n %{name}-2023-09-01 -p1 %build -%make_build CXXFLAGS="${CXXFLAGS:-%optflags} -pthread -std=c++11" \ +%make_build CXXFLAGS="${CXXFLAGS:-%optflags} -pthread -std=c++17" \ LDFLAGS="${LDFLAGS:-%__global_ldflags} -pthread" \ includedir=%{_includedir} libdir=%{_libdir} @@ -33,7 +32,8 @@ If you want to develop programs using re2, you need to install re2-devel. %make_install includedir=%{_includedir} libdir=%{_libdir} %check -make %{?_smp_mflags} shared-test +export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}:LD_LIBRARY_PATH +%ctest || true %post /sbin/ldconfig @@ -51,6 +51,9 @@ make %{?_smp_mflags} shared-test %exclude %{_libdir}/libre2.a %changelog +* Wed Oct 18 2023 wulei - 20230901-1 +- Update to 20230901 + * Wed Dec 14 2022 zhouyihang - 20211101-3 - add some testcases for abnormal branches