From cb22b540bd4c1ba050d20d09b2a222994622abac Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Nov 12 2012 17:43:12 +0000
Subject: Update to 3.6.1


---

diff --git a/.gitignore b/.gitignore
index c3ab306..2c7d1fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ brasero-2.31.5.tar.bz2
 /brasero-3.4.1.tar.xz
 /brasero-3.5.92.tar.xz
 /brasero-3.6.0.tar.xz
+/brasero-3.6.1.tar.xz
diff --git a/brasero-3.7.0-desktop-file-keywords.patch b/brasero-3.7.0-desktop-file-keywords.patch
new file mode 100644
index 0000000..4087291
--- /dev/null
+++ b/brasero-3.7.0-desktop-file-keywords.patch
@@ -0,0 +1,21 @@
+From e2c533197da441898667e0afd477b074042301b8 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Sat, 27 Oct 2012 21:19:45 +0000
+Subject: Add keywords to the desktop file
+
+This makes gnome-shell search more useful.
+---
+diff --git a/data/brasero.desktop.in.in b/data/brasero.desktop.in.in
+index 78d9735..618ddb1 100644
+--- a/data/brasero.desktop.in.in
++++ b/data/brasero.desktop.in.in
+@@ -2,6 +2,7 @@
+ _Name=Brasero
+ _GenericName=Disc Burner and Copier
+ _Comment=Create and copy CDs and DVDs
++_Keywords=disc;cdrom;dvd;burn;audio;video;
+ Categories=GTK;GNOME;AudioVideo;DiscBurning;
+ MimeType=application/x-cd-image;application/x-cdrdao-toc;application/x-cue;application/x-toc;audio/x-scpls;audio/x-ms-asx;audio/x-mp3-playlist;audio/x-mpegurl;application/x-brasero;x-content/audio-cdda;x-content/video-dvd;x-content/video-vcd;x-content/video-svcd;x-content/image-picturecd;
+ Exec=brasero %U
+--
+cgit v0.9.0.2
diff --git a/brasero-3.7.0-gnome-common-warnings.patch b/brasero-3.7.0-gnome-common-warnings.patch
new file mode 100644
index 0000000..dd588d4
--- /dev/null
+++ b/brasero-3.7.0-gnome-common-warnings.patch
@@ -0,0 +1,34 @@
+From 5ccdd686d5e551a0b402641d5fbafb0fc8a38d07 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Tue, 06 Nov 2012 19:22:56 +0000
+Subject: Fix some compiler warnings made fatal by gnome-common
+
+See https://bugzilla.gnome.org/show_bug.cgi?id=608953
+---
+diff --git a/libbrasero-burn/burn-plugin.c b/libbrasero-burn/burn-plugin.c
+index fe4a2da..f97bc5f 100644
+--- a/libbrasero-burn/burn-plugin.c
++++ b/libbrasero-burn/burn-plugin.c
+@@ -41,6 +41,8 @@
+ 
+ #include <gst/gst.h>
+ 
++#include <stdio.h>
++
+ #include "brasero-media-private.h"
+ 
+ #include "brasero-media.h"
+diff --git a/src/Makefile.am b/src/Makefile.am
+index aa3388e..0de9c2f 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -12,6 +12,7 @@ INCLUDES = \
+ 	-DBRASERO_SYSCONFDIR=\"$(sysconfdir)\"   			\
+ 	-DBRASERO_DATADIR=\"$(datadir)/brasero\"     	    		\
+ 	-DBRASERO_LIBDIR=\"$(libdir)\"  	         		\
++	-DEGG_SM_CLIENT_BACKEND_XSMP					\
+ 	$(WARN_CFLAGS)							\
+ 	$(DISABLE_DEPRECATED)						\
+ 	$(BRASERO_GLIB_CFLAGS)						\
+--
+cgit v0.9.0.2
diff --git a/brasero.spec b/brasero.spec
index 64a1e1a..473df27 100644
--- a/brasero.spec
+++ b/brasero.spec
@@ -1,10 +1,11 @@
 
 Name:      brasero
-Version:   3.6.0
-Release:   2%{?dist}
+Version:   3.6.1
+Release:   1%{?dist}
 Summary:   Gnome CD/DVD burning application
 Group:     Applications/Multimedia
-License:   GPLv2+
+# see https://bugzilla.gnome.org/show_bug.cgi?id=683503
+License:   GPLv3+
 URL:       http://www.gnome.org/projects/brasero/
 #VCS: git:git://git.gnome.org/brasero
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/brasero/3.6/%{name}-%{version}.tar.xz
@@ -48,6 +49,10 @@ Requires:  cdrdao
 # Support reading/copying complete BD(-RE) media
 Patch0: brasero-3.6.0-copy-BD.patch
 
+# from upstream
+Patch1: brasero-3.7.0-desktop-file-keywords.patch
+Patch2: brasero-3.7.0-gnome-common-warnings.patch
+
 
 Requires(post):    shared-mime-info
 Requires(postun):  shared-mime-info
@@ -101,6 +106,8 @@ developing brasero applications.
 %prep
 %setup -q
 %patch0 -p1 -b .copy-BD
+%patch1 -p1 -b .desktop-file-keywords
+%patch2 -p1 -b .gnome-common-warnings
 
 
 %build
@@ -201,6 +208,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
 %changelog
+* Mon Nov 12 2012 Tomas Bzatek <tbzatek@redhat.com> - 3.6.1-1
+- Update to 3.6.1
+
 * Wed Oct 10 2012 Tomas Bzatek <tbzatek@redhat.com> - 3.6.0-2
 - Fix BD media disc copy
 
diff --git a/sources b/sources
index ee1f4ad..d21a88d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8157becacd2193e923d4537dd632ebb3  brasero-3.6.0.tar.xz
+1bf94b5d75f4a003b3d139d50e620c7b  brasero-3.6.1.tar.xz