From c6f3d06d27dbaa7a8a6d7aaa3eb6f83cbdbed850 Mon Sep 17 00:00:00 2001 From: eulerstorage Date: Sun, 12 Jan 2020 10:52:04 +0800 Subject: [PATCH 1/5] fix the wrong week date in changelog --- udisks2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/udisks2.spec b/udisks2.spec index 28202fd..d61c8e9 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -443,7 +443,7 @@ udevadm trigger - SUG:NA - DESC:avoid errors during installation and uninstallation -* Tue Sep 05 2019 suweifeng - 2.8.1-2 +* Thu Sep 05 2019 suweifeng - 2.8.1-2 - Type:enhancemnet - ID:NA - SUG:NA -- Gitee From 7c0960accf96a17d84f9fe3c67e23c324e2e9589 Mon Sep 17 00:00:00 2001 From: eulerstorage Date: Sun, 12 Jan 2020 11:15:34 +0800 Subject: [PATCH 2/5] Change the requires from iscsi-initiator-utils to open-iscsi --- udisks2.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/udisks2.spec b/udisks2.spec index d61c8e9..629f4bc 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -60,7 +60,7 @@ Name: udisks2 Summary: Disk Manager Version: 2.8.1 %if %{is_git} == 0 -Release: 3 +Release: 4 %else Release: 0.%{build_date}git%{git_hash}%{?dist} %endif @@ -157,8 +157,8 @@ Summary: Module for iSCSI Group: System Environment/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} License: LGPLv2+ -Requires: iscsi-initiator-utils -BuildRequires: iscsi-initiator-utils-devel +Requires: open-iscsi +BuildRequires: open-iscsi-devel Provides: storaged-iscsi = %{version}-%{release} Obsoletes: storaged-iscsi @@ -437,6 +437,12 @@ udevadm trigger %endif %changelog +* Sun Jan 12 2020 openEuler Buildteam - 2.8.1-4 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:revise the bogus date in changelog and iscsi-initiator-utils to open-iscsi + * Tue Dec 24 2019 openEuler Buildteam - 2.8.1-3 - Type:bugfix - ID:NA -- Gitee From 41d83e09a34071d9aa39f7df5158c3f629282525 Mon Sep 17 00:00:00 2001 From: eulerstorage Date: Sun, 12 Jan 2020 16:29:38 +0800 Subject: [PATCH 3/5] delete the unnecessary subpackage udisks2-iscsi --- udisks2.spec | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/udisks2.spec b/udisks2.spec index 629f4bc..812c6c4 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -152,19 +152,6 @@ Obsoletes: libstoraged This package contains the dynamic library, which provides access to the udisksd daemon. -%package -n %{name}-iscsi -Summary: Module for iSCSI -Group: System Environment/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} -License: LGPLv2+ -Requires: open-iscsi -BuildRequires: open-iscsi-devel -Provides: storaged-iscsi = %{version}-%{release} -Obsoletes: storaged-iscsi - -%description -n %{name}-iscsi -This package contains module for iSCSI configuration. - %package -n %{name}-lvm2 Summary: Module for LVM2 Group: System Environment/Libraries @@ -302,7 +289,6 @@ autoreconf -ivf --enable-lvmcache \ %endif --enable-lvm2 \ - --enable-iscsi make %{?_smp_mflags} %install @@ -385,10 +371,6 @@ udevadm trigger %{_libdir}/udisks2/modules/libudisks2_lvm2.so %{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.lvm2.policy -%files -n %{name}-iscsi -%{_libdir}/udisks2/modules/libudisks2_iscsi.so -%{_datadir}/polkit-1/actions/org.freedesktop.UDisks2.iscsi.policy - %files -n lib%{name}-devel %{_libdir}/libudisks2.so %dir %{_includedir}/udisks2 @@ -441,7 +423,7 @@ udevadm trigger - Type:bugfix - ID:NA - SUG:NA -- DESC:revise the bogus date in changelog and iscsi-initiator-utils to open-iscsi +- DESC:revise the bogus date in changelog and delete the unnecessary subpackage "udisks2-iscsi" * Tue Dec 24 2019 openEuler Buildteam - 2.8.1-3 - Type:bugfix -- Gitee From 99531a672686c82a95f93a158d5c138c79298dbc Mon Sep 17 00:00:00 2001 From: eulerstorage Date: Sun, 12 Jan 2020 16:32:29 +0800 Subject: [PATCH 4/5] delete the unnecessary subpackage udisks2-iscsi --- udisks2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/udisks2.spec b/udisks2.spec index 812c6c4..79b7221 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -286,7 +286,7 @@ autoreconf -ivf --enable-lsm \ %endif %if 0%{?with_lvmcache} - --enable-lvmcache \ + --enable-lvmcache %endif --enable-lvm2 \ make %{?_smp_mflags} -- Gitee From addbd1528fd6a3ee6fe7e059561ead61f838f6b1 Mon Sep 17 00:00:00 2001 From: eulerstorage Date: Sun, 12 Jan 2020 16:36:31 +0800 Subject: [PATCH 5/5] delete the unnecessary subpackage udisks2-iscsi --- udisks2.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/udisks2.spec b/udisks2.spec index 79b7221..519ab64 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -286,9 +286,9 @@ autoreconf -ivf --enable-lsm \ %endif %if 0%{?with_lvmcache} - --enable-lvmcache + --enable-lvmcache \ %endif - --enable-lvm2 \ + --enable-lvm2 make %{?_smp_mflags} %install -- Gitee