Upgrade re2 to 20240201 and add gbenchmark 1.8.3 for test support (#7598)

Co-authored-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
2024-02-06 23:45:50 -05:00 · 2024-02-06 23:45:50 -05:00 · 7f99f5b2a9
--- a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md
+++ b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md
--- a/SPECS/LICENSES-AND-NOTICES/data/licenses.json
+++ b/SPECS/LICENSES-AND-NOTICES/data/licenses.json
@ -252,6 +252,7 @@
                "future",
                "fxload",
                "gavl",
+                "gbenchmark",
                "gconf-editor",
                "GConf2",
                "gcovr",
--- a/SPECS/gbenchmark/gbenchmark.signatures.json
+++ b/SPECS/gbenchmark/gbenchmark.signatures.json
@ -0,0 +1,5 @@
+{
+ "Signatures": {
+  "gbenchmark-1.8.3.tar.gz": "6bc180a57d23d4d9515519f92b0c83d61b05b5bab188961f36ac7b06b0d9e9ce"
+ }
+}
--- a/SPECS/gbenchmark/gbenchmark.spec
+++ b/SPECS/gbenchmark/gbenchmark.spec
@ -0,0 +1,157 @@
+%global intname benchmark
+%global lbname lib%{intname}
+
+Summary:        A microbenchmark support library
+Name:           gbenchmark
+Version:        1.8.3
+Release:        1%{?dist}
+License:        Apache-2.0
+Vendor:         Microsoft Corporation
+Distribution:   Azure Linux
+URL:            https://github.com/google/%{intname}
+Source0:        https://github.com/google/%{intname}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+
+BuildRequires: cmake
+BuildRequires: doxygen
+BuildRequires: gcc
+BuildRequires: gcc-c++
+BuildRequires: gmock-devel
+BuildRequires: gtest-devel
+BuildRequires: ninja-build
+
+%description
+A library to support the benchmarking of functions, similar to unit-tests.
+
+%package devel
+Summary: Development files for %{name}
+Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description devel
+%{summary}.
+
+%package doc
+Summary: Documentation for %{name}
+BuildArch: noarch
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description doc
+%{summary}.
+
+%prep
+%autosetup -n %{intname}-%{version} -p1
+sed -e '/get_git_version/d' -e '/-Werror/d' -i CMakeLists.txt
+
+%build
+%cmake -G Ninja \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DGIT_VERSION=%{version} \
+    -DBENCHMARK_ENABLE_DOXYGEN:BOOL=ON \
+    -DBENCHMARK_ENABLE_TESTING:BOOL=ON \
+    -DBENCHMARK_USE_BUNDLED_GTEST:BOOL=OFF \
+    -DBENCHMARK_ENABLE_GTEST_TESTS:BOOL=ON \
+    -DBENCHMARK_ENABLE_INSTALL:BOOL=ON \
+    -DBENCHMARK_INSTALL_DOCS:BOOL=ON \
+    -DBENCHMARK_DOWNLOAD_DEPENDENCIES:BOOL=OFF
+%cmake_build
+
+%check
+%ctest
+
+%install
+%cmake_install
+
+%files
+%doc CONTRIBUTING.md README.md
+%license AUTHORS CONTRIBUTORS LICENSE
+%{_libdir}/%{lbname}*.so.1*
+
+%files devel
+%{_libdir}/%{lbname}*.so
+%{_includedir}/%{intname}/
+%{_libdir}/cmake/%{intname}/
+%{_libdir}/pkgconfig/%{intname}.pc
+
+%files doc
+%{_docdir}/%{intname}/
+
+%changelog
+* Wed Jan 31 2024 Jon Slobodzian <joslobo@microsoft.com> - 1.8.3-1
+- Initial CBL-Mariner import from Fedora 37 (license: MIT)
+- Upgraded to 1.8.3 from Fedora version
+- License verified.
+
+* Fri Nov 11 2022 Vitaly Zaitsev <vitaly@easycoding.org> - 1.7.1-1
+- Updated to version 1.7.1.
+
+* Tue Jul 26 2022 Vitaly Zaitsev <vitaly@easycoding.org> - 1.7.0-1
+- Updated to version 1.7.0.
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Jul 19 2022 Vitaly Zaitsev <vitaly@easycoding.org> - 1.6.2-1
+- Updated to version 1.6.2.
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Jan 17 2022 Vitaly Zaitsev <vitaly@easycoding.org> - 1.6.1-2
+- Disabled skip_with_error_test test on Fedora 36 due to GCC 12 regression.
+
+* Thu Jan 13 2022 Vitaly Zaitsev <vitaly@easycoding.org> - 1.6.1-1
+- Updated to version 1.6.1.
+
+* Sun Sep 12 2021 Vitaly Zaitsev <vitaly@easycoding.org> - 1.6.0-1
+- Updated to version 1.6.0.
+
+* Thu Aug 12 2021 Vitaly Zaitsev <vitaly@easycoding.org> - 1.5.6-1
+- Updated to version 1.5.6.
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Sat Jul 10 2021 Vitaly Zaitsev <vitaly@easycoding.org> - 1.5.5-3
+- Rebuilt again for the same reason.
+
+* Sat Jul 10 2021 Vitaly Zaitsev <vitaly@easycoding.org> - 1.5.5-2
+- Rebuilt due to glibc update.
+
+* Sat Jun 12 2021 Vitaly Zaitsev <vitaly@easycoding.org> - 1.5.5-1
+- Updated to version 1.5.5.
+
+* Mon May 31 2021 Vitaly Zaitsev <vitaly@easycoding.org> - 1.5.4-1
+- Updated to version 1.5.4.
+
+* Mon Apr 26 2021 Vitaly Zaitsev <vitaly@easycoding.org> - 1.5.3-1
+- Updated to version 1.5.3.
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Oct 14 2020 Jeff Law <law@redhat.com> - 1.5.2-2
+- Fix missing #include for gcc-11
+
+* Sat Sep 12 2020 Vitaly Zaitsev <vitaly@easycoding.org> - 1.5.2-1
+- Updated to version 1.5.2.
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sun Jul 19 2020 Vitaly Zaitsev <vitaly@easycoding.org> - 1.5.1-1
+- Updated to version 1.5.1.
+- Fixed RHBZ#1858127.
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue May 28 2019 Vitaly Zaitsev <vitaly@easycoding.org> - 1.5.0-1
+- Updated to version 1.5.0.
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Oct 25 2018 Vitaly Zaitsev <vitaly@easycoding.org> - 1.4.1-1
+- Initial SPEC release.
--- a/SPECS/re2/re2.signatures.json
+++ b/SPECS/re2/re2.signatures.json
@ -1,5 +1,5 @@
 {
 "Signatures": {
-  "re2-2019-08-01.tar.gz": "38bc0426ee15b5ed67957017fd18201965df0721327be13f60496f2b356e3e01"
+  "re2-2024-02-01.tar.gz": "cd191a311b84fcf37310e5cd876845b4bf5aee76fdd755008eef3b6478ce07bb"
 }
 }
--- a/SPECS/re2/re2.spec
+++ b/SPECS/re2/re2.spec
@ -1,23 +1,24 @@
-%global longver 2019-08-01
+%global longver 2024-02-01
 %global shortver %(echo %{longver}|sed 's|-||g')
+
 Summary:        C++ fast alternative to backtracking RE engines
 Name:           re2
 Version:        %{shortver}
-Release:        10%{?dist}
-License:        BSD
+Release:        1%{?dist}
+License:        BSD-3-Clause
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 URL:            https://github.com/google/%{name}/
-Source0:        https://github.com/google/%{name}/archive/%{longver}.tar.gz#/%{name}-%{longver}.tar.gz
-# downstream patch to change soname .0 => .0a
-# This is in response to symbol changes in recent release per
-# https://bugzilla.redhat.com/show_bug.cgi?id=1672014#c10
-# TODO: poke upstream on their policy/intentions regarding maintaining
-# stable ABI, or at least get them to bump soname appropriately so we
-# won't have to handle it ourselves downsream via this patch indefinitely.
-Patch1:         re2-soname.patch
+Source0:        https://github.com/google/%{name}/archive/refs/tags/%{longver}.tar.gz#/%{name}-%{longver}.tar.gz
 BuildRequires:  gcc
 BuildRequires:  make
+BuildRequires:  cmake
+BuildRequires:  abseil-cpp-devel
+%if %{with_check}
+BuildRequires:  gtest-devel
+BuildRequires:  gmock-devel
+BuildRequires:  gbenchmark-devel
+%endif

 %description
 RE2 is a C++ library providing a fast, safe, thread-friendly alternative to
@ -44,48 +45,49 @@ you will need to install %{name}-devel.
 %prep
 %setup -q -n %{name}-%{longver}

-%patch1 -p1 -b .soname
-
 %build
-# The -pthread flag issue has been submitted upstream:
-# http://groups.google.com/forum/?fromgroups=#!topic/re2-dev/bkUDtO5l6Lo
-# The RPM macro for the linker flags does not exist on EPEL
 %{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
-CXXFLAGS="${CXXFLAGS:-%{optflags}} -pthread"
-LDFLAGS="${LDFLAGS:-%{__global_ldflags}} -pthread"

-%make_build \
-  CXXFLAGS="$CXXFLAGS"\
-  LDFLAGS="$LDFLAGS" \
-  includedir=%{_includedir}\
-  libdir=%{_libdir}
+%cmake . \
+  -DOVERRIDE_INSTALL_PREFIX=/usr \
+  -DCMAKE_COLOR_MAKEFILE:BOOL=OFF \
+  -DINSTALL_LIBDIR:PATH=%{_libdir} \
+%if %{with_check}
+  -DRE2_BUILD_TESTING:BOOL=ON \
+%endif
+  "-GUnix Makefiles"
+
+%cmake_build

 %install
-%make_install \
-  INSTALL="install -p"\
-  includedir=%{_includedir}\
-  libdir=%{_libdir}
+%cmake_install

 # Suppress the static library
 rm -fv %{buildroot}%{_libdir}/libre2.a

 %check
-%make_build shared-test
+%ctest

 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig

 %files
 %license LICENSE
-%doc AUTHORS CONTRIBUTORS README
-%{_libdir}/libre2.so.0a*
+%doc README
+%{_libdir}/libre2.so.11*

 %files devel
 %{_includedir}/re2/
 %{_libdir}/libre2.so
 %{_libdir}/pkgconfig/re2.pc
+%{_libdir}/cmake/re2/*.cmake

 %changelog
+* Wed Jan 31 2024 Jon Slobodzian <joslobo@microsoft.com> - 20240201-1
+- Upgrading for Mariner 3.0
+- Removed unnecessary patch file
+- Updated License to SPDX compliant style
+ 
 * Fri Apr 29 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 20190801-10
 - Fixing source URL.

--- a/cgmanifest.json
+++ b/cgmanifest.json
@ -3975,6 +3975,16 @@
        }
      }
    },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "gbenchmark",
+          "version": "1.8.3",
+          "downloadUrl": "https://github.com/google/benchmark/archive/refs/tags/v1.8.3.tar.gz"
+        }
+      }
+    },
    {
      "component": {
        "type": "other",
@ -25144,8 +25154,8 @@
        "type": "other",
        "other": {
          "name": "re2",
-          "version": "20190801",
-          "downloadUrl": "https://github.com/google/re2/archive/2019-08-01.tar.gz"
+          "version": "20240201",
+          "downloadUrl": "https://github.com/google/re2/archive/refs/tags/2024-02-01.tar.gz"
        }
      }
    },