5:16 a.m.
The package rpms/libyang.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/libyang.git/commit/?id=ce479fcf9c....
Change:
+%ifarch %{arm} ppc64le
Thanks.
Full change:
============
commit ba42da41361b85f40e1f4ac46515bd69b153c921
Author: Tomas Korbar <tkorbar(a)redhat.com>
Date: Wed Jan 19 09:48:21 2022 +0100
Fix building of libyang 2 on fedora 34
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 <tkorbar(a)redhat.com> - 2.0.112-2
+- Fix building of libyang 2 on fedora 34
+
* Tue Nov 30 2021 Tomas Korbar <tkorbar(a)redhat.com> - 2.0.112-1
- Rebase to version 2.0.112
- Resolves: rhbz#2022586
commit e418fd09e83b1339681ba967d5cf20125d9f4a4b
Author: Tomas Korbar <tkorbar(a)redhat.com>
Date: Tue Nov 30 10:22:52 2021 +0100
Rebase to version 2.0.112
Resolves: rhbz#2022586
diff --git a/.gitignore b/.gitignore
index c06fd1a..322c04d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
/v2.0.7.tar.gz
/v2.0.88.tar.gz
/v2.0.97.tar.gz
+/v2.0.112.tar.gz
diff --git a/libyang.spec b/libyang.spec
index 5c70808..9f18424 100644
--- a/libyang.spec
+++ b/libyang.spec
@@ -7,7 +7,7 @@
%endif
Name: libyang
-Version: 2.0.97
+Version: 2.0.112
Release: 1%{?dist}
Summary: YANG data modeling language library
Url: https://github.com/CESNET/libyang
@@ -99,6 +99,10 @@ cp -a doc/html %{buildroot}/%{_docdir}/libyang/html
%{_docdir}/libyang
%changelog
+* Tue Nov 30 2021 Tomas Korbar <tkorbar(a)redhat.com> - 2.0.112-1
+- Rebase to version 2.0.112
+- Resolves: rhbz#2022586
+
* Mon Oct 11 2021 Tomas Korbar <tkorbar(a)redhat.com> - 2.0.97-1
- Rebase to version 2.0.97
- Resolves: rhbz#2012348
diff --git a/sources b/sources
index 749161d..9155275 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.0.97.tar.gz) =
f97f29703f49ef22d04ecf3071d4437417ca95fd0cc2a696269ff646076cca15236874c40ef6a891f1ed4a1173600ba4c6cdd5e0879356b53414c4f0c415c389
+SHA512 (v2.0.112.tar.gz) =
5da463b86656b9fc944925777a488b3306ef1a1e7efdaf4af677960a04b5544605126bb7e0441e55686b80f97fca70fe86605d0e7c64f634b4297dcc7bd779db
commit c65c73d79ca0ca8b506cf20687eee9671991e232
Author: Tomas Korbar <tkorbar(a)redhat.com>
Date: Mon Oct 11 12:00:06 2021 +0200
Rebase to version 2.0.97
Resolves: rhbz#2012348
diff --git a/.gitignore b/.gitignore
index 0bb5bc7..c06fd1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
/v1.0.225.tar.gz
/v2.0.7.tar.gz
/v2.0.88.tar.gz
+/v2.0.97.tar.gz
diff --git a/libyang.spec b/libyang.spec
index 3a89633..5c70808 100644
--- a/libyang.spec
+++ b/libyang.spec
@@ -7,7 +7,7 @@
%endif
Name: libyang
-Version: 2.0.88
+Version: 2.0.97
Release: 1%{?dist}
Summary: YANG data modeling language library
Url: https://github.com/CESNET/libyang
@@ -99,6 +99,10 @@ cp -a doc/html %{buildroot}/%{_docdir}/libyang/html
%{_docdir}/libyang
%changelog
+* Mon Oct 11 2021 Tomas Korbar <tkorbar(a)redhat.com> - 2.0.97-1
+- Rebase to version 2.0.97
+- Resolves: rhbz#2012348
+
* Thu Sep 30 2021 Tomas Korbar <tkorbar(a)redhat.com> - 2.0.88-1
- Rebase to version 2.0.88
- Resolves: rhbz#2007673
diff --git a/sources b/sources
index 4d75dfe..749161d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.0.88.tar.gz) =
8fcc052e8648f65dde2bac46370d496ba7682000de1818b4f7bdab12817922875382b827b61ff62d586e1d1e8b4f2f69028eb4b9808ef05c984174f050604258
+SHA512 (v2.0.97.tar.gz) =
f97f29703f49ef22d04ecf3071d4437417ca95fd0cc2a696269ff646076cca15236874c40ef6a891f1ed4a1173600ba4c6cdd5e0879356b53414c4f0c415c389
commit ff76938efc6e569dddb44c9f654779c44ae940e2
Author: Tomas Korbar <tkorbar(a)redhat.com>
Date: Thu Sep 30 14:20:13 2021 +0200
Rebase to version 2.0.88
Resolves: rhbz#2007673
diff --git a/.gitignore b/.gitignore
index a6aeffa..0bb5bc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/v1.0.215.tar.gz
/v1.0.225.tar.gz
/v2.0.7.tar.gz
+/v2.0.88.tar.gz
diff --git a/libyang.spec b/libyang.spec
index 33d95ef..3a89633 100644
--- a/libyang.spec
+++ b/libyang.spec
@@ -7,7 +7,7 @@
%endif
Name: libyang
-Version: 2.0.7
+Version: 2.0.88
Release: 1%{?dist}
Summary: YANG data modeling language library
Url: https://github.com/CESNET/libyang
@@ -87,6 +87,7 @@ cp -a doc/html %{buildroot}/%{_docdir}/libyang/html
%{_bindir}/yanglint
%{_bindir}/yangre
%{_datadir}/man/man1/yanglint.1.gz
+%{_datadir}/man/man1/yangre.1.gz
%files devel
%{_libdir}/libyang.so
@@ -98,6 +99,10 @@ cp -a doc/html %{buildroot}/%{_docdir}/libyang/html
%{_docdir}/libyang
%changelog
+* Thu Sep 30 2021 Tomas Korbar <tkorbar(a)redhat.com> - 2.0.88-1
+- Rebase to version 2.0.88
+- Resolves: rhbz#2007673
+
* Fri Aug 06 2021 Tomas Korbar <tkorbar(a)redhat.com> - 2.0.7-1
- Rebase to version 2.0.7
- Resolves: rhbz#1959645
diff --git a/sources b/sources
index 470802c..4d75dfe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.0.7.tar.gz) =
edb1d8d372b25ed820fa312e0dc96d4af7c8cd5ddeb785964de73f64774062ea7a5586bb27e2039ad24189d4a2ba04268921ca86e82423fc48647d1d10a2a0a7
+SHA512 (v2.0.88.tar.gz) =
8fcc052e8648f65dde2bac46370d496ba7682000de1818b4f7bdab12817922875382b827b61ff62d586e1d1e8b4f2f69028eb4b9808ef05c984174f050604258
commit a723f13b9d332f45845bdab8d3f095ef19e5f812
Author: Tomas Korbar <tkorbar(a)redhat.com>
Date: Mon Aug 16 14:01:05 2021 +0200
Remove not needed build requirements
diff --git a/libyang.spec b/libyang.spec
index c012296..33d95ef 100644
--- a/libyang.spec
+++ b/libyang.spec
@@ -16,18 +16,11 @@ License: BSD
BuildRequires: cmake
BuildRequires: doxygen
-BuildRequires: pcre2-devel
BuildRequires: gcc
-BuildRequires: gcc-c++
-BuildRequires: graphviz
-BuildRequires: libcmocka-devel
-BuildRequires: make
-BuildRequires: pcre-devel
-BuildRequires: python3-devel
-BuildRequires: flex
-BuildRequires: bison
-BuildRequires: graphviz
+BuildRequires: cmake(cmocka) >= 1.0.0
BuildRequires: make
+BuildRequires: pkgconfig(libpcre2-8) >= 10.21
+BuildRequires: valgrind
Conflicts: %{name} < 1.0.225-3
Obsoletes: libyang2
commit 0a1d2380f6a6397dcde783425fecc6f47f55aeac
Author: Tomas Korbar <tkorbar(a)redhat.com>
Date: Wed Aug 11 09:21:01 2021 +0200
Fix rebase to version 2
diff --git a/libyang.spec b/libyang.spec
index a8e080b..c012296 100644
--- a/libyang.spec
+++ b/libyang.spec
@@ -29,6 +29,9 @@ BuildRequires: bison
BuildRequires: graphviz
BuildRequires: make
+Conflicts: %{name} < 1.0.225-3
+Obsoletes: libyang2
+
%package devel
Summary: Development files for libyang
Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -38,20 +41,24 @@ Requires: pcre2-devel
Summary: Documentation of libyang API
Requires: %{name}%{?_isa} = %{version}-%{release}
+%package tools
+Summary: YANG validator tools
+Requires: %{name}%{?_isa} = %{version}-%{release}
+# This was not properly split out before
+Conflicts: %{name} < 1.0.225-3
+
%description devel
Headers of libyang library.
%description devel-doc
Documentation of libyang API.
-%description cpp
-Bindings of libyang library to C++ language.
+%description tools
+YANG validator tools.
-%description cpp-devel
-Headers of bindings to c++ language.
-
-%description -n python3-libyang
-Bindings of libyang library to python language.
+%description
+Libyang is YANG data modeling language parser and toolkit
+written (and providing API) in C.
%prep
%autosetup -p1
@@ -80,38 +87,22 @@ cp -a doc/html %{buildroot}/%{_docdir}/libyang/html
%files
%license LICENSE
-%{_libdir}/libyang.so.%{somajor}{,.*}
-%{_libdir}/libyang%{somajor}/
+%{_libdir}/libyang.so.2
+%{_libdir}/libyang.so.2.*
%files tools
%{_bindir}/yanglint
%{_bindir}/yangre
%{_datadir}/man/man1/yanglint.1.gz
-%{_libdir}/libyang.so.2
-%{_libdir}/libyang.so.2.*
%files devel
-%dir %{_includedir}/libyang/
-%{_includedir}/libyang/*.h
%{_libdir}/libyang.so
%{_libdir}/pkgconfig/libyang.pc
+%{_includedir}/libyang/*.h
+%dir %{_includedir}/libyang/
%files devel-doc
-%{_docdir}/libyang/
-
-%files cpp
-%{_libdir}/libyang-cpp.so.%{somajor}{,.*}
-
-%files cpp-devel
-%dir %{_includedir}/libyang/
-%{_includedir}/libyang/*.hpp
-%{_libdir}/libyang-cpp.so
-%{_libdir}/pkgconfig/libyang-cpp.pc
-
-%files -n python3-libyang
-%{python3_sitearch}/yang.py
-%{python3_sitearch}/_yang.so
-%{python3_sitearch}/__pycache__/yang*
+%{_docdir}/libyang
%changelog
* Fri Aug 06 2021 Tomas Korbar <tkorbar(a)redhat.com> - 2.0.7-1
commit 5aebfb0d2c239c84ec92ac29d1f8fd9112dd7969
Author: Tomas Korbar <tkorbar(a)redhat.com>
Date: Fri Aug 6 14:28:28 2021 +0200
Remove merge signs from specfile
diff --git a/libyang.spec b/libyang.spec
index 7a8d0f4..a8e080b 100644
--- a/libyang.spec
+++ b/libyang.spec
@@ -99,7 +99,6 @@ cp -a doc/html %{buildroot}/%{_docdir}/libyang/html
%files devel-doc
%{_docdir}/libyang/
-<<<<<<< HEAD
%files cpp
%{_libdir}/libyang-cpp.so.%{somajor}{,.*}
commit e84f669919e040ca4b8475c5d433c182fa73ae39
Author: Tomas Korbar <tkorbar(a)redhat.com>
Date: Tue Jun 1 08:10:00 2021 +0200
Rebase to version 2.0.7
Resolves: rhbz#1959645
diff --git a/.gitignore b/.gitignore
index 48e9bd2..a6aeffa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,4 @@
/v1.0.184.tar.gz
/v1.0.215.tar.gz
/v1.0.225.tar.gz
-/libyang-1.0.225.tar.gz
+/v2.0.7.tar.gz
diff --git a/libyang.spec b/libyang.spec
index b8ce159..7a8d0f4 100644
--- a/libyang.spec
+++ b/libyang.spec
@@ -6,24 +6,17 @@
%global run_valgrind_tests ON
%endif
-# Use arch-independent builddir
-%global _vpath_builddir %{_vendor}-%{_target_os}-build
+Name: libyang
+Version: 2.0.7
+Release: 1%{?dist}
+Summary: YANG data modeling language library
+Url: https://github.com/CESNET/libyang
+Source: %{url}/archive/v%{version}.tar.gz
+License: BSD
-# library soname major version
-%global somajor 1
-
-Name: libyang
-Version: 1.0.225
-Release: 4%{?dist}
-Summary: YANG data modeling language library
-License: BSD
-URL: https://github.com/CESNET/libyang
-Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
-
-BuildRequires: bison
BuildRequires: cmake
BuildRequires: doxygen
-BuildRequires: flex
+BuildRequires: pcre2-devel
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: graphviz
@@ -31,48 +24,19 @@ BuildRequires: libcmocka-devel
BuildRequires: make
BuildRequires: pcre-devel
BuildRequires: python3-devel
-BuildRequires: swig >= 3.0.12
-BuildRequires: valgrind
-
-# This was not properly split out before
-Conflicts: %{name} < 1.0.225-3
-
-%package tools
-Summary: YANG validator tools
-Requires: %{name}%{?_isa} = %{version}-%{release}
-# This was not properly split out before
-Conflicts: %{name} < 1.0.225-3
+BuildRequires: flex
+BuildRequires: bison
+BuildRequires: graphviz
+BuildRequires: make
%package devel
-Summary: Development files for libyang
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: pcre-devel
+Summary: Development files for libyang
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: pcre2-devel
%package devel-doc
-Summary: Documentation of libyang API
-Requires: %{name}-devel = %{version}-%{release}
-BuildArch: noarch
-
-%package cpp
-Summary: C++ bindings for libyang
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%package cpp-devel
-Summary: Development files for libyang-cpp
-Requires: %{name}-cpp%{?_isa} = %{version}-%{release}
-Requires: pcre-devel
-
-%package -n python3-libyang
-Summary: Python3 bindings for libyang
-Requires: %{name}-cpp%{?_isa} = %{version}-%{release}
-%{?python_provide:%python_provide python3-libyang}
-
-%description
-Libyang is YANG data modeling language parser and toolkit
-written (and providing API) in C.
-
-%description tools
-YANG validator tools.
+Summary: Documentation of libyang API
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
Headers of libyang library.
@@ -97,18 +61,16 @@ Bindings of libyang library to python language.
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-DCMAKE_BUILD_TYPE:String="Package" \
-DENABLE_LYD_PRIV=ON \
- -DGEN_JAVA_BINDINGS=OFF \
- -DGEN_JAVASCRIPT_BINDINGS=OFF \
- -DGEN_LANGUAGE_BINDINGS=ON \
-DENABLE_VALGRIND_TESTS=%{run_valgrind_tests}
-
%cmake_build
-
-# Build documentation
-%cmake_build --target doc
+pushd redhat-linux-build
+make doc
+popd
%check
-%ctest
+pushd redhat-linux-build
+ctest --output-on-failure -V %{?_smp_mflags}
+popd
%install
%cmake_install
@@ -124,8 +86,9 @@ cp -a doc/html %{buildroot}/%{_docdir}/libyang/html
%files tools
%{_bindir}/yanglint
%{_bindir}/yangre
-%{_mandir}/man1/yanglint.1*
-%{_mandir}/man1/yangre.1*
+%{_datadir}/man/man1/yanglint.1.gz
+%{_libdir}/libyang.so.2
+%{_libdir}/libyang.so.2.*
%files devel
%dir %{_includedir}/libyang/
@@ -136,6 +99,7 @@ cp -a doc/html %{buildroot}/%{_docdir}/libyang/html
%files devel-doc
%{_docdir}/libyang/
+<<<<<<< HEAD
%files cpp
%{_libdir}/libyang-cpp.so.%{somajor}{,.*}
@@ -151,6 +115,10 @@ cp -a doc/html %{buildroot}/%{_docdir}/libyang/html
%{python3_sitearch}/__pycache__/yang*
%changelog
+* Fri Aug 06 2021 Tomas Korbar <tkorbar(a)redhat.com> - 2.0.7-1
+- Rebase to version 2.0.7
+- Resolves: rhbz#1959645
+
* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
1.0.225-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
diff --git a/sources b/sources
index 5357409..470802c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libyang-1.0.225.tar.gz) =
3366df8c2869454b6da456010ca62b538876cba16fa84e1ed9053acca6d7756c15329c0fb8a62477a1887d6c00cce8449f29954b2d2b0e556d81baa11dc9776d
+SHA512 (v2.0.7.tar.gz) =
edb1d8d372b25ed820fa312e0dc96d4af7c8cd5ddeb785964de73f64774062ea7a5586bb27e2039ad24189d4a2ba04268921ca86e82423fc48647d1d10a2a0a7
commit 94cc0824547e4595e0d9ef070ea27ee1a2887630
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 22 12:50:34 2021 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/libyang.spec b/libyang.spec
index f83ac63..b8ce159 100644
--- a/libyang.spec
+++ b/libyang.spec
@@ -14,7 +14,7 @@
Name: libyang
Version: 1.0.225
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: YANG data modeling language library
License: BSD
URL: https://github.com/CESNET/libyang
@@ -151,6 +151,9 @@ cp -a doc/html %{buildroot}/%{_docdir}/libyang/html
%{python3_sitearch}/__pycache__/yang*
%changelog
+* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
1.0.225-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
* Sat Jul 10 2021 Neal Gompa <ngompa(a)datto.com> - 1.0.225-3
- Clean up the spec file for legibility and modern spec standards
- Split out tools into their own subpackage
commit ce479fcf9c50d4351085f2ff90f4e03cd20441d3
Author: Neal Gompa <ngompa(a)datto.com>
Date: Sat Jul 10 09:53:36 2021 -0400
Clean up the spec file for legibility and modern spec standards
- Split out tools into their own subpackage
- Remove archfulness from the build path to fix documentation build
diff --git a/.gitignore b/.gitignore
index 9c68509..48e9bd2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/v1.0.184.tar.gz
/v1.0.215.tar.gz
/v1.0.225.tar.gz
+/libyang-1.0.225.tar.gz
diff --git a/libyang-1.0.184-doc.patch b/libyang-1.0.184-doc.patch
deleted file mode 100644
index 53a1b69..0000000
--- a/libyang-1.0.184-doc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 66db639f2c6c1b9dda8cf18e2a212f160b268a3b
-Author: Tomas Korbar <tkorbar(a)redhat.com>
-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(a)/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 4283396..f83ac63 100644
--- a/libyang.spec
+++ b/libyang.spec
@@ -1,68 +1,78 @@
# valgrind finds invalid writes in libcmocka on arm and power
# see bug #1699304 for more information
-%ifarch %arm ppc64le
+%ifarch %{arm} ppc64le
%global run_valgrind_tests OFF
%else
%global run_valgrind_tests ON
%endif
-Name: libyang
-Version: 1.0.225
-Release: 2%{?dist}
-Summary: YANG data modeling language library
-Url: https://github.com/CESNET/libyang
-Source: %{url}/archive/v%{version}.tar.gz
-License: BSD
+# Use arch-independent builddir
+%global _vpath_builddir %{_vendor}-%{_target_os}-build
-Patch0: libyang-1.0.184-doc.patch
+# library soname major version
+%global somajor 1
-Requires: pcre
+Name: libyang
+Version: 1.0.225
+Release: 3%{?dist}
+Summary: YANG data modeling language library
+License: BSD
+URL: https://github.com/CESNET/libyang
+Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+
+BuildRequires: bison
BuildRequires: cmake
BuildRequires: doxygen
-BuildRequires: pcre-devel
+BuildRequires: flex
BuildRequires: gcc
-BuildRequires: valgrind
BuildRequires: gcc-c++
-BuildRequires: swig >= 3.0.12
+BuildRequires: graphviz
BuildRequires: libcmocka-devel
+BuildRequires: make
+BuildRequires: pcre-devel
BuildRequires: python3-devel
-BuildRequires: flex
-BuildRequires: bison
-BuildRequires: graphviz
-BuildRequires: make
+BuildRequires: swig >= 3.0.12
+BuildRequires: valgrind
+
+# This was not properly split out before
+Conflicts: %{name} < 1.0.225-3
+
+%package tools
+Summary: YANG validator tools
+Requires: %{name}%{?_isa} = %{version}-%{release}
+# This was not properly split out before
+Conflicts: %{name} < 1.0.225-3
%package devel
-Summary: Development files for libyang
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: pcre-devel
+Summary: Development files for libyang
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: pcre-devel
%package devel-doc
-Summary: Documentation of libyang API
-Requires: %{name} = %{version}-%{release}
-BuildArch: noarch
+Summary: Documentation of libyang API
+Requires: %{name}-devel = %{version}-%{release}
+BuildArch: noarch
-%package -n libyang-cpp
-Summary: C++ bindings for libyang
-Requires: %{name}%{?_isa} = %{version}-%{release}
+%package cpp
+Summary: C++ bindings for libyang
+Requires: %{name}%{?_isa} = %{version}-%{release}
-%package -n libyang-cpp-devel
-Summary: Development files for libyang-cpp
-Requires: libyang-cpp%{?_isa} = %{version}-%{release}
-Requires: pcre-devel
+%package cpp-devel
+Summary: Development files for libyang-cpp
+Requires: %{name}-cpp%{?_isa} = %{version}-%{release}
+Requires: pcre-devel
%package -n python3-libyang
-Summary: Python3 bindings for libyang
-Requires: libyang-cpp%{?_isa} = %{version}-%{release}
+Summary: Python3 bindings for libyang
+Requires: %{name}-cpp%{?_isa} = %{version}-%{release}
%{?python_provide:%python_provide python3-libyang}
-%description -n libyang-cpp
-Bindings of libyang library to C++ language.
-
-%description -n libyang-cpp-devel
-Headers of bindings to c++ language.
+%description
+Libyang is YANG data modeling language parser and toolkit
+written (and providing API) in C.
-%description -n python3-libyang
-Bindings of libyang library to python language.
+%description tools
+YANG validator tools.
%description devel
Headers of libyang library.
@@ -70,67 +80,70 @@ Headers of libyang library.
%description devel-doc
Documentation of libyang API.
-%description
-Libyang is YANG data modeling language parser and toolkit
-written (and providing API) in C.
+%description cpp
+Bindings of libyang library to C++ language.
+
+%description cpp-devel
+Headers of bindings to c++ language.
+
+%description -n python3-libyang
+Bindings of libyang library to python language.
%prep
-%autosetup
+%autosetup -p1
%build
%cmake \
- -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-DCMAKE_BUILD_TYPE:String="Package" \
-DENABLE_LYD_PRIV=ON \
-DGEN_JAVA_BINDINGS=OFF \
-DGEN_JAVASCRIPT_BINDINGS=OFF \
-DGEN_LANGUAGE_BINDINGS=ON \
- -DENABLE_VALGRIND_TESTS=%{run_valgrind_tests} ..
+ -DENABLE_VALGRIND_TESTS=%{run_valgrind_tests}
+
%cmake_build
-mkdir build
-cp ./%_target_platform/src/libyang.h ./build/libyang.h
-pushd %_target_platform
-make doc
-popd
+
+# Build documentation
+%cmake_build --target doc
%check
-pushd %_target_platform
-ctest --output-on-failure -V %{?_smp_mflags}
-popd
+%ctest
%install
%cmake_install
+
mkdir -m0755 -p %{buildroot}/%{_docdir}/libyang
-cp -r doc/html %{buildroot}/%{_docdir}/libyang/html
+cp -a doc/html %{buildroot}/%{_docdir}/libyang/html
%files
%license LICENSE
+%{_libdir}/libyang.so.%{somajor}{,.*}
+%{_libdir}/libyang%{somajor}/
+
+%files tools
%{_bindir}/yanglint
%{_bindir}/yangre
-%{_datadir}/man/man1/yanglint.1.gz
-%{_datadir}/man/man1/yangre.1.gz
-%{_libdir}/libyang.so.1
-%{_libdir}/libyang.so.1.*
-%{_libdir}/libyang1
+%{_mandir}/man1/yanglint.1*
+%{_mandir}/man1/yangre.1*
%files devel
+%dir %{_includedir}/libyang/
+%{_includedir}/libyang/*.h
%{_libdir}/libyang.so
%{_libdir}/pkgconfig/libyang.pc
-%{_includedir}/libyang/*.h
-%dir %{_includedir}/libyang/
%files devel-doc
-%{_docdir}/libyang
+%{_docdir}/libyang/
-%files -n libyang-cpp
-%{_libdir}/libyang-cpp.so.1
-%{_libdir}/libyang-cpp.so.1.*
+%files cpp
+%{_libdir}/libyang-cpp.so.%{somajor}{,.*}
-%files -n libyang-cpp-devel
-%{_libdir}/libyang-cpp.so
+%files cpp-devel
+%dir %{_includedir}/libyang/
%{_includedir}/libyang/*.hpp
+%{_libdir}/libyang-cpp.so
%{_libdir}/pkgconfig/libyang-cpp.pc
-%dir %{_includedir}/libyang/
%files -n python3-libyang
%{python3_sitearch}/yang.py
@@ -138,6 +151,11 @@ cp -r doc/html %{buildroot}/%{_docdir}/libyang/html
%{python3_sitearch}/__pycache__/yang*
%changelog
+* Sat Jul 10 2021 Neal Gompa <ngompa(a)datto.com> - 1.0.225-3
+- Clean up the spec file for legibility and modern spec standards
+- Split out tools into their own subpackage
+- Remove archfulness from the build path to fix documentation build
+
* Fri Jun 04 2021 Python Maint <python-maint(a)redhat.com> - 1.0.225-2
- Rebuilt for Python 3.10
diff --git a/sources b/sources
index ff4eb17..5357409 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.0.225.tar.gz) =
3366df8c2869454b6da456010ca62b538876cba16fa84e1ed9053acca6d7756c15329c0fb8a62477a1887d6c00cce8449f29954b2d2b0e556d81baa11dc9776d
+SHA512 (libyang-1.0.225.tar.gz) =
3366df8c2869454b6da456010ca62b538876cba16fa84e1ed9053acca6d7756c15329c0fb8a62477a1887d6c00cce8449f29954b2d2b0e556d81baa11dc9776d
commit 2dffb43a8dc7f9a7ef5a0fb4e16407904903b86c
Author: Python Maint <python-maint(a)redhat.com>
Date: Fri Jun 4 20:10:31 2021 +0200
Rebuilt for Python 3.10
diff --git a/libyang.spec b/libyang.spec
index d3f59b1..4283396 100644
--- a/libyang.spec
+++ b/libyang.spec
@@ -8,7 +8,7 @@
Name: libyang
Version: 1.0.225
-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
@@ -138,6 +138,9 @@ cp -r doc/html %{buildroot}/%{_docdir}/libyang/html
%{python3_sitearch}/__pycache__/yang*
%changelog
+* Fri Jun 04 2021 Python Maint <python-maint(a)redhat.com> - 1.0.225-2
+- Rebuilt for Python 3.10
+
* Tue Mar 09 2021 Tomas Korbar <tkorbar(a)redhat.com> - 1.0.225-1
- Rebase to version 1.0.225
- Resolves: rhbz#1936718