From 0326778b5a1a335482d7cbf84ec7b7df8644b144416c58d470ab144f79c88bc7 Mon Sep 17 00:00:00 2001 From: Denisart Benjamin Date: Wed, 12 Mar 2014 13:32:48 +0000 Subject: [PATCH] Accepting request 225691 from home:posophe:branches:X11:MATE:Factory Fix conflicts OBS-URL: https://build.opensuse.org/request/show/225691 OBS-URL: https://build.opensuse.org/package/show/X11:MATE:Factory/eom?expand=0&rev=2 --- eom.changes | 5 +++++ eom.spec | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/eom.changes b/eom.changes index 215d919..9ed1af5 100644 --- a/eom.changes +++ b/eom.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 12 13:32:13 UTC 2014 - p.drouand@gmail.com + +- Fix conflicts with mate-image-viewer + ------------------------------------------------------------------- Wed Mar 5 12:34:47 UTC 2014 - p.drouand@gmail.com diff --git a/eom.spec b/eom.spec index 1b65cf8..785ecae 100644 --- a/eom.spec +++ b/eom.spec @@ -16,13 +16,14 @@ Name: eom Version: 1.8.0 Release: 0 -License: GPL-2.0 +License: GPL-2.0+ and LGPL-2.1+ Summary: MATE Desktop graphics viewer Url: http://mate-desktop.org Group: System/GUI/Other Source: http://pub.mate-desktop.org/releases/1.8/%{name}-%{version}.tar.xz Provides: mate-image-viewer = %{version} Obsoletes: mate-image-viewer < %{version} +Obsoletes: mate-image-viewer-lang < %{version} Requires: mate-desktop-gsettings-schemas = %{version} Recommends: %{name}-lang %glib2_gsettings_schema_requires @@ -57,6 +58,8 @@ standards compliance. Summary: MATE Desktop graphics viewer development files Group: Development/Tools/Other Requires: %{name} = %{version} +Provides: mate-image-viewer-devel = %{version} +Obsoletes: mate-image-viewer-devel < %{version} %description devel The Eye of MATE is a simple graphics viewer for the MATE Desktop which