[midori] Fix FTBFS issue with libsoup version detection.

[Kevin Fenzi]

commit 907d8e0eedac1a37a5e57c3f6be8310a028b0aa7
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Thu Aug 9 22:47:09 2012 -0600

    Fix FTBFS issue with libsoup version detection.

 midori-0.4.6-wscript-libsoup-version.patch |   24 ++++++++++++++++++++++++
 midori.spec                                |   13 +++++++++----
 2 files changed, 33 insertions(+), 4 deletions(-)
---
diff --git a/midori-0.4.6-wscript-libsoup-version.patch b/midori-0.4.6-wscript-libsoup-version.patch
new file mode 100644
index 0000000..9ae1b39
--- /dev/null
+++ b/midori-0.4.6-wscript-libsoup-version.patch
@@ -0,0 +1,24 @@
+From dce8096593f661f263294b353dc1486ed64c9449 Mon Sep 17 00:00:00 2001
+From: Stéphane Marguet <smarguet at gmail.com>
+Date: Tue, 24 Jul 2012 20:32:38 +0000
+Subject: Harden check_version to handle pico version
+
+Fixes: https://bugs.launchpad.net/midori/+bug/1026667
+---
+diff --git a/wscript b/wscript
+index 1623b3c..1a3b61f 100644
+--- a/wscript
++++ b/wscript
+@@ -94,7 +94,9 @@ def configure (conf):
+ 
+     def check_version (given_version, major, minor, micro):
+         if '.' in given_version:
+-            given_major, given_minor, given_micro = given_version.split ('.')
++            given_major, given_minor, given_micro = given_version.split ('.', 2)
++            if '.' in given_micro:
++                given_micro, given_pico = given_micro.split ('.', 1)
+         else:
+             given_major, given_minor, given_micro = given_version
+         return int(given_major) >  major or \
+--
+cgit v0.9.0.3
diff --git a/midori.spec b/midori.spec
index 76beb93..c35aaa6 100644
--- a/midori.spec
+++ b/midori.spec
@@ -1,6 +1,6 @@
 Name:		midori
 Version:	0.4.6
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
 Group:		Applications/Internet
@@ -14,6 +14,9 @@ Source0:	http://archive.xfce.org/src/apps/%{name}/0.4/%{name}-%{version}.tar.bz2
 Patch0: 	%{name}-fedora-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
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -67,18 +70,17 @@ developing extensions for %{name}.
 #rm -rf waf
 %patch0 -b .fedora-homepage
 %patch1 -p1 -b .desktop
+%patch2 -p1 -b .libsoup-version
 
 %build
 export CFLAGS="%{optflags}"
 ## Currently does not build against Fedora waf
-#waf	--prefix=%{_usr}			\
 ./waf	--prefix=%{_usr}			\
 	--docdir=%{_docdir}/%{name}-%{version}	\
 	--libdir=%{_libdir}			\
 	--enable-apidocs			\
 	configure
-#waf %{?_smp_mflags} build
-./waf build
+./waf %{?_smp_mflags} build
 
  
 %install
@@ -137,6 +139,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Thu Aug 09 2012 Kevin Fenzi <kevin at scrye.com> - 0.4.6-3
+- Fix FTBFS issue with libsoup version detection.
+
 * Fri Jul 27 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild