Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package re2 for openSUSE:Factory checked in at 2022-04-26 20:15:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/re2 (Old) and /work/SRC/openSUSE:Factory/.re2.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "re2" Tue Apr 26 20:15:20 2022 rev:45 rq:972798 version:MACRO Changes: -------- --- /work/SRC/openSUSE:Factory/re2/re2.changes 2022-04-08 00:27:47.054278175 +0200 +++ /work/SRC/openSUSE:Factory/.re2.new.1538/re2.changes 2022-04-26 20:17:21.908731395 +0200 @@ -1,0 +2,13 @@ +Tue Apr 26 07:55:47 UTC 2022 - Callum Farmer <gm...@opensuse.org> + +- Disable tests on ZSystems and RISCV + +------------------------------------------------------------------- +Sun Apr 24 18:16:08 UTC 2022 - Stefan Br??ns <stefan.bru...@rwth-aachen.de> + +- Switch build to CMake, otherwise CMake config is not installed. + Required for Apache ORC and arrow, and google-or-tools. + (https://github.com/google/re2/issues/304) +- Run some real tests via CTest + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ re2.spec ++++++ --- /var/tmp/diff_new_pack.KLgSdD/_old 2022-04-26 20:17:22.376731962 +0200 +++ /var/tmp/diff_new_pack.KLgSdD/_new 2022-04-26 20:17:22.388731976 +0200 @@ -19,6 +19,10 @@ %global longver 2022-04-01 %global shortver %(echo %{longver}|sed 's|-||g') %define libname libre2-9 +%bcond_with test +%ifnarch s390 s390x riscv64 +%bcond_without test +%endif Name: re2 Version: %{shortver} Release: 0 @@ -28,7 +32,7 @@ URL: https://github.com/google/re2 Source0: %{url}/archive/%{longver}/%{name}-%{longver}.tar.gz Source99: baselibs.conf -BuildRequires: pkgconfig +BuildRequires: cmake %if %{?suse_version} < 1550 BuildRequires: gcc11-c++ %else @@ -82,21 +86,25 @@ %if 0%{?suse_version} < 1550 export CXX=g++-11 %endif -ARCH_FLAGS="`echo %{optflags} | sed -e 's/-O2/-O3/g'`" -export CXXFLAGS="${ARCH_FLAGS}" -%make_build +%cmake +%cmake_build %install -%make_install includedir=%{_includedir} libdir=%{_libdir} - -# Suppress the static library -find %{buildroot} -name '*.a' -delete -print +%cmake_install +# Install the pkgconfig file +%make_build common-install DESTDIR=%{buildroot} includedir=%{_includedir} libdir=%{_libdir} %check +# Test if created library is installed correctly %if 0%{?suse_version} < 1550 export CXX=g++-11 %endif %make_build shared-testinstall DESTDIR=%{buildroot} includedir=%{_includedir} libdir=%{_libdir} +%if %{with test} +# Actual functionality tests +export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}:LD_LIBRARY_PATH +%ctest +%endif %post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig @@ -111,5 +119,6 @@ %{_includedir}/%{name} %{_libdir}/lib%{name}.so %{_libdir}/pkgconfig/%{name}.pc +%{_libdir}/cmake/%{name} %changelog