diff --git a/libyang-1.0.184-doc.patch b/libyang-1.0.184-doc.patch new file mode 100644 index 0000000..53a1b69 --- /dev/null +++ b/libyang-1.0.184-doc.patch @@ -0,0 +1,19 @@ +commit 66db639f2c6c1b9dda8cf18e2a212f160b268a3b +Author: Tomas Korbar +Date: Thu Jul 23 09:35:56 2020 +0200 + + Search for libyang.h in build directory + +diff --git a/Doxyfile.in b/Doxyfile.in +index 2534da3..272248e 100644 +--- a/Doxyfile.in ++++ b/Doxyfile.in +@@ -781,7 +781,7 @@ WARN_LOGFILE = + # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING + # Note: If this tag is empty the current directory is searched. + +-INPUT = @CMAKE_BINARY_DIR@/src/libyang.h \ ++INPUT = ./build/src/libyang.h \ + ./src/tree_data.h \ + ./src/tree_schema.h \ + ./src/extensions.h \ diff --git a/libyang.spec b/libyang.spec index 4211c13..961a6e6 100644 --- a/libyang.spec +++ b/libyang.spec @@ -14,6 +14,8 @@ Url: https://github.com/CESNET/libyang Source: %{url}/archive/v%{version}.tar.gz License: BSD +Patch0: libyang-1.0.184-doc.patch + Requires: pcre BuildRequires: cmake BuildRequires: doxygen @@ -72,7 +74,7 @@ Libyang is YANG data modeling language parser and toolkit written (and providing API) in C. %prep -%setup -q +%autosetup %build %cmake \ @@ -84,12 +86,14 @@ written (and providing API) in C. -DGEN_LANGUAGE_BINDINGS=ON \ -DENABLE_VALGRIND_TESTS=%{run_valgrind_tests} .. %cmake_build -pushd x86_64-redhat-linux-gnu +mkdir build +cp ./%_target_platform/src/libyang.h ./build/libyang.h +pushd %_target_platform make doc popd %check -pushd x86_64-redhat-linux-gnu +pushd %_target_platform ctest --output-on-failure -V %{?_smp_mflags} popd @@ -135,6 +139,7 @@ cp -r doc/html %{buildroot}/%{_docdir}/libyang/html %changelog * Wed Jul 22 2020 Tomas Korbar - 1.0.184-1 - Update to 1.0.184 +- Fix build * Fri Jun 19 2020 Tomas Korbar - 1.0.176-1 - Update to 1.0.176