From ba42da41361b85f40e1f4ac46515bd69b153c921 Mon Sep 17 00:00:00 2001 From: Tomas Korbar Date: Wed, 19 Jan 2022 09:48:21 +0100 Subject: [PATCH] Fix building of libyang 2 on fedora 34 --- libyang.spec | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/libyang.spec b/libyang.spec index 9f18424..fc21ce2 100644 --- a/libyang.spec +++ b/libyang.spec @@ -8,7 +8,7 @@ Name: libyang Version: 2.0.112 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YANG data modeling language library Url: https://github.com/CESNET/libyang Source: %{url}/archive/v%{version}.tar.gz @@ -63,12 +63,29 @@ written (and providing API) in C. -DENABLE_LYD_PRIV=ON \ -DENABLE_VALGRIND_TESTS=%{run_valgrind_tests} %cmake_build -pushd redhat-linux-build + +%if %fedora == 34 + %ifarch %{arm} + pushd armv7hl-redhat-linux-gnueabi + %else + pushd %{_host} + %endif +%else + pushd redhat-linux-build +%endif make doc popd %check -pushd redhat-linux-build +%if %fedora == 34 + %ifarch %{arm} + pushd armv7hl-redhat-linux-gnueabi + %else + pushd %{_host} + %endif +%else + pushd redhat-linux-build +%endif ctest --output-on-failure -V %{?_smp_mflags} popd @@ -99,6 +116,9 @@ cp -a doc/html %{buildroot}/%{_docdir}/libyang/html %{_docdir}/libyang %changelog +* Wed Jan 19 2022 Tomas Korbar - 2.0.112-2 +- Fix building of libyang 2 on fedora 34 + * Tue Nov 30 2021 Tomas Korbar - 2.0.112-1 - Rebase to version 2.0.112 - Resolves: rhbz#2022586