rpms/cowbell/F-11 cowbell-CS0649.patch, NONE, 1.1 cowbell-coalesceop.patch, NONE, 1.1 cowbell.spec, 1.17, 1.18

[Miloš Jakubíček]

Author: mjakubicek

Update of /cvs/pkgs/rpms/cowbell/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9477/F-11

Modified Files:
	cowbell.spec 
Added Files:
	cowbell-CS0649.patch cowbell-coalesceop.patch 
Log Message:
- Fix FTBFS: added cowbell-coalesceop.patch and cowbell-CS0469.patch.



cowbell-CS0649.patch:

--- NEW FILE cowbell-CS0649.patch ---
--- cowbell/gui/MainWindow.cs.orig	2009-05-24 02:03:53.000000000 +0200
+++ cowbell/gui/MainWindow.cs	2009-05-24 02:04:13.000000000 +0200
@@ -19,6 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */

+#pragma warning disable 0649
+
 using System;
 using Gtk;
 using Glade;
--- cowbell/gui/PreferencesWindow.cs.orig	2009-05-24 02:05:04.000000000 +0200
+++ cowbell/gui/PreferencesWindow.cs	2009-05-24 02:05:25.000000000 +0200
@@ -19,6 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#pragma warning disable 0649
+
 using Gtk;
 using System;
 using Cowbell.Base;

cowbell-coalesceop.patch:

--- NEW FILE cowbell-coalesceop.patch ---
--- cowbell/musicbrainz-sharp/MusicBrainz/LocalDisc.cs.orig	2009-05-24 01:54:40.000000000 +0200
+++ cowbell/musicbrainz-sharp/MusicBrainz/LocalDisc.cs	2009-05-24 01:55:17.000000000 +0200
@@ -94,7 +94,7 @@
         
         Uri submission_url;
         public Uri SubmissionUrl {
-            get { return submission_url ?? submission_url = BuildSubmissionUrl (); }
+            get { return submission_url ?? (submission_url = BuildSubmissionUrl ()); }
         }
         
         Uri BuildSubmissionUrl ()


Index: cowbell.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cowbell/F-11/cowbell.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- cowbell.spec	24 Feb 2009 09:17:08 -0000	1.17
+++ cowbell.spec	24 May 2009 00:19:35 -0000	1.18
@@ -2,7 +2,7 @@
 
 Name:           cowbell
 Version:        0.3
-Release:        0.svn47.1%{?dist}.1
+Release:        0.svn47.1%{?dist}.2
 Summary:        Music organazier
 
 Group:         	Applications/Multimedia 
@@ -11,6 +11,11 @@ URL:           	http://more-cowbell.org/
 #svn checkout
 #svn co -r 47 http://svn.gnome.org/svn/cowbell/trunk cowbell && tar -cvjf cowbell-svn47.tar.bz2 cowbell
 Source0:       	%{name}-svn47.tar.bz2
+# The behavior of the coalescence operator has been changed to conform to MS compiler.
+#Â Has been already filed into upstream bugtracker at http://bugzilla.gnome.org/show_bug.cgi?id=565258
+Patch0:         %{name}-coalesceop.patch
+# This is a mono bug, see https://bugzilla.novell.com/show_bug.cgi?id=379537
+Patch1:         %{name}-CS0649.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Various Mono dependencies are not available for ppc64; see bug 241850.
@@ -34,6 +39,8 @@ Vorbis and MusePack
 
 %prep
 %setup -qn cowbell
+%patch0 -p1
+%patch1 -p1
 
 %build
 ./autogen.sh
@@ -88,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun May 24 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.3-0.svn47.1.2
+- Fix FTBFS: added cowbell-coalesceop.patch and cowbell-CS0469.patch.
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-0.svn47.1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild