[gbrainy/f14] Fix merge issue

[Marcelin Benoît]

commit ccd62e637c9b752b274d83c9dc02bb511017c523
Author: Benoît Marcelin <sereinity at online.fr>
Date:   Tue Jul 26 19:25:36 2011 +0200

    Fix merge issue

 gbrainy.spec |   50 --------------------------------------------------
 1 files changed, 0 insertions(+), 50 deletions(-)
---
diff --git a/gbrainy.spec b/gbrainy.spec
index cfbedbd..cc0de08 100644
--- a/gbrainy.spec
+++ b/gbrainy.spec
@@ -1,23 +1,3 @@
-<<<<<<< HEAD
-# %define debug_package %{nil}
-# Because it's a Mono package and generate an empty debuginfo
-# http://fedoraproject.org/wiki/Packaging/Debuginfo#head-29573c4f61c3a4698b2d07c7e73cfa194785f257
-
-Name:		gbrainy
-Version:	1.1
-Release:	7%{?dist}
-Summary:	A brain teaser game and trainer to keep your brain trained
-
-Group:		Amusements/Games
-License:	GPLv2
-URL:		http://live.gnome.org/gbrainy
-Source0:	http://gent.softcatala.org/jmas/%{name}/%{name}-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	mono-devel intltool librsvg2-devel mono-addins-devel
-BuildRequires:	gtk-sharp2-devel gnome-sharp-devel
-BuildRequires:  /usr/bin/desktop-file-install
-=======
 # http://fedoraproject.org/wiki/Packaging/Debuginfo#Useless_or_incomplete_debuginfo_packages_due_to_other_reasons
 %global debug_package %{nil}
 
@@ -58,16 +38,9 @@ It provides the following types of games:
 
 %prep
 %setup -q
-<<<<<<< HEAD
-# To fix 460353 :
-sed 's#share/games#share#' src/Defines.cs.in -i
-sed 's#^images = $(datadir)/games/gbrainy$#images = $(datadir)/gbrainy#' data/Makefile.in -i
-=======
 %patch0 -p1
 %patch1 -p1
 sed -i -e 's!{exec_prefix}/lib!%{_libdir}!' data/gbrainy.pc.in
-echo "sed done $PWD"
->>>>>>> 26bd518... Update to gbrainy 2.00
 
 %build
 %configure
@@ -113,38 +86,15 @@ fi
 %{_libdir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/%{name}
-<<<<<<< HEAD
-=======
 %{_datadir}/gnome/help/%{name}
->>>>>>> 26bd518... Update to gbrainy 2.00
 %{_datadir}/icons/hicolor/*/apps/%{name}*
 %{_mandir}/man6/%{name}.6.gz
 %{_datadir}/pixmaps/%{name}*
 
 %changelog
-<<<<<<< HEAD
-=======
 * Mon Jul 25 2011 Benoît Marcelin <sereinity at online.fr> 2.00-1
 - Update to 2.00
 
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.52-4.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Thu Oct 28 2010 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.52-3.1
-- Add BR libtool
-
-* Thu Oct 28 2010 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.52-3
-- Change gnome-common to gnome-doc-utils
-
-* Thu Oct 28 2010 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.52-2
-- Add BR gnome-common
-
-* Wed Oct 27 2010 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.52-1
-- Bump to 1.52
-- Add devel subpackage
-- Rebuild against mono-2.8
-
->>>>>>> 26bd518... Update to gbrainy 2.00
 * Mon Jun 07 2010 Christian Krause <chkr at fedoraproject.org> - 1.1-7
 - Rebuilt against new mono-addins