From cb2e1adbd678880ac44b5597d6343c3f9ad7b586 Mon Sep 17 00:00:00 2001 From: Peter Rajnoha Date: Tue, 3 Jan 2023 13:45:36 +0100 Subject: [PATCH 01/11] Use SPDX values for License fields in RPM spec file. --- sid.spec | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/sid.spec b/sid.spec index c180343..6bd8363 100644 --- a/sid.spec +++ b/sid.spec @@ -14,10 +14,10 @@ Name: sid Epoch: %{rhel} %endif Version: 0.0.5 -Release: 5%{?scmsnap:.%{scmsnap}}%{?dist} +Release: 6%{?scmsnap:.%{scmsnap}}%{?dist} Summary: Storage Instantiation Daemon (SID) -License: GPLv2+ +License: GPL-2.0-or-later URL: http://sid-project.github.io %if %{defined commit} Source0: https://github.com/sid-project/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz @@ -102,7 +102,7 @@ rm -f %{buildroot}/%{_libdir}/sid/modules/ucmd/type/*.{a,la} %package base-libs Summary: Libraries for Storage Instantiation Daemon (SID) base -License: GPLv2+ +License: GPL-2.0-or-later %description base-libs This package contains shared libraries with low-level functionality needed for Storage Instantiation Daemon (SID), its modules and related tools. Currently, @@ -121,7 +121,7 @@ handling and other helper functions. %package base-libs-devel Summary: Development files for Storage Instantiation Daemon (SID) base -License: GPLv2+ +License: GPL-2.0-or-later Requires: %{name}-base-libs%{?_isa} = %{?epoch}:%{version}-%{release} %description base-libs-devel This package contains development files for Storage Instantiation Daemon (SID) @@ -150,7 +150,7 @@ base libraries. %package log-libs Summary: Libraries for Storage Instantiation Daemon (SID) logging -License: GPLv2+ +License: GPL-2.0-or-later %description log-libs This package contains shared libraries with logging support needed for Storage Instantiation daemon (SID), its modules and related tools. @@ -167,7 +167,7 @@ Instantiation daemon (SID), its modules and related tools. %package log-libs-devel Summary: Development files for Storage Instantiation Daemon (SID) logging -License: GPLv2+ +License: GPL-2.0-or-later Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release} %description log-libs-devel This package contains development files for Storage Instantiation Daemon (SID) @@ -188,7 +188,7 @@ logging libraries. %package iface-libs Summary: Libraries for Storage Instantiation Daemon (SID) interfaces -License: GPLv2+ +License: GPL-2.0-or-later Requires: %{name}-base-libs%{?_isa} = %{?epoch}:%{version}-%{release} %description iface-libs This package contains shared libraries to support interfaces used in Storage @@ -207,7 +207,7 @@ Instantiation Daemon (SID), its modules and related tools. %package iface-libs-devel Summary: Development files for Storage Instantiation Daemon (SID) interfaces -License: GPLv2+ +License: GPL-2.0-or-later Requires: %{name}-iface-libs%{?_isa} = %{?epoch}:%{version}-%{release} %description iface-libs-devel This package contains development files for Storage Instantiation Daemon (SID) @@ -230,7 +230,7 @@ interface libraries. %package resource-libs Summary: Libraries for Storage Instantiation Daemon (SID) resources -License: GPLv2+ +License: GPL-2.0-or-later Requires: %{name}-base-libs%{?_isa} = %{?epoch}:%{version}-%{release} Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release} Requires: %{name}-iface-libs%{?_isa} = %{?epoch}:%{version}-%{release} @@ -255,7 +255,7 @@ control, bridging SID core and udev and creating an instance of SID as a whole. %package resource-libs-devel Summary: Development files for Storage Instantiation Daemon (SID) resources -License: GPLv2+ +License: GPL-2.0-or-later Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release} %description resource-libs-devel This package contains development files for Storage Instantiation Daemon (SID) @@ -388,6 +388,9 @@ Daemon (SID). %changelog +* Tue Jan 03 2023 Peter Rajnoha - 0.0.5-6 +- Use SPDX values for License fields in RPM spec file. + * Sat Jul 23 2022 Fedora Release Engineering - 0.0.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 7c50ae224baeb62aaeb576eadd28282b3736fb28 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 03:12:52 +0000 Subject: [PATCH 02/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sid.spec b/sid.spec index 6bd8363..5c370de 100644 --- a/sid.spec +++ b/sid.spec @@ -14,7 +14,7 @@ Name: sid Epoch: %{rhel} %endif Version: 0.0.5 -Release: 6%{?scmsnap:.%{scmsnap}}%{?dist} +Release: 7%{?scmsnap:.%{scmsnap}}%{?dist} Summary: Storage Instantiation Daemon (SID) License: GPL-2.0-or-later @@ -388,6 +388,9 @@ Daemon (SID). %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.0.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Jan 03 2023 Peter Rajnoha - 0.0.5-6 - Use SPDX values for License fields in RPM spec file. From 81c4749e67ab3e64a6217323742a46eacb1b4be2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 01:37:37 +0000 Subject: [PATCH 03/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sid.spec b/sid.spec index 5c370de..7127e05 100644 --- a/sid.spec +++ b/sid.spec @@ -14,7 +14,7 @@ Name: sid Epoch: %{rhel} %endif Version: 0.0.5 -Release: 7%{?scmsnap:.%{scmsnap}}%{?dist} +Release: 8%{?scmsnap:.%{scmsnap}}%{?dist} Summary: Storage Instantiation Daemon (SID) License: GPL-2.0-or-later @@ -388,6 +388,9 @@ Daemon (SID). %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.0.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 0.0.5-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 3aeaff958227875f874b0f7d565a3884bfe26ac3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 03:02:15 +0000 Subject: [PATCH 04/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- sid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sid.spec b/sid.spec index 7127e05..5571154 100644 --- a/sid.spec +++ b/sid.spec @@ -14,7 +14,7 @@ Name: sid Epoch: %{rhel} %endif Version: 0.0.5 -Release: 8%{?scmsnap:.%{scmsnap}}%{?dist} +Release: 9%{?scmsnap:.%{scmsnap}}%{?dist} Summary: Storage Instantiation Daemon (SID) License: GPL-2.0-or-later @@ -388,6 +388,9 @@ Daemon (SID). %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.0.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 0.0.5-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 07ec2977415e5f9f601bb2b894736874e8c7e68d Mon Sep 17 00:00:00 2001 From: Peter Rajnoha Date: Fri, 9 Feb 2024 15:56:34 +0100 Subject: [PATCH 05/11] Update to latest upstream release v0.0.6. --- .gitignore | 1 + sid.spec | 178 ++++++++++++++++++++++++++++++++++++++++++----------- sources | 2 +- 3 files changed, 144 insertions(+), 37 deletions(-) diff --git a/.gitignore b/.gitignore index 816a30b..86c6ea2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /sid-0.0.4.tar.gz /sid-0.0.5.tar.gz +/sid-0.0.6.tar.gz diff --git a/sid.spec b/sid.spec index 5571154..76ad3ac 100644 --- a/sid.spec +++ b/sid.spec @@ -3,7 +3,11 @@ %{?commit:%global commitdate 20200828} %{?commit:%global scmsnap %{commitdate}git%{shortcommit}} -%global enable_dm_mpath_support 1 +%global enable_mod_dummies 1 +%global enable_mod_block_blkid 1 +%global enable_mod_block_dm_mpath 1 +%global enable_mod_type_dm 1 +%global enable_mod_type_dm__lvm 1 ############################################################################## # SID @@ -13,8 +17,8 @@ Name: sid %if 0%{?rhel} Epoch: %{rhel} %endif -Version: 0.0.5 -Release: 9%{?scmsnap:.%{scmsnap}}%{?dist} +Version: 0.0.6 +Release: 1%{?scmsnap:.%{scmsnap}}%{?dist} Summary: Storage Instantiation Daemon (SID) License: GPL-2.0-or-later @@ -28,22 +32,22 @@ Source0: https://github.com/sid-project/%{name}/archive/v%{version}/%{name}-%{ve BuildRequires: autoconf BuildRequires: automake BuildRequires: gperf -BuildRequires: gcc BuildRequires: libtool -BuildRequires: make +BuildRequires: multilib-rpm-config +BuildRequires: gcc BuildRequires: systemd-rpm-macros BuildRequires: systemd-devel >= 221 BuildRequires: libudev-devel >= 174 BuildRequires: libuuid-devel +%if %{enable_mod_block_blkid} BuildRequires: libblkid-devel -%if %{enable_dm_mpath_support} +%endif +%if %{enable_mod_block_dm_mpath} BuildRequires: device-mapper-multipath-devel >= 0.8.4-7 %endif Requires: systemd Requires: systemd-udev -Requires: %{name}-base-libs%{?_isa} = %{?epoch}:%{version}-%{release} -Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release} Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release} Requires: %{name}-tools = %{?epoch}:%{version}-%{release} @@ -62,23 +66,51 @@ of devices and their layers in the stack. %autosetup -p1 -n sid-%{version} %endif -%if ! %{enable_dm_mpath_support} -%global configure_dm_mpath --disable-mod-dm_mpath +%if %{enable_mod_block_blkid} +%global configure_mod_block_blkid --enable-mod-block-blkid +%else +%global configure_mod_block_dm_mpath --disable-mod-block-blkid +%endif + +%if %{enable_mod_block_dm_mpath} +%global configure_mod_block_dm_mpath --enable-mod-block-dm_mpath +%else +%global configure_mod_block_dm_mpath --disable-mod-block-dm_mpath +%endif + +%if %{enable_mod_type_dm} +%global configure_mod_type_dm --enable-mod-type-dm +%else +%global configure_mod_type_dm --disable-mod-type-dm +%endif + +%if %{enable_mod_type_dm__lvm} +%global configure_mod_type_dm__lvm --enable-mod-type-dm-lvm +%else +%global configure_mod_type_dm__lvm --disable-mod-type-dm-lvm +%endif + +%if %{enable_mod_dummies} +%global configure_mod_dummies --enable-mod-block-dummy --enable-mod-type-dummy +%else +%global configure_mod_dummies --disable-mod-block-dummy --disable-mod-type-dummy %endif %build -./autogen.sh -%configure %{?configure_dm_mpath} +autoreconf -ivf +%configure %{?configure_mod_block_blkid} %{?configure_mod_block_dm_mpath} %{?configure_mod_type_dm} %{?configure_mod_type_dm__lvm} %{?configure_mod_dummies} + %make_build %install -%make_install +make DESTDIR=%{buildroot} install rm -f %{buildroot}/%{_libdir}/sid/*.{a,la} rm -f %{buildroot}/%{_libdir}/sid/modules/ucmd/block/*.{a,la} rm -f %{buildroot}/%{_libdir}/sid/modules/ucmd/type/*.{a,la} +rm -f %{buildroot}/%{_libdir}/sid/modules/ucmd/type/dm/*.{a,la} %files -%license COPYING +%license COPYING BSD_LICENSE %{_sbindir}/sid %config(noreplace) %{_sysconfdir}/sysconfig/sid.sysconfig %{_udevrulesdir}/00-sid.rules @@ -102,12 +134,12 @@ rm -f %{buildroot}/%{_libdir}/sid/modules/ucmd/type/*.{a,la} %package base-libs Summary: Libraries for Storage Instantiation Daemon (SID) base -License: GPL-2.0-or-later +License: GPL-2.0-or-later AND BSD-3-Clause %description base-libs This package contains shared libraries with low-level functionality needed for Storage Instantiation Daemon (SID), its modules and related tools. Currently, -it contains basic support for bitmaps, buffering, IPC, hashing, lists, memory -handling and other helper functions. +it contains basic support for buffering, IPC, base64 encoding and other helper +functions. %files base-libs %dir %{_libdir}/sid @@ -121,7 +153,7 @@ handling and other helper functions. %package base-libs-devel Summary: Development files for Storage Instantiation Daemon (SID) base -License: GPL-2.0-or-later +License: GPL-2.0-or-later AND BSD-3-Clause Requires: %{name}-base-libs%{?_isa} = %{?epoch}:%{version}-%{release} %description base-libs-devel This package contains development files for Storage Instantiation Daemon (SID) @@ -131,19 +163,60 @@ base libraries. %dir %{_libdir}/sid %{_libdir}/sid/libsidbase.so %dir %{_includedir}/sid -%{_includedir}/sid/config.h %dir %{_includedir}/sid/base -%{_includedir}/sid/base/bitmap.h +%{_includedir}/sid/base/binary.h %{_includedir}/sid/base/buffer-common.h +%{_includedir}/sid/base/buffer-type.h %{_includedir}/sid/base/buffer.h -%{_includedir}/sid/base/common.h %{_includedir}/sid/base/comms.h -%{_includedir}/sid/base/list.h -%{_includedir}/sid/base/mem.h %{_includedir}/sid/base/util.h %doc README.md +############################################################################## +# SID-INTERNAL-LIBS +############################################################################## + +%package internal-libs +Summary: Development files for Storage Instantiation Daemon (SID) internal +License: GPL-2.0-or-later AND BSD-3-Clause +Requires: %{name}-base-libs%{?_isa} = %{?epoch}:%{version}-%{release} +%description internal-libs +This package contains shared libraries with low-level functionality needed for +Storage Instantiation Daemon (SID) and its modules. Currently, it contains +basic support for bitmaps, hashing, lists, memory handling and other helper +functions. + +%files internal-libs +%dir %{_libdir}/sid +%{_libdir}/sid/libsidinternal.so.* +%doc README.md + + +############################################################################## +# SID-INTERNAL-LIBS-DEVEL +############################################################################## +%package internal-libs-devel +Summary: Development files for Storage Instantiation Daemon (SID) internal +License: GPL-2.0-or-later AND BSD-3-Clause +%description internal-libs-devel +This package contains development files for Storage Instantiation Daemon (SID) +internal libraries. + +%files internal-libs-devel +%dir %{_includedir}/sid/internal +%{_includedir}/sid/internal/bitmap.h +%{_includedir}/sid/internal/bptree.h +%{_includedir}/sid/internal/common.h +%{_includedir}/sid/internal/comp-attrs.h +%{_includedir}/sid/internal/formatter.h +%{_includedir}/sid/internal/hash.h +%{_includedir}/sid/internal/list.h +%{_includedir}/sid/internal/mem.h +%{_includedir}/sid/internal/util.h +%{_libdir}/sid/libsidinternal.so + + ############################################################################## # SID-LOG-LIBS ############################################################################## @@ -189,7 +262,8 @@ logging libraries. %package iface-libs Summary: Libraries for Storage Instantiation Daemon (SID) interfaces License: GPL-2.0-or-later -Requires: %{name}-base-libs%{?_isa} = %{?epoch}:%{version}-%{release} +Requires: %{name}-internal-libs%{?_isa} = %{?epoch}:%{version}-%{release} +Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release} %description iface-libs This package contains shared libraries to support interfaces used in Storage Instantiation Daemon (SID), its modules and related tools. @@ -197,7 +271,7 @@ Instantiation Daemon (SID), its modules and related tools. %files iface-libs %dir %{_libdir}/sid %{_libdir}/sid/libsidiface_servicelink.so.* -%{_libdir}/sid/libsidiface_usid.so.* +%{_libdir}/sid/libsidiface.so.* %doc README.md @@ -216,11 +290,12 @@ interface libraries. %files iface-libs-devel %dir %{_libdir}/sid %{_libdir}/sid/libsidiface_servicelink.so -%{_libdir}/sid/libsidiface_usid.so +%{_libdir}/sid/libsidiface.so %dir %{_includedir}/sid %dir %{_includedir}/sid/iface %{_includedir}/sid/iface/service-link.h -%{_includedir}/sid/iface/usid.h +%{_includedir}/sid/iface/iface.h +%{_includedir}/sid/iface/iface_internal.h %doc README.md @@ -231,8 +306,7 @@ interface libraries. %package resource-libs Summary: Libraries for Storage Instantiation Daemon (SID) resources License: GPL-2.0-or-later -Requires: %{name}-base-libs%{?_isa} = %{?epoch}:%{version}-%{release} -Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release} +Requires: %{name}-internal-libs%{?_isa} = %{?epoch}:%{version}-%{release} Requires: %{name}-iface-libs%{?_isa} = %{?epoch}:%{version}-%{release} # Systemd supports event loop since v221 Requires: systemd-libs >= 221 @@ -272,6 +346,7 @@ resource libraries. %{_includedir}/sid/resource/resource-type-regs.h %{_includedir}/sid/resource/resource.h %{_includedir}/sid/resource/ucmd-module.h +%{_includedir}/sid/resource/ubridge.h %{_includedir}/sid/resource/worker-control.h %doc README.md @@ -282,8 +357,6 @@ resource libraries. %package tools Summary: Storage Instantiation Daemon (SID) supporting tools -Requires: %{name}-base-libs%{?_isa} = %{?epoch}:%{version}-%{release} -Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release} Requires: %{name}-iface-libs%{?_isa} = %{?epoch}:%{version}-%{release} Requires: systemd-udev %description tools @@ -299,9 +372,11 @@ This package contains tools to support Storage Instantiation Daemon (SID). ############################################################################## # SID-MOD-DUMMIES ############################################################################## + +%if %{enable_mod_dummies} + %package mod-dummies Summary: Dummy block and type module for Storage Instantiation Daemon (SID) -Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release} Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release} %description mod-dummies This package contains dummy block and type modules for Storage Instantiation @@ -318,14 +393,17 @@ execution. %{_libdir}/sid/modules/ucmd/type/dummy_type.so %doc README.md +%endif + ############################################################################## # SID-MOD-BLOCK-BLKID ############################################################################## +%if %{enable_mod_block_blkid} + %package mod-block-blkid Summary: Blkid block module for Storage Instantiation Daemon (SID) -Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release} Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release} %description mod-block-blkid This package contains blkid block module for Storage Instantiation Daemon (SID). @@ -338,16 +416,17 @@ This package contains blkid block module for Storage Instantiation Daemon (SID). %{_libdir}/sid/modules/ucmd/block/blkid.so %doc README.md +%endif + ############################################################################## # SID-MOD-BLOCK-DM_MPATH ############################################################################## -%if %{enable_dm_mpath_support} +%if %{enable_mod_block_dm_mpath} %package mod-block-dm-mpath Summary: Device-mapper multipath block module for Storage Instantiation Daemon (SID) -Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release} Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release} Requires: device-mapper-multipath-libs >= 0.8.4-7 %description mod-block-dm-mpath @@ -369,9 +448,10 @@ Instantiation Daemon (SID). # SID-MOD-TYPE-DM ############################################################################## +%if %{enable_mod_type_dm} + %package mod-type-dm Summary: Device-mapper type module for Storage Instantiation Daemon (SID) -Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release} Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release} %description mod-type-dm This package contains device-mapper type module for Storage Instantiation @@ -386,8 +466,34 @@ Daemon (SID). %{_libdir}/sid/modules/ucmd/type/dm.so %doc README.md +%endif + + +############################################################################## +# SID-MOD-TYPE-DM-LVM +############################################################################## + +%if %{enable_mod_type_dm__lvm} + +%package mod-type-dm-lvm +Summary: LVM type module for Storage Instantiation Daemon (SID) +Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release} +Requires: %{name}-mod-type-dm%{?_isa} = %{?epoch}:%{version}-%{release} +%description mod-type-dm-lvm +This package contains LVM type module for Storage Instantiation +Daemon (SID). + +%files mod-type-dm-lvm +%{_libdir}/sid/modules/ucmd/type/dm/lvm.so +%doc README.md + +%endif + %changelog +* Fri Feb 9 2024 Peter Rajnoha - 0.0.6-1 +- Update to latest upstream release. + * Sat Jan 27 2024 Fedora Release Engineering - 0.0.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 579fcd2..e39687a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sid-0.0.5.tar.gz) = 76fe71d9af0b1f0f02b22aefbef3386e065a100d665db46412f177a1e08e8a2aba00d264819a27fa2853091391aade2642d5c2d5d9f45ef62dfe6fe26ffd9a63 +SHA512 (sid-0.0.6.tar.gz) = f10e4caf19439731f12933aac8c819cc7f32dd44259af2bf8189b8ee63eddc4a94a6ca6ec8c211d80ad9aec11e1f0192c89a7b264bb8b57b8cd22de90466d628 From 8525ca87dcfc48d0871b3f845a07490b9a6c6974 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 05:29:59 +0000 Subject: [PATCH 06/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- sid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sid.spec b/sid.spec index 76ad3ac..2d30750 100644 --- a/sid.spec +++ b/sid.spec @@ -18,7 +18,7 @@ Name: sid Epoch: %{rhel} %endif Version: 0.0.6 -Release: 1%{?scmsnap:.%{scmsnap}}%{?dist} +Release: 2%{?scmsnap:.%{scmsnap}}%{?dist} Summary: Storage Instantiation Daemon (SID) License: GPL-2.0-or-later @@ -491,6 +491,9 @@ Daemon (SID). %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.0.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Feb 9 2024 Peter Rajnoha - 0.0.6-1 - Update to latest upstream release. From 7fe18d86b44242584e447a1fc326b182f259ec89 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 10:38:52 +0000 Subject: [PATCH 07/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- sid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sid.spec b/sid.spec index 2d30750..ed2bae6 100644 --- a/sid.spec +++ b/sid.spec @@ -18,7 +18,7 @@ Name: sid Epoch: %{rhel} %endif Version: 0.0.6 -Release: 2%{?scmsnap:.%{scmsnap}}%{?dist} +Release: 3%{?scmsnap:.%{scmsnap}}%{?dist} Summary: Storage Instantiation Daemon (SID) License: GPL-2.0-or-later @@ -491,6 +491,9 @@ Daemon (SID). %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.0.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 0.0.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 9c170394a1a6e3c7535d348c38d50bebb5c24b55 Mon Sep 17 00:00:00 2001 From: Peter Rajnoha Date: Wed, 22 Jan 2025 11:38:15 +0100 Subject: [PATCH 08/11] Update to latest upstream release v0.0.7. --- .gitignore | 1 + sid.spec | 89 ++++++++++++++++++++++++++++++------------------------ sources | 2 +- 3 files changed, 52 insertions(+), 40 deletions(-) diff --git a/.gitignore b/.gitignore index 86c6ea2..aa68db1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /sid-0.0.4.tar.gz /sid-0.0.5.tar.gz /sid-0.0.6.tar.gz +/sid-0.0.7.tar.gz diff --git a/sid.spec b/sid.spec index ed2bae6..06b0a5f 100644 --- a/sid.spec +++ b/sid.spec @@ -1,3 +1,9 @@ +# +# SPDX-FileCopyrightText: (C) 2017-2025 Red Hat, Inc. +# +# SPDX-License-Identifier: GPL-2.0-or-later +# + #global commit 13a0dd86874b5d7558a0e131f3deaa42cd7d9d23 %{?commit:%global shortcommit %(c=%{commit}; echo ${c:0:7})} %{?commit:%global commitdate 20200828} @@ -17,8 +23,8 @@ Name: sid %if 0%{?rhel} Epoch: %{rhel} %endif -Version: 0.0.6 -Release: 3%{?scmsnap:.%{scmsnap}}%{?dist} +Version: 0.0.7 +Release: 1%{?scmsnap:.%{scmsnap}}%{?dist} Summary: Storage Instantiation Daemon (SID) License: GPL-2.0-or-later @@ -110,7 +116,7 @@ rm -f %{buildroot}/%{_libdir}/sid/modules/ucmd/type/*.{a,la} rm -f %{buildroot}/%{_libdir}/sid/modules/ucmd/type/dm/*.{a,la} %files -%license COPYING BSD_LICENSE +%license LICENSES/GPL-2.0-or-later.txt LICENSES/BSD-3-Clause.txt LICENSES/FSFAP.txt LICENSES/FSFAP-no-warranty-disclaimer.txt LICENSES/CC0-1.0.txt %{_sbindir}/sid %config(noreplace) %{_sysconfdir}/sysconfig/sid.sysconfig %{_udevrulesdir}/00-sid.rules @@ -164,11 +170,12 @@ base libraries. %{_libdir}/sid/libsidbase.so %dir %{_includedir}/sid %dir %{_includedir}/sid/base -%{_includedir}/sid/base/binary.h -%{_includedir}/sid/base/buffer-common.h -%{_includedir}/sid/base/buffer-type.h -%{_includedir}/sid/base/buffer.h +%{_includedir}/sid/base/buf-common.h +%{_includedir}/sid/base/buf-type.h +%{_includedir}/sid/base/buf.h %{_includedir}/sid/base/comms.h +%{_includedir}/sid/base/conv.h +%{_includedir}/sid/base/conv-base64.h %{_includedir}/sid/base/util.h %doc README.md @@ -199,17 +206,18 @@ functions. %package internal-libs-devel Summary: Development files for Storage Instantiation Daemon (SID) internal License: GPL-2.0-or-later AND BSD-3-Clause +Requires: %{name}-internal-libs%{?_isa} = %{?epoch}:%{version}-%{release} %description internal-libs-devel This package contains development files for Storage Instantiation Daemon (SID) internal libraries. %files internal-libs-devel %dir %{_includedir}/sid/internal -%{_includedir}/sid/internal/bitmap.h +%{_includedir}/sid/internal/bmp.h %{_includedir}/sid/internal/bptree.h %{_includedir}/sid/internal/common.h %{_includedir}/sid/internal/comp-attrs.h -%{_includedir}/sid/internal/formatter.h +%{_includedir}/sid/internal/fmt.h %{_includedir}/sid/internal/hash.h %{_includedir}/sid/internal/list.h %{_includedir}/sid/internal/mem.h @@ -293,9 +301,9 @@ interface libraries. %{_libdir}/sid/libsidiface.so %dir %{_includedir}/sid %dir %{_includedir}/sid/iface -%{_includedir}/sid/iface/service-link.h -%{_includedir}/sid/iface/iface.h -%{_includedir}/sid/iface/iface_internal.h +%{_includedir}/sid/iface/srv-lnk.h +%{_includedir}/sid/iface/ifc.h +%{_includedir}/sid/iface/ifc-internal.h %doc README.md @@ -340,14 +348,14 @@ resource libraries. %{_libdir}/sid/libsidresource.so %dir %{_includedir}/sid %dir %{_includedir}/sid/resource -%{_includedir}/sid/resource/kv-store.h -%{_includedir}/sid/resource/module-registry.h -%{_includedir}/sid/resource/module.h -%{_includedir}/sid/resource/resource-type-regs.h -%{_includedir}/sid/resource/resource.h -%{_includedir}/sid/resource/ucmd-module.h -%{_includedir}/sid/resource/ubridge.h -%{_includedir}/sid/resource/worker-control.h +%{_includedir}/sid/resource/kvs.h +%{_includedir}/sid/resource/mod-reg.h +%{_includedir}/sid/resource/mod.h +%{_includedir}/sid/resource/res-type-regs.h +%{_includedir}/sid/resource/res.h +%{_includedir}/sid/resource/ucmd-mod.h +%{_includedir}/sid/resource/ubr.h +%{_includedir}/sid/resource/wrk-ctl.h %doc README.md @@ -377,7 +385,7 @@ This package contains tools to support Storage Instantiation Daemon (SID). %package mod-dummies Summary: Dummy block and type module for Storage Instantiation Daemon (SID) -Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release} +Requires: %{name} = %{?epoch}:%{version}-%{release} %description mod-dummies This package contains dummy block and type modules for Storage Instantiation Daemon (SID). Their only purpose is to test SID module functionality and hook @@ -404,7 +412,7 @@ execution. %package mod-block-blkid Summary: Blkid block module for Storage Instantiation Daemon (SID) -Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release} +Requires: %{name} = %{?epoch}:%{version}-%{release} %description mod-block-blkid This package contains blkid block module for Storage Instantiation Daemon (SID). @@ -427,7 +435,7 @@ This package contains blkid block module for Storage Instantiation Daemon (SID). %package mod-block-dm-mpath Summary: Device-mapper multipath block module for Storage Instantiation Daemon (SID) -Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release} +Requires: %{name} = %{?epoch}:%{version}-%{release} Requires: device-mapper-multipath-libs >= 0.8.4-7 %description mod-block-dm-mpath This package contains device-mapper multipath block module for Storage @@ -452,7 +460,7 @@ Instantiation Daemon (SID). %package mod-type-dm Summary: Device-mapper type module for Storage Instantiation Daemon (SID) -Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release} +Requires: %{name} = %{?epoch}:%{version}-%{release} %description mod-type-dm This package contains device-mapper type module for Storage Instantiation Daemon (SID). @@ -477,7 +485,7 @@ Daemon (SID). %package mod-type-dm-lvm Summary: LVM type module for Storage Instantiation Daemon (SID) -Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release} +Requires: %{name} = %{?epoch}:%{version}-%{release} Requires: %{name}-mod-type-dm%{?_isa} = %{?epoch}:%{version}-%{release} %description mod-type-dm-lvm This package contains LVM type module for Storage Instantiation @@ -491,44 +499,47 @@ Daemon (SID). %changelog +* Wed Jan 22 2025 Peter Rajnoha - 0.0.7-1 +- Update to latest upstream release. + * Sun Jan 19 2025 Fedora Release Engineering - 0.0.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - + * Sat Jul 20 2024 Fedora Release Engineering - 0.0.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - + * Fri Feb 9 2024 Peter Rajnoha - 0.0.6-1 - Update to latest upstream release. - + * Sat Jan 27 2024 Fedora Release Engineering - 0.0.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - + * Sat Jul 22 2023 Fedora Release Engineering - 0.0.5-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - + * Sat Jan 21 2023 Fedora Release Engineering - 0.0.5-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - + * Tue Jan 03 2023 Peter Rajnoha - 0.0.5-6 - Use SPDX values for License fields in RPM spec file. - + * Sat Jul 23 2022 Fedora Release Engineering - 0.0.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - + * Sat Jan 22 2022 Fedora Release Engineering - 0.0.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - + * Fri Jul 23 2021 Fedora Release Engineering - 0.0.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri May 14 2021 Timm Bäder - 0.0.5-2 + +* Fri May 14 2021 Timm B├Ąder - 0.0.5-2 - Use make_install macro - + * Tue Apr 06 2021 Peter Rajnoha - 0.0.5-1 - Update to latest upstream release. - + * Wed Jan 27 2021 Fedora Release Engineering - 0.0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - + * Tue Oct 06 2020 Peter Rajnoha - 0.0.4-1 - Initial release. diff --git a/sources b/sources index e39687a..254e879 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sid-0.0.6.tar.gz) = f10e4caf19439731f12933aac8c819cc7f32dd44259af2bf8189b8ee63eddc4a94a6ca6ec8c211d80ad9aec11e1f0192c89a7b264bb8b57b8cd22de90466d628 +SHA512 (sid-0.0.7.tar.gz) = 7edec2630e43028769a2e93b4c6b182130e095b05f2bb983c9b4d12bcd8974f4783ac9636e8fa647346f81e13ff497340d2eeb4eb7cbf5aee069e6bf192c4a0a From 8871bbcbe5e514b9c8af8f5afa50cc9c6aa5e244 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:16:01 +0000 Subject: [PATCH 09/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- sid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sid.spec b/sid.spec index 06b0a5f..55aa3ba 100644 --- a/sid.spec +++ b/sid.spec @@ -24,7 +24,7 @@ Name: sid Epoch: %{rhel} %endif Version: 0.0.7 -Release: 1%{?scmsnap:.%{scmsnap}}%{?dist} +Release: 2%{?scmsnap:.%{scmsnap}}%{?dist} Summary: Storage Instantiation Daemon (SID) License: GPL-2.0-or-later @@ -499,6 +499,9 @@ Daemon (SID). %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.0.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed Jan 22 2025 Peter Rajnoha - 0.0.7-1 - Update to latest upstream release. From 39cca1ac4b50fdce4fd07b60fdc1f3791e29f2d5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 18:00:46 +0000 Subject: [PATCH 10/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- sid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sid.spec b/sid.spec index 55aa3ba..8c2e483 100644 --- a/sid.spec +++ b/sid.spec @@ -24,7 +24,7 @@ Name: sid Epoch: %{rhel} %endif Version: 0.0.7 -Release: 2%{?scmsnap:.%{scmsnap}}%{?dist} +Release: 3%{?scmsnap:.%{scmsnap}}%{?dist} Summary: Storage Instantiation Daemon (SID) License: GPL-2.0-or-later @@ -499,6 +499,9 @@ Daemon (SID). %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 0.0.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 0.0.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 427539830738a1072443a33e9467e9634e4a9200 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 06:30:51 +0000 Subject: [PATCH 11/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- sid.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sid.spec b/sid.spec index 8c2e483..f6d058f 100644 --- a/sid.spec +++ b/sid.spec @@ -24,7 +24,7 @@ Name: sid Epoch: %{rhel} %endif Version: 0.0.7 -Release: 3%{?scmsnap:.%{scmsnap}}%{?dist} +Release: 4%{?scmsnap:.%{scmsnap}}%{?dist} Summary: Storage Instantiation Daemon (SID) License: GPL-2.0-or-later @@ -499,6 +499,9 @@ Daemon (SID). %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 0.0.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 0.0.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild