From 517aece94034f8b75d1dc765d1841cb62211bea5 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 29 Sep 2011 08:54:37 -0500 Subject: [PATCH] qtwebkit-2.2.0 (final) more pkgconfig-style deps --- .gitignore | 2 +- qtwebkit.spec | 22 +++++++++++++--------- sources | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 97b6d00..f474d6e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ /qtwebkit-developers-qtwebkit-qtwebkit-2.1.1.tar.xz /qtwebkit-2.2-week35.tar.xz -/qtwebkit-2.2.0-rc1.tar.xz +/qtwebkit-2.2.0.tar.xz diff --git a/qtwebkit.spec b/qtwebkit.spec index e954a1f..950b92f 100644 --- a/qtwebkit.spec +++ b/qtwebkit.spec @@ -1,17 +1,17 @@ -%define snap rc1 +#define snap rc1 Name: qtwebkit Version: 2.2.0 -Release: 0.1.%{snap}%{?dist} +Release: 1%{?dist} Summary: Qt WebKit bindings Group: System Environment/Libraries License: LGPLv2 with exceptions or GPLv3 with exceptions URL: http://trac.webkit.org/wiki/QtWebKit # git clone git://gitorious.org/+qtwebkit-developers/webkit/qtwebkit.git ; cd qtwebkit -# git archive --prefix=webkit-qtwebkit/ qtwebkit-2.2-%{snap} \ +# git archive --prefix=webkit-qtwebkit/ qtwebkit-2.2.0 \ # autogen.sh ChangeLog configure.ac GNUmakefile.am Makefile Source/ Tools/ | xz -9 -Source0: qtwebkit-2.2.0-%{snap}.tar.xz +Source0: qtwebkit-2.2.0.tar.xz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) # search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too @@ -31,17 +31,17 @@ BuildRequires: bison BuildRequires: chrpath BuildRequires: flex BuildRequires: gperf -BuildRequires: libicu-devel -BuildRequires: pcre-devel # gstreamer media support BuildRequires: pkgconfig(gstreamer-0.10) pkgconfig(gstreamer-app-0.10) pkgconfig(gio-2.0) pkgconfig(glib-2.0) +BuildRequires: pkgconfig(icu) +BuildRequires: pkgconfig(libpcre) +BuildRequires: pkgconfig(QtCore) pkgconfig(QtNetwork) +BuildRequires: pkgconfig(sqlite3) BuildRequires: perl -BuildRequires: qt4-devel -# for qtlocation %if 0%{?fedora} +# for QtLocation, QtSensors BuildRequires: qt-mobility-devel >= 1.2 %endif -BuildRequires: sqlite-devel Obsoletes: qt-webkit < 1:4.9.0 Provides: qt-webkit = 2:%{version}-%{release} Provides: qt4-webkit = 2:%{version}-%{release} @@ -128,6 +128,10 @@ rm -rf %{buildroot} %changelog +* Thu Sep 29 2011 Rex Dieter 2.2.0-1 +- qtwebkit-2.2.0 (final) +- more pkgconfig-style deps + * Wed Sep 14 2011 Rex Dieter 2.2.0-0.1.rc1 - qtwebkit-2.2.0-rc1 diff --git a/sources b/sources index 62f22ae..8dd1410 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5c1581052ad5bb7aed07a1798a340061 qtwebkit-2.2.0-rc1.tar.xz +5c1581052ad5bb7aed07a1798a340061 qtwebkit-2.2.0.tar.xz