From 044cad682ec2b19b753f710416a0936a3a7178fa Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Wed, 17 Mar 2021 12:22:12 +0100 Subject: [PATCH] Fix the version of redhat-menus, add Conflicts, remove Requires --- gnome-menus.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnome-menus.spec b/gnome-menus.spec index 5d1e6ce..677fee5 100644 --- a/gnome-menus.spec +++ b/gnome-menus.spec @@ -2,7 +2,7 @@ Name: gnome-menus Version: 3.36.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A menu system for the GNOME project License: LGPLv2+ @@ -19,10 +19,9 @@ BuildRequires: pkgconfig BuildRequires: gobject-introspection-devel BuildRequires: make -Requires: redhat-menus - -Obsoletes: redhat-menus < 12.0.2-19 -Provides: redhat-menus = 12.0.2-19 +Obsoletes: redhat-menus < 12.0.2-20 +Provides: redhat-menus = 12.0.2-20 +Conflicts: redhat-menus < 12.0.2-20 %description gnome-menus is an implementation of the draft "Desktop @@ -81,6 +80,9 @@ cp $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/{gnome-,}applications.menu %{_datadir}/gir-1.0/GMenu-3.0.gir %changelog +* Wed Mar 17 2021 Tomas Popela - 3.36.0-6 +- Fix the version of redhat-menus, add Conflicts, remove Requires + * Tue Mar 16 2021 Tomas Popela - 3.36.0-5 - swallow up redhat-menus (backport of rhel-8.2.0 change) Resolves: #1715890