[packages/re2] - added dirs patch (fix include dir in re2Config.cmake); release 2

qboosh qboosh at pld-linux.org
Tue Jun 28 06:07:33 CEST 2022


commit 987d6fcaef4d54959c74a4063667860f600b5c30
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Jun 28 06:08:51 2022 +0200

    - added dirs patch (fix include dir in re2Config.cmake); release 2

 re2-dirs.patch | 11 +++++++++++
 re2.spec       |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/re2.spec b/re2.spec
index b8841c8..0b9d64e 100644
--- a/re2.spec
+++ b/re2.spec
@@ -9,13 +9,14 @@ Summary:	C++ fast alternative to backtracking RE engines
 Summary(pl.UTF-8):	Szybka alternatywna dla silników RE w C++
 Name:		re2
 Version:	%{ver}
-Release:	1
+Release:	2
 License:	BSD
 Group:		Libraries
 #Source0Download: https://github.com/google/re2/releases
 Source0:	https://github.com/google/re2/archive/%{tagver}/%{name}-%{tagver}.tar.gz
 # Source0-md5:	cb629f38da6b7234a9e9eba271ded5d6
 Patch0:		test-compile.patch
+Patch1:		%{name}-dirs.patch
 URL:		https://github.com/google/re2
 BuildRequires:	cmake >= 3.10.2
 BuildRequires:	libstdc++-devel >= 6:4.7
@@ -80,6 +81,7 @@ Statyczna biblioteka RE2.
 %prep
 %setup -q -n %{name}-%{tagver}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %if %{with static_libs}
diff --git a/re2-dirs.patch b/re2-dirs.patch
new file mode 100644
index 0000000..2bc75a2
--- /dev/null
+++ b/re2-dirs.patch
@@ -0,0 +1,11 @@
+--- re2-2022-06-01/re2Config.cmake.in.orig	2022-05-10 13:02:12.000000000 +0200
++++ re2-2022-06-01/re2Config.cmake.in	2022-06-28 05:54:53.640776820 +0200
+@@ -6,7 +6,7 @@
+ 
+ include(CMakeFindDependencyMacro)
+ 
+-set_and_check(re2_INCLUDE_DIR ${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_INCLUDEDIR@)
++set_and_check(re2_INCLUDE_DIR @CMAKE_INSTALL_FULL_INCLUDEDIR@)
+ 
+ if(UNIX)
+   set(THREADS_PREFER_PTHREAD_FLAG ON)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/re2.git/commitdiff/987d6fcaef4d54959c74a4063667860f600b5c30



More information about the pld-cvs-commit mailing list