From 226625b2ad84314bbb4bcb71c047c97aada9506c Mon Sep 17 00:00:00 2001 From: Igor Raits Date: May 23 2020 15:00:33 +0000 Subject: Insert Epoch in Requires/Provides/Obsoletes Signed-off-by: Igor Raits --- diff --git a/fonts-rpm-macros.spec b/fonts-rpm-macros.spec index 8c7bd63..04ab2eb 100644 --- a/fonts-rpm-macros.spec +++ b/fonts-rpm-macros.spec @@ -18,20 +18,20 @@ Version: 2.0.5 BuildArch: noarch Name: fonts-rpm-macros -Release: 2%{?dist} +Release: 3%{?dist} Summary: Build-stage rpm automation for fonts packages License: GPLv3+ URL: https://docs.fedoraproject.org/en-US/packaging-guidelines/FontsPolicy/ Source: %{forgesource} -Requires: fonts-srpm-macros = %{version}-%{release} -Requires: fonts-filesystem = %{version}-%{release} +Requires: fonts-srpm-macros = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: fonts-filesystem = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: fontpackages-devel = %{version}-%{release} -Obsoletes: fontpackages-devel < %{version}-%{release} +Provides: fontpackages-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: fontpackages-devel < %{?epoch:%{epoch}:}%{version}-%{release} # Tooling dropped for now as no one was willing to maintain it -Obsoletes: fontpackages-tools < %{version}-%{release} +Obsoletes: fontpackages-tools < %{?epoch:%{epoch}:}%{version}-%{release} Requires: fontconfig Requires: libappstream-glib @@ -66,8 +66,8 @@ fonts-srpm-macros will pull in for fonts packages only. Summary: Directories used by font packages License: MIT -Provides: fontpackages-filesystem = %{version}-%{release} -Obsoletes: fontpackages-filesystem < %{version}-%{release} +Provides: fontpackages-filesystem = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: fontpackages-filesystem < %{?epoch:%{epoch}:}%{version}-%{release} %description -n fonts-filesystem This package contains the basic directory layout used by font packages, @@ -77,8 +77,8 @@ including the correct permissions for the directories. Summary: Example fonts packages rpm spec templates License: MIT -Requires: fonts-rpm-macros = %{version}-%{release} -Supplements: fonts-rpm-macros = %{version}-%{release} +Requires: fonts-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release} +Supplements: fonts-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release} %description -n fonts-rpm-templates This package contains documented rpm spec templates showcasing how to use the @@ -147,6 +147,9 @@ install -m 0755 -vp bin/* %{buildroot}%{_bindir} %doc %{ftcgtemplatedir}/*txt %changelog +* Sat May 23 17:00:05 CEST 2020 Igor Raits - 1:2.0.5-3 +- Insert Epoch in Requires/Provides/Obsoletes + * Sat May 23 09:03:10 CEST 2020 Igor Raits - 1:2.0.5-2 - Revert to 2.0.5