From b45468459cf9cb86608eb016b862d8d8a2b4b94770d01c084f714950e0c79813 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 14 Jan 2011 08:55:25 +0000 Subject: [PATCH] Accepting request 58109 from home:vuntz:branches:GNOME:Apps Thanks. OBS-URL: https://build.opensuse.org/request/show/58109 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gbrainy?expand=0&rev=22 --- gbrainy-1.60.tar.bz2 | 3 --- gbrainy-1.61.tar.bz2 | 3 +++ gbrainy-fix-build.patch | 21 +++++++++++++++++++++ gbrainy.changes | 8 ++++++++ gbrainy.spec | 7 +++++-- 5 files changed, 37 insertions(+), 5 deletions(-) delete mode 100644 gbrainy-1.60.tar.bz2 create mode 100644 gbrainy-1.61.tar.bz2 create mode 100644 gbrainy-fix-build.patch diff --git a/gbrainy-1.60.tar.bz2 b/gbrainy-1.60.tar.bz2 deleted file mode 100644 index 67e5760..0000000 --- a/gbrainy-1.60.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bb794e0e5cd3aeb0b8735912783f0f2aae475c762210be2ee921ee69db7d5e6b -size 1219606 diff --git a/gbrainy-1.61.tar.bz2 b/gbrainy-1.61.tar.bz2 new file mode 100644 index 0000000..e7c5533 --- /dev/null +++ b/gbrainy-1.61.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc0d9027e992b52364c140c0c03f5010f84e1684763de0ccad7c86d5108dd9c3 +size 1257514 diff --git a/gbrainy-fix-build.patch b/gbrainy-fix-build.patch new file mode 100644 index 0000000..992e221 --- /dev/null +++ b/gbrainy-fix-build.patch @@ -0,0 +1,21 @@ +From 47b5addb4609607bddebbaa707f7a08576cb6efb Mon Sep 17 00:00:00 2001 +From: Jordi Mas +Date: Thu, 13 Jan 2011 21:19:15 +0000 +Subject: Fixes CS0188 compiler error in Mono 2.9 + +--- +diff --git a/src/Games/Logic/PuzzleExtraCircle.cs b/src/Games/Logic/PuzzleExtraCircle.cs +index 58797eb..8fce87c 100644 +--- a/src/Games/Logic/PuzzleExtraCircle.cs ++++ b/src/Games/Logic/PuzzleExtraCircle.cs +@@ -43,7 +43,7 @@ namespace gbrainy.Games.Logic + { + public Color [] Colors {get; set; } + +- public CircleParameters (Color [] colors) ++ public CircleParameters (Color [] colors) : this () + { + Colors = colors; + } +-- +cgit v0.8.3.1 diff --git a/gbrainy.changes b/gbrainy.changes index e88f3ea..35473f7 100644 --- a/gbrainy.changes +++ b/gbrainy.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jan 14 08:39:12 CET 2011 - vuntz@opensuse.org + +- Update to version 1.61: + + 5 bug fixes + + Updated translations. +- Add gbrainy-fix-build.patch to fix build with mono 2.8. + ------------------------------------------------------------------- Mon Dec 13 09:57:09 CET 2010 - vuntz@opensuse.org diff --git a/gbrainy.spec b/gbrainy.spec index 0803f34..60d3319 100644 --- a/gbrainy.spec +++ b/gbrainy.spec @@ -1,5 +1,5 @@ # -# spec file for package gbrainy (Version 1.60) +# spec file for package gbrainy (Version 1.61) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,13 @@ Name: gbrainy -Version: 1.60 +Version: 1.61 Release: 1 License: GPLv2+ Source: %{name}-%{version}.tar.bz2 Patch: gbrainy-use-libexecdir.patch +# PATCH-FIX-UPSTREAM gbrainy-fix-build.patch vuntz@opensuse.org -- Taken from git, to fix build with mono 2.8 +Patch1: gbrainy-fix-build.patch PreReq: filesystem Url: http://live.gnome.org/gbrainy BuildArch: noarch @@ -66,6 +68,7 @@ It provides the following types of games: %prep %setup -q %patch +%patch1 -p1 %build export MONO_SHARED_DIR=/var/tmp