From 78231d5d97841a25d5953920941d1530db34bbc5 Mon Sep 17 00:00:00 2001
From: Peter Gordon <pgordon@fedoraproject.org>
Date: Sep 08 2008 18:32:40 +0000
Subject: Update to 0.0.20; fix License tag; add icon cache scriptlets.


---

diff --git a/.cvsignore b/.cvsignore
index 9be1d33..8d2d6e0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-midori-0.0.18.tar.gz
+midori-0.0.20.tar.bz2
diff --git a/midori.spec b/midori.spec
index 140bc51..4574820 100644
--- a/midori.spec
+++ b/midori.spec
@@ -1,29 +1,28 @@
-## Dependency: WebKit SVN 29723+
-## This is the EVR for its sufficient Fedora package.
-%global	webkit_min_version	1.0.0-0.8.svn31787
-
 Name:		midori
-Version:	0.0.18
+Version:	0.0.20
 Release:	1%{?dist}
 Summary:	A lightweight GTK+ web browser 
 
 Group:		Applications/Internet
-License:	LGPLv2.1+
+License:	LGPLv2+
 URL:		http://software.twotoasts.de/?page=midori
 
-Source0:	http://software.twotoasts.de/media/%{name}/%{name}-%{version}.tar.gz
+Source0:	http://software.twotoasts.de/media/%{name}/%{name}-%{version}.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
+BuildRequires:	gtksourceview2-devel
+BuildRequires:	intltool
 BuildRequires:	libsexy-devel
+BuildRequires:	librsvg2
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel
 BuildRequires:	perl(XML::Parser)
-BuildRequires:	WebKit-gtk-devel >= %{webkit_min_version}  
-
-Requires:	WebKit-gtk >= %{webkit_min_version}
+BuildRequires:	unique-devel
+BuildRequires:	waf
+BuildRequires:	WebKit-gtk-devel
 
 %description
 Midori is a lightweight web browser, and has many features expected of a
@@ -42,17 +41,19 @@ implemented, and some are still quite incomplete.
 
 %prep
 %setup -q
-chmod a-x src/main.c
+## Use the system-provided waf, instead of the in-tarball copy.
+rm -rf waf
 
 
 %build
-%configure
-make %{?_smp_mflags}
+export CFLAGS="%{optflags}"
+waf --prefix=%{_usr} configure
+waf %{?_smp_mflags} build
 
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+waf --destdir=%{buildroot} install
 %find_lang %{name}
 desktop-file-install					\
 	--vendor fedora					\
@@ -65,14 +66,39 @@ desktop-file-install					\
 rm -rf %{buildroot}
 
 
+%post
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+fi
+
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+fi
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/midori
 %{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/icons/*/*/apps/%{name}.*
+%{_datadir}/icons/*/*/categories/extension.*
+%{_datadir}/icons/*/*/status/news-feed.*
 
 
 %changelog
+* Mon Sep 08 2008 Peter Gordon <peter@thecodergeek.com> - 0.0.20-1
+- Update to new upstream release (0.0.20): adds support for single instances,
+  some userscripts and Greasemonkey scripting, zooming and printing, as well as
+  enhanced news feed detection and session-saving (among other improvements).
+- Switch to WAF build system.
+- Add scriplets for GTK+ icon cache.
+- fix license tag (thanks to Tom Callaway)
+
 * Sat May 24 2008 Peter Gordon <peter@thecodergeek.com> - 0.0.18-1
 - Update to new upstream release (0.0.18), adds some translations and
   a lot of bug-fixes.
diff --git a/sources b/sources
index 384144d..f9b4c3f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aa9c10bbf6fe3502a65633c4fac0fb80  midori-0.0.18.tar.gz
+d27799c093b13e124eb7c0f479ea26c0  midori-0.0.20.tar.bz2