[midori] Update to 0.5.6

[Kevin Fenzi]

commit 353f5bcdbb845bb7b28c87a62bbf3bb3f9c968a7
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Tue Nov 19 20:33:46 2013 -0700

    Update to 0.5.6

 .gitignore  |    1 +
 midori.spec |   67 ++++++++++++++++------------------------------------------
 sources     |    2 +-
 3 files changed, 21 insertions(+), 49 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 92597c6..3ea1270 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ midori-0.2.6.tar.bz2
 /midori-0.5.2.tar.bz2
 /midori_0.5.4_all_.tar.bz2
 /midori_0.5.5_all_.tar.bz2
+/midori_0.5.6_all_.tar.bz2
diff --git a/midori.spec b/midori.spec
index dcd278e..c62c828 100644
--- a/midori.spec
+++ b/midori.spec
@@ -1,8 +1,8 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:		midori
-Version:	0.5.5
-Release:	2%{?dist}
+Version:	0.5.6
+Release:	1%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
 Group:		Applications/Internet
@@ -11,14 +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
-# Remove the private browsing extension group. It's not up to spec
-Patch1:		midori-0.5.0-desktop.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -37,8 +32,9 @@ BuildRequires:	python-docutils
 BuildRequires:	sqlite-devel
 BuildRequires:	unique-devel
 BuildRequires:	vala
-BuildRequires:	waf >= 1.5
 BuildRequires:	webkitgtk-devel >= 1.1.1
+BuildRequires:	cmake
+BuildRequires:	librsvg2-tools
 
 %description
 Midori is a lightweight web browser, and has many features expected of a
@@ -55,45 +51,20 @@ modern browser, including:
 The project is currently in an early alpha state. The features are still being
 implemented, and some are still quite incomplete.
 
-%package	devel
-Summary:	Development files for %{name}
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	vala
-
-%description	devel
-The %{name}-devel package contains libraries and header files for
-developing extensions for %{name}.
-
-
 %prep
 %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
-./waf	--prefix=%{_usr}			\
-	--docdir=%{_pkgdocdir}                  \
-	--libdir=%{_libdir}			\
-	--enable-apidocs			\
-        --disable-zeitgeist                     \
-	configure
-./waf %{?_smp_mflags} build
-
- 
+#cmake -DCMAKE_INSTALL_SYSCONFDIR=/etc -DUSE_APIDOCS=1 -DUSE_ZEITGEIST=OFF -DHALF_BRO_INCOM_WEBKIT2=ON .
+%cmake -DCMAKE_INSTALL_SYSCONFDIR=/etc -DUSE_APIDOCS=1 -DUSE_ZEITGEIST=OFF .
+
+make %{?_smp_mflags}
+
 %install
 rm -rf %{buildroot}
-#waf --destdir=%{buildroot} install
-./waf --destdir=%{buildroot} install
+make install DESTDIR=$RPM_BUILD_ROOT
+
 %find_lang %{name}
 desktop-file-install					\
 %if 0%{?fedora} < 19
@@ -104,6 +75,7 @@ desktop-file-install					\
 	%{buildroot}%{_datadir}/applications/%{name}.desktop
 desktop-file-install					\
 	--delete-original				\
+	--remove-not-show-in=Pantheon			\
 	--dir %{buildroot}%{_datadir}/applications	\
 	%{buildroot}%{_datadir}/applications/%{name}-private.desktop
 
@@ -144,16 +116,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/%{name}/
 %{_libdir}/%{name}/
 %{_sysconfdir}/xdg/%{name}/
-#%config(noreplace) %{_sysconfdir}/%{name}/extensions/*/config
-#%{_sysconfdir}/%{name}/
-
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/*
-%{_datadir}/vala/vapi/*
-
+%{_datadir}/gtk-doc/html/%{name}*
+%{_datadir}/appdata/%{name}.appdata.xml
+%{_libdir}/%{name}/
+%{_libdir}/libmidori-core.*
 
 %changelog
+* Tue Nov 19 2013 Kevin Fenzi <kevin at scrye.com> 0.5.6-1
+- Update to 0.5.6
+
 * Wed Nov 06 2013 Kevin Fenzi <kevin at scrye.com> 0.5.5-2
 - Add update-desktop-database scriptlet. Fixes bug #1003658
 
diff --git a/sources b/sources
index 6714985..4053877 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b99e87d4b73a4732ed1c1e591f0242ac  midori_0.5.5_all_.tar.bz2
+62ee86eb103b74efe71d40e343120a3c  midori_0.5.6_all_.tar.bz2