diff --git a/sid.spec b/sid.spec index b85e8f9..3a35796 100644 --- a/sid.spec +++ b/sid.spec @@ -10,8 +10,11 @@ ############################################################################## Name: sid +%if 0%{?rhel} +Epoch: %{rhel} +%endif Version: 0.0.4 -Release: 3%{?scmsnap:.%{scmsnap}}%{?dist} +Release: 4%{?scmsnap:.%{scmsnap}}%{?dist} Summary: Storage Instantiation Daemon (SID) License: GPLv2+ @@ -40,10 +43,10 @@ BuildRequires: device-mapper-multipath-devel >= 0.8.4-7 Requires: systemd Requires: systemd-udev -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} +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} %description Storage Instantiation Daemon (SID) aims to help with Linux storage @@ -120,7 +123,7 @@ handling and other helper functions. %package base-libs-devel Summary: Development files for Storage Instantiation Daemon (SID) base License: GPLv2+ -Requires: %{name}-base-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-base-libs%{?_isa} = %{?epoch}:%{version}-%{release} %description base-libs-devel This package contains development files for Storage Instantiation Daemon (SID) base libraries. @@ -166,7 +169,7 @@ Instantiation daemon (SID), its modules and related tools. %package log-libs-devel Summary: Development files for Storage Instantiation Daemon (SID) logging License: GPLv2+ -Requires: %{name}-log-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-log-libs%{?_isa} = %{?epoch}:%{version}-%{release} %description log-libs-devel This package contains development files for Storage Instantiation Daemon (SID) logging libraries. @@ -187,7 +190,7 @@ logging libraries. %package iface-libs Summary: Libraries for Storage Instantiation Daemon (SID) interfaces License: GPLv2+ -Requires: %{name}-base-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-base-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. @@ -206,7 +209,7 @@ Instantiation Daemon (SID), its modules and related tools. %package iface-libs-devel Summary: Development files for Storage Instantiation Daemon (SID) interfaces License: GPLv2+ -Requires: %{name}-iface-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-iface-libs%{?_isa} = %{?epoch}:%{version}-%{release} %description iface-libs-devel This package contains development files for Storage Instantiation Daemon (SID) interface libraries. @@ -229,9 +232,9 @@ interface libraries. %package resource-libs Summary: Libraries for Storage Instantiation Daemon (SID) resources License: GPLv2+ -Requires: %{name}-base-libs%{?_isa} = %{version}-%{release} -Requires: %{name}-log-libs%{?_isa} = %{version}-%{release} -Requires: %{name}-iface-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-base-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 %description resource-libs @@ -254,7 +257,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+ -Requires: %{name}-resource-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-resource-libs%{?_isa} = %{?epoch}:%{version}-%{release} %description resource-libs-devel This package contains development files for Storage Instantiation Daemon (SID) resource libraries. @@ -280,9 +283,9 @@ resource libraries. %package tools Summary: Storage Instantiation Daemon (SID) supporting tools -Requires: %{name}-base-libs%{?_isa} = %{version}-%{release} -Requires: %{name}-log-libs%{?_isa} = %{version}-%{release} -Requires: %{name}-iface-libs%{?_isa} = %{version}-%{release} +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 This package contains tools to support Storage Instantiation Daemon (SID). @@ -298,8 +301,8 @@ 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}-log-libs%{?_isa} = %{version}-%{release} -Requires: %{name}-resource-libs%{?_isa} = %{version}-%{release} +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 Daemon (SID). Their only purpose is to test SID module functionality and hook @@ -322,8 +325,8 @@ execution. %package mod-block-blkid Summary: Blkid block module for Storage Instantiation Daemon (SID) -Requires: %{name}-log-libs%{?_isa} = %{version}-%{release} -Requires: %{name}-resource-libs%{?_isa} = %{version}-%{release} +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). @@ -344,8 +347,8 @@ 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}-log-libs%{?_isa} = %{version}-%{release} -Requires: %{name}-resource-libs%{?_isa} = %{version}-%{release} +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 This package contains device-mapper multipath block module for Storage @@ -363,6 +366,9 @@ Instantiation Daemon (SID). %changelog +* Fri Jan 29 2021 Peter Rajnoha - 0.0.4-4 +- Add epoch to rpm spec file for RHEL-based releases. + * Fri Jan 29 2021 Peter Rajnoha - 0.0.4-3 - Sync with mpath_valid changes.