[rpms/bear] epel10: Update to 3.0.6

[rpms/bear] epel10: Update to 3.0.6

[Till Hofmann]

A new commit has been pushed.

Repo   : rpms/bear
Branch : epel10
Commit : 9bc49640bd3cdd60028207fb4dfce591f787848d
Author : Till Hofmann <thofmann@fedoraproject.org>
Date   : 2020-12-30T14:22:25+01:00
Stats  : +131/-26 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/bear/c/9bc49640bd3cdd60028207fb4dfce591f787848d?branch=epel10

Log:
Update to 3.0.6

---
diff --git a/.gitignore b/.gitignore
index 5350bc3..84c71c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /bear-2.4.2.tar.gz
 /bear-2.4.3.tar.gz
 /bear-2.4.4.tar.gz
+/bear-3.0.6.tar.gz

diff --git a/bear.libexec-subdir.patch b/bear.libexec-subdir.patch
new file mode 100644
index 0000000..cc52506
--- /dev/null
+++ b/bear.libexec-subdir.patch
@@ -0,0 +1,83 @@
+commit b48ca5d90c129d26702e458f7ad9ba65d7585f2a
+Author: Till Hofmann <thofmann@fedoraproject.org>
+Date:   Wed Dec 30 13:27:10 2020 +0100
+
+    Install files into /usr/libexec/bear instead of directly into /usr/libexec
+    
+    As the installed files have rather generic names (e.g., libexec.so), put them
+    into a sub-directory so it is clear that those files belong to bear.
+
+diff --git a/source/config.h.in b/source/config.h.in
+index 2ca8853..48370fd 100644
+--- a/source/config.h.in
++++ b/source/config.h.in
+@@ -65,6 +65,6 @@ constexpr char VERSION[] = "@CMAKE_PROJECT_VERSION@";
+ 
+ constexpr char CITNAMES_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/citnames";
+ constexpr char INTERCEPT_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/intercept";
+-constexpr char LIBRARY_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@";
+-constexpr char EXECUTOR_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/er";
+-constexpr char WRAPPER_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d";
++constexpr char LIBRARY_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@";
++constexpr char EXECUTOR_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/bear/er";
++constexpr char WRAPPER_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/bear/wrapper.d";
+diff --git a/source/intercept/CMakeLists.txt b/source/intercept/CMakeLists.txt
+index f3ca535..5b2962f 100644
+--- a/source/intercept/CMakeLists.txt
++++ b/source/intercept/CMakeLists.txt
+@@ -111,9 +111,9 @@ target_link_libraries(wrapper rpc_a)
+ target_link_libraries(wrapper spdlog::spdlog)
+ 
+ install(TARGETS wrapper
+-        RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR})
++        RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/bear)
+ install(DIRECTORY
+-        DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/wrapper.d)
++        DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/bear/wrapper.d)
+ install(CODE "
+     execute_process(
+         COMMAND ln -sf ../wrapper ar
+@@ -145,7 +145,7 @@ install(CODE "
+         COMMAND ln -sf ../wrapper objdump
+         COMMAND ln -sf ../wrapper ranlib
+         COMMAND ln -sf ../wrapper readelf
+-        WORKING_DIRECTORY ${DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/wrapper.d
++        WORKING_DIRECTORY ${DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/bear/wrapper.d
+     )
+ ")
+ 
+@@ -164,7 +164,7 @@ target_link_libraries(er rpc_a)
+ target_link_libraries(er spdlog::spdlog)
+ 
+ install(TARGETS er
+-        RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR})
++        RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/bear)
+ 
+ add_library(exec_a OBJECT
+         source/report/libexec/Buffer.cc
+@@ -206,7 +206,7 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+ endif ()
+ 
+ install(TARGETS exec
+-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBEXECDIR})
++        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/bear)
+ 
+ # Create unit test.
+ if (ENABLE_UNIT_TESTS)
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 97ec800..0d136b2 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -53,9 +53,9 @@ if (LIT_EXECUTABLE)
+             -D_BIN_BEAR=${STAGED_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/bear
+             -D_BIN_CITNAMES=${STAGED_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/citnames
+             -D_BIN_INTERCEPT=${STAGED_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/intercept
+-            -D_BIN_ER=${STAGED_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/er
+-            -D_BIN_WRAPPER=${STAGED_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/wrapper.d
+-            -D_LIB_EXEC=${STAGED_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}exec${CMAKE_SHARED_LIBRARY_SUFFIX}
++            -D_BIN_ER=${STAGED_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/bear/er
++            -D_BIN_WRAPPER=${STAGED_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/bear/wrapper.d
++            -D_LIB_EXEC=${STAGED_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/bear/${CMAKE_SHARED_LIBRARY_PREFIX}exec${CMAKE_SHARED_LIBRARY_SUFFIX}
+             -v
+             ${CMAKE_CURRENT_BINARY_DIR})
+ 

diff --git a/bear.missing-includes.patch b/bear.missing-includes.patch
new file mode 100644
index 0000000..7287686
--- /dev/null
+++ b/bear.missing-includes.patch
@@ -0,0 +1,12 @@
+diff --git a/source/libflags/include/libflags/Flags.h b/source/libflags/include/libflags/Flags.h
+index f9c9f93..5fbbd64 100644
+--- a/source/libflags/include/libflags/Flags.h
++++ b/source/libflags/include/libflags/Flags.h
+@@ -21,6 +21,7 @@
+ 
+ #include <list>
+ #include <map>
++#include <optional>
+ #include <string_view>
+ #include <tuple>
+ #include <vector>

diff --git a/bear.spec b/bear.spec
index f6f0f42..c8cdba3 100644
--- a/bear.spec
+++ b/bear.spec
@@ -1,20 +1,30 @@
 Name:           bear
-Version:        2.4.4
+Version:        3.0.6
 Release:        1%{?dist}
 Summary:        Tool that generates a compilation database for clang tooling
 
 License:        GPLv3+
 URL:            https://github.com/rizsotto/%{name}
 Source:         %{URL}/archive/%{version}/%{name}-%{version}.tar.gz
+Patch0:         bear.missing-includes.patch
+# https://github.com/rizsotto/Bear/pull/348
+Patch1:         bear.libexec-subdir.patch
 
 BuildRequires:  cmake
+BuildRequires:  cmake(fmt)
+BuildRequires:  cmake(gtest)
+BuildRequires:  cmake(nlohmann_json)
+BuildRequires:  cmake(spdlog)
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
-BuildRequires:  clang
-BuildRequires:  python%{python3_pkgversion}-devel
-BuildRequires: make
-# python3-lit is only needed for the tests which we only run on Fedora
-%{?fedora:BuildRequires: python3-lit}
+BuildRequires:  make
+BuildRequires:  pkgconfig(grpc)
+BuildRequires:  python3
+BuildRequires:  grpc-plugins
+BuildRequires:  gmock-devel
+
+# Needed for (disabled) functional tests
+#BuildRequires:  python3dist(lit)
 
 %description
 Build ear produces compilation database in JSON format. This database describes
@@ -22,39 +32,35 @@ how single compilation unit should be processed and can be used by Clang
 tooling.
 
 %prep
-%autosetup -n Bear-%{version}
+%autosetup -p 1 -n Bear-%{version}
 
 
 %build
-%cmake .
+# Functional tests are broken for some unknown reason, disable for now.
+%cmake -DENABLE_FUNC_TESTS=OFF
 %cmake_build
 
 %install
 %cmake_install
 
-# Fix shebang line
-for f in %{buildroot}/%{_bindir}/* ; do
-    sed -i.orig "s:^#\!/usr/bin/env\s\+python\s\?$:#!%{__python3}:" $f
-    touch -r $f.orig $f
-    rm $f.orig
-done
-
-# remove twice installed license
-rm %{buildroot}/%{_datadir}/doc/bear/COPYING
+mv %{buildroot}/%{_docdir}/Bear %{buildroot}/%{_docdir}/bear
 
-# Tests fail on EPEL, only run them on Fedora
-%if 0%{?fedora}
 %check
-make check -C %{_vpath_builddir}
-%endif
+# Tests run as part of build, because it's the same build target.
+# There is no check target.
 
 
 %files
 %{_bindir}/bear
-%{_datadir}/bash-completion/completions/bear
+%{_bindir}/citnames
+%{_bindir}/intercept
+%{_libexecdir}/bear/er
+%{_libexecdir}/bear/libexec.so
+%{_libexecdir}/bear/wrapper
+%{_libexecdir}/bear/wrapper.d
 %{_mandir}/man1/bear.1*
-
-%{_libdir}/bear/
+%{_mandir}/man1/citnames.1*
+%{_mandir}/man1/intercept.1*
 
 # rpmbuild on RHEL won't automatically pick up ChangeLog.md & README.md
 %if 0%{?rhel}
@@ -62,9 +68,12 @@ make check -C %{_vpath_builddir}
 %endif
 
 %license COPYING
-%doc ChangeLog.md README.md
+%doc %{_docdir}/bear
 
 %changelog
+* Wed Dec 30 11:58:35 CET 2020 Till Hofmann <thofmann@fedoraproject.org> - 3.0.6-1
+- Update to 3.0.6
+
 * Sun Sep 13 2020 Dan Čermák <dan.cermak@cgc-instruments.com> - 2.4.4-1
 - New upstream release 2.4.4 (rhbz#1877901)
 

diff --git a/sources b/sources
index b623b0e..1490231 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bear-2.4.4.tar.gz) = 4ee3fd5c846149029fe9e4104e2a0d0e318a15215aa80fc5dc376e22ebea510384b02d4d62765495343cab537bacd2b1b0130c00246e081feb4e543761a594e5
+SHA512 (bear-3.0.6.tar.gz) = d1fc6e76064d43d3f4b05c75ff573cc76cd71958d4d3fb7f7d96e74ec992c27d004390328c38e5f76d3aca9f35ed76c95d7f8b656507fad11d052e03e2995b5c