[midori] Update to 0.5.5

[Kevin Fenzi]

commit 6e3a0e5e95c0be955f74421f49f5c9caa92efebc
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Fri Aug 16 11:38:24 2013 -0600

    Update to 0.5.5

 midori.desktop.in |   30 ++++++++++++++++++++++++++++++
 midori.spec       |   17 ++++++++++++++---
 2 files changed, 44 insertions(+), 3 deletions(-)
---
diff --git a/midori.desktop.in b/midori.desktop.in
new file mode 100644
index 0000000..84277c7
--- /dev/null
+++ b/midori.desktop.in
@@ -0,0 +1,30 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+_Name=Midori
+_GenericName=Web Browser
+_X-GNOME-Fullname=Midori Web Browser
+_Comment=Browse the Web
+_X-GNOME-Keywords=Internet;WWW;Explorer
+_X-AppInstall-Keywords=Internet;WWW;Explorer
+Categories=GTK;Network;WebBrowser;
+MimeType=text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo;image/svg+xml;
+Exec=midori %U
+Icon=midori
+Terminal=false
+StartupNotify=true
+X-Osso-Type=application/x-executable
+X-Osso-Service=midori
+Actions=TabNew;WindowNew;Private;
+
+[Desktop Action TabNew]
+_Name=New Tab
+Exec=midori -e TabNew
+
+[Desktop Action WindowNew]
+_Name=New Window
+Exec=midori -e WindowNew
+
+[Desktop Action Private]
+_Name=New Private Browsing Window
+Exec=midori --private
diff --git a/midori.spec b/midori.spec
index 2418f51..eef330a 100644
--- a/midori.spec
+++ b/midori.spec
@@ -1,8 +1,8 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:		midori
-Version:	0.5.4
-Release:	2%{?dist}
+Version:	0.5.5
+Release:	1%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
 Group:		Applications/Internet
@@ -11,6 +11,9 @@ URL:		http://midori-browser.org/
 
 Source0:        http://midori-browser.org/downloads/midori_%{version}_all_.tar.bz2
 
+# Due to some launchpad/tar weirdness we are shipping a copy of this until upstream fixes it.
+Source1:        http://bazaar.launchpad.net/~midori/midori/trunk/download/head:/data/midori.desktop.in/midori.desktop.in
+
 ## Fedora-specific: Set the default homepage to start.fedoraproject.org
 ## instead of search page.
 Patch0: 	midori-0.5.0-homepage.patch
@@ -64,12 +67,17 @@ developing extensions for %{name}.
 
 
 %prep
-%setup -q -n midori_0.5.4_all_
+%setup -q
 ## Use the system-provided waf, instead of the in-tarball copy.
 #rm -rf waf
 %patch0 -p1 -b .fedora-homepage
 %patch1 -p1 -b .desktop
 
+# Copy the missing desktop file in. 
+cp -a %{SOURCE1} data/
+# Remove a bogus copy we don't need. 
+rm -f data/midori-private.desktop.in.desktop
+
 %build
 export CFLAGS="%{optflags}"
 ## Currently does not build against Fedora waf
@@ -144,6 +152,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Fri Aug 16 2013 Kevin Fenzi <kevin at scrye.com> 0.5.5-1
+- Update to 0.5.5
+
 * Sat Jul 27 2013 Kevin Fenzi <kevin at scrye.com> 0.5.4-2
 - Fix for unversioned doc dirs