[xnoise/f18] Update to 0.2.18

[Michel Alexandre Salim]

commit 957a21ced4e9171360839aaaf8f1a2801e86ff3d
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Tue May 14 10:51:50 2013 +0700

    Update to 0.2.18

 .gitignore                                |    2 +-
 sources                                   |    2 +-
 xnoise-0.2.18-fix_desktop_keywords.patch  |   30 +++++++++++++++++++++++++++++
 xnoise-0.2.18-fix_desktop_mimetypes.patch |   26 +++++++++++++++++++++++++
 xnoise.spec                               |   15 ++++++++++---
 5 files changed, 69 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 101984f..b52ff6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/xnoise-0.2.17.tar.gz
+/xnoise-0.2.18.tar.gz
diff --git a/sources b/sources
index 11aa8e9..f14902a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a72b0adf06667f682f972f9c38174f02  xnoise-0.2.17.tar.gz
+5eb8d3072870066af4946343a3135230  xnoise-0.2.18.tar.gz
diff --git a/xnoise-0.2.18-fix_desktop_keywords.patch b/xnoise-0.2.18-fix_desktop_keywords.patch
new file mode 100644
index 0000000..558f150
--- /dev/null
+++ b/xnoise-0.2.18-fix_desktop_keywords.patch
@@ -0,0 +1,30 @@
+From df3f18a554bda0f9a473c14cc78e5a193d469271 Mon Sep 17 00:00:00 2001
+From: Michel Alexandre Salim <salimma at fedoraproject.org>
+Date: Tue, 14 May 2013 10:16:45 +0700
+Subject: [PATCH 1/2] Add missing trailing ; to list of desktop file keywords
+
+---
+ data/misc/xnoise.desktop.in.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/data/misc/xnoise.desktop.in.in b/data/misc/xnoise.desktop.in.in
+index 3c57755..c10cdf6 100644
+--- a/data/misc/xnoise.desktop.in.in
++++ b/data/misc/xnoise.desktop.in.in
+@@ -11,7 +11,7 @@ Categories=GTK;Audio;Video;Player;AudioVideo;
+ StartupNotify=true
+ MimeType=application/x-ogg;application/ogg;video/3gpp;video/avi;video/dv;video/fli;video/flv;video/mp4;video/mp4v-es;video/mpeg;video/msvideo;video/ogg;video/quicktime;video/vivo;video/vnd.divx;video/vnd.vivo;video/x-anim;video/x-avi;video/x-flc;video/x-fli;video/x-flic;video/x-flv;video/x-m4v;video/x-matroska;video/x-mpeg;video/x-mpg;video/x-ms-asf;video/x-msvideo;video/x-ms-wm;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvx;video/x-nsv;video/x-ogm+ogg;video/x-theora;video/x-theora+ogg;audio/x-vorbis+ogg;audio/x-scpls;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-mpegurl;audio/x-flac;x-content/audio-cdda;x-content/audio-player;application/vnd.rn-realmedia;application/x-matroska;application/ogg;application/x-flac;application/xspf+xml;application/x-troff-msvideo;application/x-flash-video;
+ Actions=Play;Next;Previous;Stop;Quit;
+-Keywords=Media;Audio;Video;Player;Mediaplayer;Movie;MP3
++Keywords=Media;Audio;Video;Player;Mediaplayer;Movie;MP3;
+ 
+ [Desktop Action Play]
+ _Name=Play/Pause
+@@ -37,4 +37,3 @@ OnlyShowIn=Unity;
+ _Name=Quit application
+ Exec=xnoise --quit
+ OnlyShowIn=Unity;
+-
+-- 
+1.8.1.4
+
diff --git a/xnoise-0.2.18-fix_desktop_mimetypes.patch b/xnoise-0.2.18-fix_desktop_mimetypes.patch
new file mode 100644
index 0000000..68b30fb
--- /dev/null
+++ b/xnoise-0.2.18-fix_desktop_mimetypes.patch
@@ -0,0 +1,26 @@
+From 6096108fdb64c6fdffd22dac2a39d6ea019ffcc2 Mon Sep 17 00:00:00 2001
+From: Michel Alexandre Salim <salimma at fedoraproject.org>
+Date: Tue, 14 May 2013 10:17:32 +0700
+Subject: [PATCH 2/2] Remove warning caused by listing application/ogg twice in
+ MimeTypes
+
+---
+ data/misc/xnoise.desktop.in.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/misc/xnoise.desktop.in.in b/data/misc/xnoise.desktop.in.in
+index c10cdf6..a611c88 100644
+--- a/data/misc/xnoise.desktop.in.in
++++ b/data/misc/xnoise.desktop.in.in
+@@ -9,7 +9,7 @@ Type=Application
+ Icon=xnoise
+ Categories=GTK;Audio;Video;Player;AudioVideo;
+ StartupNotify=true
+-MimeType=application/x-ogg;application/ogg;video/3gpp;video/avi;video/dv;video/fli;video/flv;video/mp4;video/mp4v-es;video/mpeg;video/msvideo;video/ogg;video/quicktime;video/vivo;video/vnd.divx;video/vnd.vivo;video/x-anim;video/x-avi;video/x-flc;video/x-fli;video/x-flic;video/x-flv;video/x-m4v;video/x-matroska;video/x-mpeg;video/x-mpg;video/x-ms-asf;video/x-msvideo;video/x-ms-wm;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvx;video/x-nsv;video/x-ogm+ogg;video/x-theora;video/x-theora+ogg;audio/x-vorbis+ogg;audio/x-scpls;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-mpegurl;audio/x-flac;x-content/audio-cdda;x-content/audio-player;application/vnd.rn-realmedia;application/x-matroska;application/ogg;application/x-flac;application/xspf+xml;application/x-troff-msvideo;application/x-flash-video;
++MimeType=application/x-ogg;application/ogg;video/3gpp;video/avi;video/dv;video/fli;video/flv;video/mp4;video/mp4v-es;video/mpeg;video/msvideo;video/ogg;video/quicktime;video/vivo;video/vnd.divx;video/vnd.vivo;video/x-anim;video/x-avi;video/x-flc;video/x-fli;video/x-flic;video/x-flv;video/x-m4v;video/x-matroska;video/x-mpeg;video/x-mpg;video/x-ms-asf;video/x-msvideo;video/x-ms-wm;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvx;video/x-nsv;video/x-ogm+ogg;video/x-theora;video/x-theora+ogg;audio/x-vorbis+ogg;audio/x-scpls;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-mpegurl;audio/x-flac;x-content/audio-cdda;x-content/audio-player;application/vnd.rn-realmedia;application/x-matroska;application/x-flac;application/xspf+xml;application/x-troff-msvideo;application/x-flash-video;
+ Actions=Play;Next;Previous;Stop;Quit;
+ Keywords=Media;Audio;Video;Player;Mediaplayer;Movie;MP3;
+ 
+-- 
+1.8.1.4
+
diff --git a/xnoise.spec b/xnoise.spec
index db9bb81..974900c 100644
--- a/xnoise.spec
+++ b/xnoise.spec
@@ -1,9 +1,9 @@
-#global commit_hash 
-#global snap_date   
+#global commit_hash
+#global snap_date
 #global alphatag    %%{snap_date}git%%{commit_hash}
 
 Name:           xnoise
