From a761f0092de5fbb0a70883c24535b811bb372e21 Mon Sep 17 00:00:00 2001 From: Wenchao Hao Date: Wed, 25 Nov 2020 18:05:56 +0800 Subject: [PATCH] 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 Signed-off-by: Wenchao Hao --- libiscsi.spec | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/libiscsi.spec b/libiscsi.spec index d1751ec..3c21e33 100644 --- a/libiscsi.spec +++ b/libiscsi.spec @@ -1,7 +1,8 @@ Name: libiscsi Version: 1.18.0 -Release: 6 +Release: 7 Summary: Client-side library to implement the iSCSI protocol +Recommends: %{name}-utils License: LGPLv2+ and GPLv2+ URL: https://github.com/sahlberg/%{name} @@ -17,13 +18,10 @@ Patch6001: 6001-sync-fix-return-value-for-various-sync-commands.patch BuildRequires: gcc git BuildRequires: autoconf automake libtool popt-devel CUnit-devel libgcrypt-devel rdma-core-devel chrpath -Provides: %{name}-utils %{name}-utils%{?_isa} - %description Libiscsi is a client-side library to implement the iSCSI protocol that can be used to access the resources of an iSCSI target. - ####################################################################### # Conflict with iscsi-initiator-utils. @@ -75,17 +73,18 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description help 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 %license COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt %doc README TODO %dir %{_libdir}/iscsi %{_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/* %files devel @@ -101,6 +100,21 @@ This package contains the help info for %{name}. %{_mandir}/man1/iscsi-swp.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 +* Fri Nov 20 2020 haowenchao - 1.18.0-7 +- 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 + * Sat Aug 31 2019 mingfangsen - 1.18.0-6 - Package init -- Gitee