Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1,2 +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

sid.spec

@@ -1,9 +1,19 @@
+#
+# 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}
 %{?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,11 +23,11 @@ Name: sid
 %if 0%{?rhel}
 Epoch: %{rhel}
 %endif
-Version: 0.0.5
+Version: 0.0.7
-Release: 5%{?scmsnap:.%{scmsnap}}%{?dist}
+Release: 4%{?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
@@ -28,22 +38,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 +72,51 @@ of devices and their layers in the stack.
 %autosetup -p1 -n sid-%{version}
 %endif
 
-%if ! %{enable_dm_mpath_support}
+%if %{enable_mod_block_blkid}
-%global configure_dm_mpath --disable-mod-dm_mpath
+%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
+autoreconf -ivf
-%configure %{?configure_dm_mpath}
+%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 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
@@ -102,12 +140,12 @@ 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 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
+it contains basic support for buffering, IPC, base64 encoding and other helper
-handling and other helper functions.
+functions.
 
 %files base-libs
 %dir %{_libdir}/sid
@@ -121,7 +159,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 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,26 +169,69 @@ 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/buf-common.h
-%{_includedir}/sid/base/buffer-common.h
+%{_includedir}/sid/base/buf-type.h
-%{_includedir}/sid/base/buffer.h
+%{_includedir}/sid/base/buf.h
-%{_includedir}/sid/base/common.h
 %{_includedir}/sid/base/comms.h
-%{_includedir}/sid/base/list.h
+%{_includedir}/sid/base/conv.h
-%{_includedir}/sid/base/mem.h
+%{_includedir}/sid/base/conv-base64.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
+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/bmp.h
+%{_includedir}/sid/internal/bptree.h
+%{_includedir}/sid/internal/common.h
+%{_includedir}/sid/internal/comp-attrs.h
+%{_includedir}/sid/internal/fmt.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
 ##############################################################################
 
 %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 +248,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,8 +269,9 @@ 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}
+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 +279,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
 
 
@@ -207,7 +289,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)
@@ -216,11 +298,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/srv-lnk.h
-%{_includedir}/sid/iface/usid.h
+%{_includedir}/sid/iface/ifc.h
+%{_includedir}/sid/iface/ifc-internal.h
 %doc README.md
 
 
@@ -230,9 +313,8 @@ 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}-internal-libs%{?_isa} = %{?epoch}:%{version}-%{release}
-Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release}
 Requires: %{name}-iface-libs%{?_isa} = %{?epoch}:%{version}-%{release}
 # Systemd supports event loop since v221
 Requires: systemd-libs >= 221
@@ -255,7 +337,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)
@@ -266,13 +348,14 @@ resource libraries.
 %{_libdir}/sid/libsidresource.so
 %dir %{_includedir}/sid
 %dir %{_includedir}/sid/resource
-%{_includedir}/sid/resource/kv-store.h
+%{_includedir}/sid/resource/kvs.h
-%{_includedir}/sid/resource/module-registry.h
+%{_includedir}/sid/resource/mod-reg.h
-%{_includedir}/sid/resource/module.h
+%{_includedir}/sid/resource/mod.h
-%{_includedir}/sid/resource/resource-type-regs.h
+%{_includedir}/sid/resource/res-type-regs.h
-%{_includedir}/sid/resource/resource.h
+%{_includedir}/sid/resource/res.h
-%{_includedir}/sid/resource/ucmd-module.h
+%{_includedir}/sid/resource/ucmd-mod.h
-%{_includedir}/sid/resource/worker-control.h
+%{_includedir}/sid/resource/ubr.h
+%{_includedir}/sid/resource/wrk-ctl.h
 %doc README.md
 
 
@@ -282,8 +365,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,10 +380,12 @@ 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} = %{?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
 Daemon (SID). Their only purpose is to test SID module functionality and hook
@@ -318,15 +401,18 @@ 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} = %{?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,17 +424,18 @@ 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} = %{?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
 This package contains device-mapper multipath block module for Storage
@@ -369,10 +456,11 @@ 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} = %{?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
 Daemon (SID).
@@ -386,25 +474,81 @@ 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} = %{?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 Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Wed Jan 22 2025 Peter Rajnoha <prajnoha@redhat.com> - 0.0.7-1
+- Update to latest upstream release.
+ 
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+ 
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+ 
+* Fri Feb 9 2024 Peter Rajnoha <prajnoha@redhat.com> - 0.0.6-1
+- Update to latest upstream release.
+ 
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.5-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+ 
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.5-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+ 
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.5-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+ 
+* Tue Jan 03 2023 Peter Rajnoha <prajnoha@redhat.com> - 0.0.5-6
+- Use SPDX values for License fields in RPM spec file.
+ 
 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.5-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
+ 
 * Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
+ 
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
+ 
-* Fri May 14 2021 Timm Bäder <tbaeder@redhat.com> - 0.0.5-2
+* Fri May 14 2021 Timm B├Ąder <tbaeder@redhat.com> - 0.0.5-2
 - Use make_install macro
-
+ 
 * Tue Apr 06 2021 Peter Rajnoha <prajnoha@redhat.com> - 0.0.5-1
 - Update to latest upstream release.
-
+ 
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
+ 
 * Tue Oct 06 2020 Peter Rajnoha <prajnoha@redhat.com> - 0.0.4-1
 - Initial release.

sources

@@ -1 +1 @@
-SHA512 (sid-0.0.5.tar.gz) = 76fe71d9af0b1f0f02b22aefbef3386e065a100d665db46412f177a1e08e8a2aba00d264819a27fa2853091391aade2642d5c2d5d9f45ef62dfe6fe26ffd9a63
+SHA512 (sid-0.0.7.tar.gz) = 7edec2630e43028769a2e93b4c6b182130e095b05f2bb983c9b4d12bcd8974f4783ac9636e8fa647346f81e13ff497340d2eeb4eb7cbf5aee069e6bf192c4a0a