From de61fcdc54b63803328d3057ecc9172feed33b3ffeb24195a91207404dc8d550 Mon Sep 17 00:00:00 2001 From: Dmitriy Perlow Date: Fri, 5 Jul 2013 20:09:03 +0000 Subject: [PATCH] Accepting request 182337 from home:DarkSS - Conflicts with xmahjong package because xmahjong is really xmahjongg ver. 2. OBS-URL: https://build.opensuse.org/request/show/182337 OBS-URL: https://build.opensuse.org/package/show/games/xmahjongg?expand=0&rev=2 --- xmahjongg.changes | 6 ++++++ xmahjongg.spec | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/xmahjongg.changes b/xmahjongg.changes index d8ff77a..a3b3f82 100644 --- a/xmahjongg.changes +++ b/xmahjongg.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 5 20:03:03 UTC 2013 - dap.darkness@gmail.com + +- Conflicts with xmahjong package because xmahjong is really + xmahjongg ver. 2. + ------------------------------------------------------------------- Thu Jun 27 20:13:06 UTC 2013 - dap.darkness@gmail.com diff --git a/xmahjongg.spec b/xmahjongg.spec index cf49924..5432d1b 100644 --- a/xmahjongg.spec +++ b/xmahjongg.spec @@ -12,27 +12,27 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: xmahjongg Version: 3.7 -Release: 1 -License: MIT +Release: 0 Summary: Colorful X solitaire MahJongg game -Url: http://www.lcdf.org/xmahjongg/ +License: MIT Group: Amusements/Games/Board/Card +Url: http://www.lcdf.org/xmahjongg/ Source0: http://www.lcdf.org/xmahjongg/%{name}-%{version}.tar.gz Source1: %{name}.desktop Source2: %{name}.png BuildRequires: gcc-c++ -BuildRequires: pkgconfig(x11) BuildRequires: update-desktop-files +BuildRequires: pkgconfig(x11) BuildRoot: %{_tmppath}/%{name}-%{version}-build +Conflicts: xmahjong %description Real Mah Jongg is a social game that originated in China thousands of