Skip to content

Commit 819598b

Browse files
committed
packages UPDATE libyang dependency package name
1 parent f666a20 commit 819598b

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ set(LIBNETCONF2_MICRO_SOVERSION 5)
5252
set(LIBNETCONF2_SOVERSION_FULL ${LIBNETCONF2_MAJOR_SOVERSION}.${LIBNETCONF2_MINOR_SOVERSION}.${LIBNETCONF2_MICRO_SOVERSION})
5353
set(LIBNETCONF2_SOVERSION ${LIBNETCONF2_MAJOR_SOVERSION})
5454

55+
# libyang SO version required
56+
set(LIBYANG_DEP_SOVERSION_MAJOR 1)
57+
5558
# build options
5659
option(ENABLE_SSH "Enable NETCONF over SSH support (via libssh)" ON)
5760
option(ENABLE_TLS "Enable NETCONF over TLS support (via OpenSSL)" ON)
@@ -147,7 +150,7 @@ endif()
147150

148151
# dependencies - libssh
149152
if(ENABLE_SSH)
150-
find_package(LibSSH 0.7.0 REQUIRED)
153+
find_package(LibSSH 0.7.1 REQUIRED)
151154
if(LIBSSH_VERSION VERSION_EQUAL 0.9.3 OR LIBSSH_VERSION VERSION_EQUAL 0.9.4)
152155
message(FATAL_ERROR "LibSSH ${LIBSSH_VERSION} includes regression bugs and libnetconf2 will NOT work properly, try to use another version")
153156
endif()

packages/debian.control.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 9), gcc
66
Homepage: @GITHUB_URL@
77

88
Package: @PACKAGE@
9-
Depends: libyang (>= 0.16), libssh-4 (>= 0.7.1), libssh-4 (<< 0.9.3) | libssh-4 (>> 0.9.4), ${shlibs:Depends}
9+
Depends: libyang@LIBYANG_DEP_SOVERSION_MAJOR@, libssh-4 (>= 0.7.1), libssh-4 (<< 0.9.3) | libssh-4 (>> 0.9.4), ${shlibs:Depends}
1010
Section: libs
1111
Architecture: any
1212
Description: @PACKAGE_DESC@

packages/libnetconf2.spec.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ Requires: (libssh < 0.9.3 or libssh > 0.9.4)
2020
%endif
2121
%endif
2222

23-
Requires: libyang >= 0.16
23+
Requires: libyang@LIBYANG_DEP_SOVERSION_MAJOR@
2424
Requires: openssl
2525

2626
BuildRequires: cmake
2727
BuildRequires: doxygen
28-
BuildRequires: libyang-devel >= 0.16
28+
BuildRequires: libyang-devel >= @LIBYANG_DEP_SOVERSION_MAJOR@.0
2929
BuildRequires: gcc
3030
BuildRequires: libcmocka-devel
3131
BuildRequires: libssh-devel >= 0.7.1

0 commit comments

Comments
 (0)