SHA256
1
0
forked from pool/eom

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
This commit is contained in:
Denisart Benjamin 2014-03-12 13:32:48 +00:00 committed by Git OBS Bridge
parent 4a4629436b
commit 0326778b5a
2 changed files with 9 additions and 1 deletions

View File

@ -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 Wed Mar 5 12:34:47 UTC 2014 - p.drouand@gmail.com

View File

@ -16,13 +16,14 @@
Name: eom Name: eom
Version: 1.8.0 Version: 1.8.0
Release: 0 Release: 0
License: GPL-2.0 License: GPL-2.0+ and LGPL-2.1+
Summary: MATE Desktop graphics viewer Summary: MATE Desktop graphics viewer
Url: http://mate-desktop.org Url: http://mate-desktop.org
Group: System/GUI/Other Group: System/GUI/Other
Source: http://pub.mate-desktop.org/releases/1.8/%{name}-%{version}.tar.xz Source: http://pub.mate-desktop.org/releases/1.8/%{name}-%{version}.tar.xz
Provides: mate-image-viewer = %{version} Provides: mate-image-viewer = %{version}
Obsoletes: mate-image-viewer < %{version} Obsoletes: mate-image-viewer < %{version}
Obsoletes: mate-image-viewer-lang < %{version}
Requires: mate-desktop-gsettings-schemas = %{version} Requires: mate-desktop-gsettings-schemas = %{version}
Recommends: %{name}-lang Recommends: %{name}-lang
%glib2_gsettings_schema_requires %glib2_gsettings_schema_requires
@ -57,6 +58,8 @@ standards compliance.
Summary: MATE Desktop graphics viewer development files Summary: MATE Desktop graphics viewer development files
Group: Development/Tools/Other Group: Development/Tools/Other
Requires: %{name} = %{version} Requires: %{name} = %{version}
Provides: mate-image-viewer-devel = %{version}
Obsoletes: mate-image-viewer-devel < %{version}
%description devel %description devel
The Eye of MATE is a simple graphics viewer for the MATE Desktop which The Eye of MATE is a simple graphics viewer for the MATE Desktop which