-Version:        0.2.17
+Version:        0.2.18
 Release:        1%{?dist}
 Summary:        Tracklist-centric Media Player
 
@@ -15,6 +15,9 @@ Source0:        https://bitbucket.org/shuerhaaken/xnoise/downloads/xnoise-%{vers
 # git checkout %%{commit_hash} && ./autogen.sh && make dist-xz
 # mv xnoise-%%{version}.tar.xz xnoise-%%{version}-%%{commit_hash}.tar.xz
 #Source0:        xnoise-%%{version}-%%{commit_hash}.tar.xz
+# https://bitbucket.org/shuerhaaken/xnoise/pull-request/11/desktop-file-fixes/diff
+Patch0:         xnoise-0.2.18-fix_desktop_keywords.patch
+Patch1:         xnoise-0.2.18-fix_desktop_mimetypes.patch
 
 # for snapshots
 # BuildRequires:  gnome-common autoconf automake libtool
@@ -57,6 +60,8 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .fix_desktop_keywords
+%patch1 -p1 -b .fix_desktop_mimetypes
 
 
 %build
@@ -133,6 +138,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Tue May 14 2013 Michel Salim <salimma at fedoraproject.org> - 0.2.18-1
+- Update to 0.2.18
+
 * Sat Mar 16 2013 Michel Salim <salimma at fedoraproject.org> - 0.2.17-1
 - Update to 0.2.17
 
@@ -220,4 +228,3 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 * Sat Apr  3 2010 Michel Salim <salimma at fedoraproject.org> - 0.1.2-0.1.331hg
 - Initial package
-