Skip to content

Commit 3b73a08

Browse files
PavolVicanrkrejci
authored andcommitted
package BUGFIX bad dependency and debug package
1 parent bf0d500 commit 3b73a08

1 file changed

Lines changed: 5 additions & 43 deletions

File tree

packages/libnetconf2.spec.in

Lines changed: 5 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -7,36 +7,23 @@ Source: %{url}/archive/@BRANCH@.tar.gz
77
License: BSD-3-Clause
88
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
99

10-
%define debug_package %{nil}
11-
1210
Requires: libnetconf2-@LIBNETCONF2_MAJOR_VERSION@_@LIBNETCONF2_MINOR_VERSION@ = %{version}-%{release}
1311
BuildRequires: libyang@COMPAT_PACKAGES@-devel
1412
BuildRequires: libssh-devel >= 0.7.1
1513
BuildRequires: openssl-devel
1614
BuildRequires: valgrind
15+
BuildRequires: cmake
1716
BuildRequires: libcmocka-devel
1817
BuildRequires: gcc
1918
%if 0%{?suse_version}
2019
BuildRequires: timezone
2120
%endif
22-
23-
%package debuginfo
24-
Summary: Debug symbol for libnetnconf2 library
25-
Requires: %{name} = %{version}-%{release}
26-
27-
%if 0%{?suse_version}
28-
%package debugsource
29-
Summary: Debug information for libnetnconf2 library
30-
Requires: %{name} = %{version}-%{release}
31-
32-
%description debugsource
33-
This package provides debug information for package libnetconf2. Debug information is useful when developing applications that use this package or when debugging this package.
34-
35-
%endif
21+
Conflicts: @CONFLICT_PACKAGE_NAME@
3622

3723
%package -n libnetconf2-@LIBNETCONF2_MAJOR_VERSION@_@LIBNETCONF2_MINOR_VERSION@
3824
Summary: Libnetconf2 library
39-
Requires: libyang
25+
Requires: libyang@COMPAT_PACKAGES@
26+
Requires: %{name} = %{version}-%{release}
4027

4128
%package devel
4229
Summary: Headers of libnetconf2 library
@@ -49,25 +36,21 @@ Libnetconf2 is a NETCONF library in C intended for building NETCONF clients and
4936
%description devel
5037
Headers of libnetconf2 library.
5138

52-
%description debuginfo
53-
This package provides debug information for package libnetconf2. Debug information is useful when developing applications that use this package or when debugging this package.
54-
5539
%description
5640
Libnetconf2 is a NETCONF library in C intended for building NETCONF clients and servers.
5741

5842
%prep
5943
%setup -n libnetconf2-@BRANCH@
6044

6145
%build
62-
cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -D CMAKE_BUILD_TYPE:String="@BUILD_TYPE@" .
46+
cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -D CMAKE_BUILD_TYPE:String="@BUILD_TYPE@" -D ENABLE_VALGRIND_TESTS:BOOL=FALSE .
6347
make
6448

6549
%check
6650
ctest --output-on-failure
6751

6852
%install
6953
make DESTDIR=%{buildroot} install
70-
/usr/lib/rpm/find-debuginfo.sh
7154

7255
%post -n libnetconf2-@LIBNETCONF2_MAJOR_VERSION@_@LIBNETCONF2_MINOR_VERSION@ -p /sbin/ldconfig
7356

@@ -90,25 +73,4 @@ make DESTDIR=%{buildroot} install
9073
%{_includedir}/nc_server.h
9174
%dir %{_includedir}/libnetconf2/
9275

93-
%if 0%{?suse_version}
94-
%files debuginfo
95-
%defattr(-,root,root)
96-
%{_prefix}/lib/debug/*
97-
%{_prefix}/lib/debug/.build-id/*
98-
%{_usrsrc}/debug/*
99-
100-
%files debugsource
101-
%defattr(-,root,root)
102-
%{_usrsrc}/debug/*
103-
104-
%else
105-
%files debuginfo
106-
%defattr(-,root,root)
107-
%{_prefix}/lib/debug/*
108-
%{_prefix}/lib/debug/.build-id/*
109-
%{_usrsrc}/debug/*
110-
111-
%endif
112-
11376
%changelog
114-

0 commit comments

Comments
 (0)