[midori] Update to 0.4.7

[Kevin Fenzi]

commit deda6279ec311de91f61531b6e103b8a1ec25231
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Wed Sep 19 16:59:42 2012 -0600

    Update to 0.4.7

 .gitignore                                         |    1 +
 midori-0.4.1-bookmarks-combobox.patch              |  221 --------------------
 midori-0.4.5-https-libsoup.patch                   |   28 ---
 midori-0.4.6-wscript-libsoup-version.patch         |   24 --
 ...4.0-desktop.patch => midori-0.4.7-desktop.patch |    8 +-
 midori-0.4.7-homepage.patch                        |   11 +
 midori-fedora-homepage.patch                       |   12 -
 midori.spec                                        |   17 +-
 sources                                            |    2 +-
 9 files changed, 25 insertions(+), 299 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5d8a8f5..0fa0487 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ midori-0.2.6.tar.bz2
 /midori-0.4.4.tar.bz2
 /midori-0.4.5.tar.bz2
 /midori-0.4.6.tar.bz2
+/midori-0.4.7.tar.bz2
diff --git a/midori-0.4.0-desktop.patch b/midori-0.4.7-desktop.patch
similarity index 84%
rename from midori-0.4.0-desktop.patch
rename to midori-0.4.7-desktop.patch
index 9d0d3f3..66be00b 100644
--- a/midori-0.4.0-desktop.patch
+++ b/midori-0.4.7-desktop.patch
@@ -1,23 +1,23 @@
 diff -Nur midori-0.4.0.orig/data/midori.desktop.in midori-0.4.0/data/midori.desktop.in
 --- midori-0.4.0.orig/data/midori.desktop.in	2011-08-01 16:06:36.000000000 -0600
 +++ midori-0.4.0/data/midori.desktop.in	2011-08-01 17:34:30.965932030 -0600
-@@ -13,19 +13,3 @@
+@@ -15,19 +15,3 @@ StartupNotify=true
  X-Osso-Type=application/x-executable
  X-Osso-Service=midori
  X-Ayatana-Desktop-Shortcuts=TabNew;WindowNew;Private
 -
 -[TabNew Shortcut Group]
--Name=New _Tab
+-_Name=New Tab
 -Exec=midori -e TabNew
 -TargetEnvironment=Unity
 -
 -[WindowNew Shortcut Group]
--Name=New _Window
+-_Name=New Window
 -Exec=midori -e WindowNew
 -TargetEnvironment=Unity
 -
 -[Private Shortcut Group]
--Name=New P_rivate Browsing Window
+-_Name=New Private Browsing Window
 -Exec=midori --private
 -TargetEnvironment=Unity
 -
diff --git a/midori-0.4.7-homepage.patch b/midori-0.4.7-homepage.patch
new file mode 100644
index 0000000..339c36a
--- /dev/null
+++ b/midori-0.4.7-homepage.patch
@@ -0,0 +1,11 @@
+--- ./midori/midori-settings.vala	2012-09-07 12:39:55.000000000 +0200
++++ ./midori/midori-settings.vala.new	2012-09-08 15:37:25.190444847 +0200
+@@ -73,7 +73,7 @@
+         public bool open_tabs_next_to_current { get; set; default = true; }
+         public bool always_show_tabbar { get; set; default = true; }
+ 
+-        public string homepage { get; set; default = "http://www.google.com"; }
++        public string homepage { get; set; default = "http://start.fedoraproject.org"; }
+         static string default_download_folder () {
+             return Environment.get_user_special_dir (UserDirectory.DOWNLOAD)
+                 ?? Environment.get_home_dir ();
diff --git a/midori.spec b/midori.spec
index c35aaa6..39e4f26 100644
--- a/midori.spec
+++ b/midori.spec
@@ -1,6 +1,6 @@
 Name:		midori
-Version:	0.4.6
-Release:	3%{?dist}
+Version:	0.4.7
+Release:	1%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
 Group:		Applications/Internet
@@ -11,12 +11,9 @@ Source0:	http://archive.xfce.org/src/apps/%{name}/0.4/%{name}-%{version}.tar.bz2
 
 ## Fedora-specific: Set the default homepage to start.fedoraproject.org
 ## instead of Google.
-Patch0: 	%{name}-fedora-homepage.patch
+Patch0: 	%{name}-0.4.7-homepage.patch
 # Remove the private browsing extension group. It's not up to spec
-Patch1:		midori-0.4.0-desktop.patch
-# Fix libsoup version check: 
-# http://git.xfce.org/apps/midori/commit/?id=dce8096593f661f263294b353dc1486ed64c9449
-Patch2:         midori-0.4.6-wscript-libsoup-version.patch
+Patch1:		midori-0.4.7-desktop.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -70,7 +67,6 @@ developing extensions for %{name}.
 #rm -rf waf
 %patch0 -b .fedora-homepage
 %patch1 -p1 -b .desktop
-%patch2 -p1 -b .libsoup-version
 
 %build
 export CFLAGS="%{optflags}"
@@ -125,7 +121,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/applications/%{name}-private.desktop
 %{_datadir}/icons/*/*/apps/%{name}.*
 %{_datadir}/icons/*/*/categories/extension.*
-%{_datadir}/icons/*/*/status/news-feed.*
+%{_datadir}/icons/*/*/status/internet-news-reader.*
 %{_datadir}/%{name}/
 %{_libdir}/%{name}/
 %{_sysconfdir}/xdg/%{name}/
@@ -139,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Wed Sep 19 2012 Kevin Fenzi <kevin at scrye.com> 0.4.7-1
+- Update to 0.4.7
+
 * Thu Aug 09 2012 Kevin Fenzi <kevin at scrye.com> - 0.4.6-3
 - Fix FTBFS issue with libsoup version detection.
 
diff --git a/sources b/sources
index aa7eef9..3df4d74 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3c3f0030611d9126ab90be48d44cab57  midori-0.4.6.tar.bz2
+06db7b88a41e9b2265728960d5e98f35  midori-0.4.7.tar.bz2