!7 Split rpm package to avoid main rpm package CUnit dependency

From: @wenchao-hao
Reviewed-by: @wubo009
Signed-off-by: @liuzhiqiang26
This commit is contained in:
openeuler-ci-bot 2020-11-25 11:06:24 +08:00 committed by Gitee
commit 07aed320e0

View File

@ -1,7 +1,8 @@
Name: libiscsi Name: libiscsi
Version: 1.19.0 Version: 1.19.0
Release: 3 Release: 4
Summary: Client-side library to implement the iSCSI protocol Summary: Client-side library to implement the iSCSI protocol
Recommends: %{name}-utils
License: LGPLv2+ and GPLv2+ License: LGPLv2+ and GPLv2+
URL: https://github.com/sahlberg/%{name} URL: https://github.com/sahlberg/%{name}
@ -12,8 +13,6 @@ Source: https://github.com/sahlberg/%{name}/archive/%{version}.tar.gz
BuildRequires: gcc git BuildRequires: gcc git
BuildRequires: autoconf automake libtool popt-devel CUnit-devel libgcrypt-devel rdma-core-devel chrpath BuildRequires: autoconf automake libtool popt-devel CUnit-devel libgcrypt-devel rdma-core-devel chrpath
Provides: %{name}-utils %{name}-utils%{?_isa}
%description %description
Libiscsi is a client-side library to implement the iSCSI protocol that can be used Libiscsi is a client-side library to implement the iSCSI protocol that can be used
to access the resources of an iSCSI target. to access the resources of an iSCSI target.
@ -73,17 +72,18 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description help %description help
This package contains the help info for %{name}. This package contains the help info for %{name}.
%package utils
Summary: Client utilities for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description utils
This package contains utilities of %{name} to connect to iSCSI targets
%files %files
%license COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt %license COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt
%doc README TODO %doc README TODO
%dir %{_libdir}/iscsi %dir %{_libdir}/iscsi
%{_libdir}/iscsi/libiscsi.so.* %{_libdir}/iscsi/libiscsi.so.*
%{_bindir}/iscsi-ls
%{_bindir}/iscsi-inq
%{_bindir}/iscsi-readcapacity16
%{_bindir}/iscsi-swp
%{_bindir}/iscsi-perf
%{_bindir}/iscsi-test-cu
%config /etc/ld.so.conf.d/* %config /etc/ld.so.conf.d/*
%files devel %files devel
@ -99,7 +99,22 @@ This package contains the help info for %{name}.
%{_mandir}/man1/iscsi-swp.1.gz %{_mandir}/man1/iscsi-swp.1.gz
%{_mandir}/man1/iscsi-test-cu.1.gz %{_mandir}/man1/iscsi-test-cu.1.gz
%files utils
%{_bindir}/iscsi-ls
%{_bindir}/iscsi-inq
%{_bindir}/iscsi-readcapacity16
%{_bindir}/iscsi-swp
%{_bindir}/iscsi-perf
%{_bindir}/iscsi-test-cu
%changelog %changelog
* Fri Nov 20 2020 haowenchao <haowenchao@huawei.com> - 1.19.0-4
- Split rpm package to avoid main rpm package CUnit dependency
Previous implement place executable files in main package which leading
to dependency of CUnit. This change add a package utils and move
these executable files to utils package to avoid main package's CUnit
dependency, making main package weak depend on libiscsi-utils
* Wed Nov 4 2020 lixiaokeng <lixiaokeng@huawei.com> - 1.19.0-3 * Wed Nov 4 2020 lixiaokeng <lixiaokeng@huawei.com> - 1.19.0-3
- add make check - add make check