diff --git a/.gitignore b/.gitignore index aa68db1..46d0038 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ /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 f6d058f..b229b58 100644 --- a/sid.spec +++ b/sid.spec @@ -1,33 +1,20 @@ -# -# 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_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 +%global enable_dm_mpath_support 1 ############################################################################## # SID ############################################################################## Name: sid -%if 0%{?rhel} -Epoch: %{rhel} -%endif -Version: 0.0.7 -Release: 4%{?scmsnap:.%{scmsnap}}%{?dist} +Version: 0.0.4 +Release: 1%{?scmsnap:.%{scmsnap}}%{?dist} Summary: Storage Instantiation Daemon (SID) -License: GPL-2.0-or-later +License: GPLv2+ URL: http://sid-project.github.io %if %{defined commit} Source0: https://github.com/sid-project/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz @@ -37,25 +24,23 @@ Source0: https://github.com/sid-project/%{name}/archive/v%{version}/%{name}-%{ve BuildRequires: autoconf BuildRequires: automake -BuildRequires: gperf BuildRequires: libtool -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 -%endif -%if %{enable_mod_block_dm_mpath} +%if %{enable_dm_mpath_support} BuildRequires: device-mapper-multipath-devel >= 0.8.4-7 %endif Requires: systemd Requires: systemd-udev -Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release} -Requires: %{name}-tools = %{?epoch}:%{version}-%{release} +Requires: %{name}-base-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-log-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-resource-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-tools = %{version}-%{release} %description Storage Instantiation Daemon (SID) aims to help with Linux storage @@ -72,40 +57,13 @@ of devices and their layers in the stack. %autosetup -p1 -n sid-%{version} %endif -%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 +%if ! %{enable_dm_mpath_support} +%global configure_dm_mpath --disable-mod-dm_mpath %endif %build -autoreconf -ivf -%configure %{?configure_mod_block_blkid} %{?configure_mod_block_dm_mpath} %{?configure_mod_type_dm} %{?configure_mod_type_dm__lvm} %{?configure_mod_dummies} - +./autogen.sh +%configure %{?configure_dm_mpath} %make_build %install @@ -113,10 +71,9 @@ 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 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 +%license COPYING %{_sbindir}/sid %config(noreplace) %{_sysconfdir}/sysconfig/sid.sysconfig %{_udevrulesdir}/00-sid.rules @@ -140,12 +97,12 @@ rm -f %{buildroot}/%{_libdir}/sid/modules/ucmd/type/dm/*.{a,la} %package base-libs Summary: Libraries for Storage Instantiation Daemon (SID) base -License: GPL-2.0-or-later AND BSD-3-Clause +License: GPLv2+ %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 buffering, IPC, base64 encoding and other helper -functions. +it contains basic support for bitmaps, buffering, IPC, hashing, lists, memory +handling and other helper functions. %files base-libs %dir %{_libdir}/sid @@ -159,8 +116,8 @@ functions. %package base-libs-devel Summary: Development files for Storage Instantiation Daemon (SID) base -License: GPL-2.0-or-later AND BSD-3-Clause -Requires: %{name}-base-libs%{?_isa} = %{?epoch}:%{version}-%{release} +License: GPLv2+ +Requires: %{name}-base-libs%{?_isa} = %{version}-%{release} %description base-libs-devel This package contains development files for Storage Instantiation Daemon (SID) base libraries. @@ -169,69 +126,26 @@ base libraries. %dir %{_libdir}/sid %{_libdir}/sid/libsidbase.so %dir %{_includedir}/sid +%{_includedir}/sid/config.h %dir %{_includedir}/sid/base -%{_includedir}/sid/base/buf-common.h -%{_includedir}/sid/base/buf-type.h -%{_includedir}/sid/base/buf.h +%{_includedir}/sid/base/bitmap.h +%{_includedir}/sid/base/buffer-common.h +%{_includedir}/sid/base/buffer.h +%{_includedir}/sid/base/common.h %{_includedir}/sid/base/comms.h -%{_includedir}/sid/base/conv.h -%{_includedir}/sid/base/conv-base64.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 -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: GPL-2.0-or-later +License: GPLv2+ %description log-libs This package contains shared libraries with logging support needed for Storage Instantiation daemon (SID), its modules and related tools. @@ -248,8 +162,8 @@ Instantiation daemon (SID), its modules and related tools. %package log-libs-devel Summary: Development files for Storage Instantiation Daemon (SID) logging -License: GPL-2.0-or-later -Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release} +License: GPLv2+ +Requires: %{name}-log-libs%{?_isa} = %{version}-%{release} %description log-libs-devel This package contains development files for Storage Instantiation Daemon (SID) logging libraries. @@ -269,9 +183,8 @@ logging libraries. %package iface-libs Summary: Libraries for Storage Instantiation Daemon (SID) interfaces -License: GPL-2.0-or-later -Requires: %{name}-internal-libs%{?_isa} = %{?epoch}:%{version}-%{release} -Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release} +License: GPLv2+ +Requires: %{name}-base-libs%{?_isa} = %{version}-%{release} %description iface-libs This package contains shared libraries to support interfaces used in Storage Instantiation Daemon (SID), its modules and related tools. @@ -279,7 +192,7 @@ Instantiation Daemon (SID), its modules and related tools. %files iface-libs %dir %{_libdir}/sid %{_libdir}/sid/libsidiface_servicelink.so.* -%{_libdir}/sid/libsidiface.so.* +%{_libdir}/sid/libsidiface_usid.so.* %doc README.md @@ -289,8 +202,8 @@ Instantiation Daemon (SID), its modules and related tools. %package iface-libs-devel Summary: Development files for Storage Instantiation Daemon (SID) interfaces -License: GPL-2.0-or-later -Requires: %{name}-iface-libs%{?_isa} = %{?epoch}:%{version}-%{release} +License: GPLv2+ +Requires: %{name}-iface-libs%{?_isa} = %{version}-%{release} %description iface-libs-devel This package contains development files for Storage Instantiation Daemon (SID) interface libraries. @@ -298,12 +211,11 @@ interface libraries. %files iface-libs-devel %dir %{_libdir}/sid %{_libdir}/sid/libsidiface_servicelink.so -%{_libdir}/sid/libsidiface.so +%{_libdir}/sid/libsidiface_usid.so %dir %{_includedir}/sid %dir %{_includedir}/sid/iface -%{_includedir}/sid/iface/srv-lnk.h -%{_includedir}/sid/iface/ifc.h -%{_includedir}/sid/iface/ifc-internal.h +%{_includedir}/sid/iface/service-link.h +%{_includedir}/sid/iface/usid.h %doc README.md @@ -313,9 +225,10 @@ interface libraries. %package resource-libs Summary: Libraries for Storage Instantiation Daemon (SID) resources -License: GPL-2.0-or-later -Requires: %{name}-internal-libs%{?_isa} = %{?epoch}:%{version}-%{release} -Requires: %{name}-iface-libs%{?_isa} = %{?epoch}:%{version}-%{release} +License: GPLv2+ +Requires: %{name}-base-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-log-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-iface-libs%{?_isa} = %{version}-%{release} # Systemd supports event loop since v221 Requires: systemd-libs >= 221 %description resource-libs @@ -337,8 +250,8 @@ 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: GPL-2.0-or-later -Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release} +License: GPLv2+ +Requires: %{name}-resource-libs%{?_isa} = %{version}-%{release} %description resource-libs-devel This package contains development files for Storage Instantiation Daemon (SID) resource libraries. @@ -348,14 +261,13 @@ resource libraries. %{_libdir}/sid/libsidresource.so %dir %{_includedir}/sid %dir %{_includedir}/sid/resource -%{_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 +%{_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/worker-control.h %doc README.md @@ -365,14 +277,15 @@ resource libraries. %package tools Summary: Storage Instantiation Daemon (SID) supporting tools -Requires: %{name}-iface-libs%{?_isa} = %{?epoch}:%{version}-%{release} +Requires: %{name}-base-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-log-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-iface-libs%{?_isa} = %{version}-%{release} Requires: systemd-udev %description tools This package contains tools to support Storage Instantiation Daemon (SID). %files tools -%{_sbindir}/sidctl %{_udevrulesdir}/../usid %doc README.md @@ -380,12 +293,10 @@ 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} = %{?epoch}:%{version}-%{release} +Requires: %{name}-log-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-resource-libs%{?_isa} = %{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 @@ -401,18 +312,15 @@ 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} = %{?epoch}:%{version}-%{release} +Requires: %{name}-log-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-resource-libs%{?_isa} = %{version}-%{release} %description mod-block-blkid This package contains blkid block module for Storage Instantiation Daemon (SID). @@ -424,18 +332,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_mod_block_dm_mpath} +%if %{enable_dm_mpath_support} %package mod-block-dm-mpath Summary: Device-mapper multipath block module for Storage Instantiation Daemon (SID) -Requires: %{name} = %{?epoch}:%{version}-%{release} +Requires: %{name}-log-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-resource-libs%{?_isa} = %{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,103 +359,6 @@ Instantiation Daemon (SID). %endif -############################################################################## -# 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} = %{?epoch}:%{version}-%{release} -%description mod-type-dm -This package contains device-mapper type module for Storage Instantiation -Daemon (SID). - -%files mod-type-dm -%dir %{_libdir}/sid -%dir %{_libdir}/sid/modules -%dir %{_libdir}/sid/modules/ucmd -%dir %{_libdir}/sid/modules/ucmd/type -%dir %{_libdir}/sid/modules/ucmd/type/dm -%{_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 - 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 - -* 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. - -* 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 -- 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 254e879..9cc210c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sid-0.0.7.tar.gz) = 7edec2630e43028769a2e93b4c6b182130e095b05f2bb983c9b4d12bcd8974f4783ac9636e8fa647346f81e13ff497340d2eeb4eb7cbf5aee069e6bf192c4a0a +SHA512 (sid-0.0.4.tar.gz) = 7e8cee52116b035922bb6791409465b65569e41a67806c6567b94cff2dac7ea6c8d754fb8d54ffa573b41581b8c72b063082b3ad80e718a9e8766e48efc5ad98