[rekonq] rekonq 0.8.0 BR: pkgconfig(QtWebKit), s/kdebase-workspace-devel/kdelibs4-devel/ Requires: s/kdebase-

[Rex Dieter]

commit 6d89e35389752a512176fef08e3335e2575406ac
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Oct 19 16:55:53 2011 -0500

    rekonq 0.8.0
    BR: pkgconfig(QtWebKit), s/kdebase-workspace-devel/kdelibs4-devel/
    Requires: s/kdebase-workspace/kdebase-runtime/
    add tighter, versioned qt runtime dep

 .gitignore  |    4 +---
 rekonq.spec |   48 +++++++++++++++++++++++++++---------------------
 sources     |    2 +-
 3 files changed, 29 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bc3330a..3e5f661 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
-rekonq-0.5.0.tar.bz2
-/rekonq-0.6.0.tar.bz2
-/rekonq-0.6.1.tar.bz2
 /rekonq-0.7.0.tar.bz2
+/rekonq-0.8.0.tar.bz2
diff --git a/rekonq.spec b/rekonq.spec
index 3a5cdef..d52d581 100644
--- a/rekonq.spec
+++ b/rekonq.spec
@@ -1,5 +1,5 @@
 Name:		rekonq
-Version:	0.7.0
+Version:	0.8.0
 Release:	1%{?dist}
 Summary:	KDE browser based on QtWebkit
 
@@ -10,14 +10,14 @@ Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 
-BuildRequires:	kdebase-workspace-devel >= 4.5.0
-BuildRequires:	qt-devel >= 4.7.0
+BuildRequires:  desktop-file-utils
 BuildRequires:	gettext
-BuildRequires:	desktop-file-utils
 BuildRequires:	gtk2-devel
+BuildRequires:	kdelibs4-devel	
+BuildRequires:	pkgconfig(QtWebKit)
 
-Requires: kdebase-workspace >= 4.5.0
-Requires: qt >= 4.7.0
+Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 
 %description
 rekonq is a KDE browser based on QtWebkit. Its code is based on Nokia 
@@ -36,38 +36,44 @@ make %{?_smp_mflags} -C %{_target_platform}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
-%find_lang %{name}
-desktop-file-validate %{buildroot}/%{_datadir}/applications/kde4/%{name}.desktop
+make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
+%find_lang %{name} --with-kde
+
+%check
+desktop-file-validate %{buildroot}/%{_datadir}/applications/kde4/rekonq.desktop
+
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %post
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor/ &>/dev/null
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
 fi
 
 %posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog INSTALL TODO
 %{_kde4_bindir}/rekonq
-%{_libdir}/libkdeinit4_rekonq.so
+%{_kde4_libdir}/libkdeinit4_rekonq.so
 %{_kde4_sharedir}/config.kcfg/rekonq.kcfg
 %{_kde4_sharedir}/applications/kde4/rekonq.desktop
-%{_kde4_iconsdir}/hicolor/*/apps/./rekonq.png
-%{_kde4_docdir}/HTML/en/%{name}/
-%dir %{_kde4_appsdir}/%{name}
-%{_kde4_appsdir}/%{name}/*
+%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_appsdir}/rekonq/
 
 %changelog
+* Wed Oct 19 2011 Rex Dieter <rdieter at fedoraproject.org> 0.8.0-1
+- rekonq 0.8.0
+- BR: pkgconfig(QtWebKit), s/kdebase-workspace-devel/kdelibs4-devel/
+- Requires: s/kdebase-workspace/kdebase-runtime/
+- add tighter, versioned qt runtime dep
+
 * Thu Jul 28 2011 Eelko Berkenpies <fedora at berkenpi.es> 0.7.0-1
 - new upstream version
 - dropped rekonq_fix_CVE-2010-2536.patch, fixed upstream
diff --git a/sources b/sources
index 45158bb..f9037c3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-73de712f71ea4caf2e66a92c77505da8  rekonq-0.7.0.tar.bz2
+ff92c4bef1a221d8293b2bca83d505f1  rekonq-0.8.0.tar.bz2