rpms/webkitkde/devel .cvsignore, 1.6, 1.7 sources, 1.9, 1.10 webkitkde-remove-kdelauncher.patch, 1.4, 1.5 webkitkde.spec, 1.16, 1.17 webkitkde-svn1079265.patch, 1.1, NONE
nucleo
nucleo at fedoraproject.org
Wed Feb 10 18:23:51 UTC 2010
Author: nucleo
Update of /cvs/pkgs/rpms/webkitkde/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24452
Modified Files:
.cvsignore sources webkitkde-remove-kdelauncher.patch
webkitkde.spec
Removed Files:
webkitkde-svn1079265.patch
Log Message:
update to kwebkitpart snapshot from kdereview
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/webkitkde/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore 23 Jan 2010 18:49:29 -0000 1.6
+++ .cvsignore 10 Feb 2010 18:23:51 -0000 1.7
@@ -1 +1 @@
-webkitkde-0.0.4-svn.tar.bz2
+webkitkde-0.0.5-svn.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/webkitkde/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources 23 Jan 2010 18:49:30 -0000 1.9
+++ sources 10 Feb 2010 18:23:51 -0000 1.10
@@ -1 +1 @@
-3c375f8e4255c6c168e0a8f629a41d09 webkitkde-0.0.4-svn.tar.bz2
+f3517d9a109b483a8df8230d61cecd95 webkitkde-0.0.5-svn.tar.bz2
webkitkde-remove-kdelauncher.patch:
CMakeLists.txt | 1 -
1 file changed, 1 deletion(-)
Index: webkitkde-remove-kdelauncher.patch
===================================================================
RCS file: /cvs/pkgs/rpms/webkitkde/devel/webkitkde-remove-kdelauncher.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- webkitkde-remove-kdelauncher.patch 10 Feb 2010 14:32:17 -0000 1.4
+++ webkitkde-remove-kdelauncher.patch 10 Feb 2010 18:23:51 -0000 1.5
@@ -1,10 +1,7 @@
---- webkitkde/CMakeLists.txt 2009-11-24 21:36:22.000000000 +0200
-+++ webkitkde/CMakeLists.txt 2009-11-24 21:47:10.000000000 +0200
-@@ -16,7 +16,6 @@
- add_subdirectory(kdewebkit)
- endif(${KDE_VERSION} VERSION_LESS 4.3.74)
- add_subdirectory(part)
+--- CMakeLists.txt 2010-01-30 18:04:51.000000000 +0200
++++ CMakeLists.txt 2010-02-10 20:01:41.000000000 +0200
+@@ -8,4 +8,3 @@
+ add_subdirectory(cmake)
+ add_subdirectory(icons)
+ add_subdirectory(src)
-add_subdirectory(kdelauncher)
- find_package(Msgfmt REQUIRED)
- find_package(Gettext REQUIRED)
- add_subdirectory( po )
Index: webkitkde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitkde/devel/webkitkde.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- webkitkde.spec 10 Feb 2010 14:32:17 -0000 1.16
+++ webkitkde.spec 10 Feb 2010 18:23:51 -0000 1.17
@@ -1,30 +1,18 @@
Name: webkitkde
-Version: 0.0.4
-Release: 0.3.svn1079265%{?dist}
+Version: 0.0.5
+Release: 0.1.svn1088283%{?dist}
Summary: QtWebKit bindings to KDE
Group: System Environment/Libraries
License: LGPLv2+
URL: http://techbase.kde.org/Projects/WebKit
-# To create a tarball from svn use create_tarball.rb script
-#
-# http://websvn.kde.org/trunk/KDE/kdesdk/scripts/createtarball/
-#
-# To use it you will need the script itself and a config.ini in the same directory
-# config.ini contents:
-#
-# [webkitkde]
-# mainmodule = playground
-# submodule = libs
-# kde_release = no
-# version = 0.0.4-svn
-# docs = no
-#
-# To create a new checkout use it with anonymous svn access
-# ./create_tarball.rb -n -a webkitkde
+# The source for this package was pulled from upstream's vcs.
+# Use the following commands to generate the tarball:
+# svn export -r 1088283 svn://anonsvn.kde.org/home/kde/trunk/kdereview/kwebkitpart webkitkde-0.0.5-svn
+# tar -cjf webkitkde-0.0.5-svn.tar.bz2 webkitkde-0.0.5-svn
+
Source0: %{name}-%{version}-svn.tar.bz2
-Patch0: webkitkde-svn1079265.patch
-Patch1: webkitkde-remove-kdelauncher.patch
+Patch0: webkitkde-remove-kdelauncher.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake gettext
BuildRequires: kdelibs4-devel >= 4.4.0
@@ -32,9 +20,9 @@ BuildRequires: kdelibs4-devel >= 4.4.
%description
This project aims to integrate WebKit (QtWebKit) into KDE.
The project is made up of the following components:
-- WebKitKDE: The binding between KDE and QtWebKit
-- WebKitPart: A KPart based on it
-The WebKitKDE library sits on top of QtWebKit, providing
+- kdewebkit: The binding between KDE and QtWebKit
+- kwebkitpart: A KPart based on it
+The kdewebkit library sits on top of QtWebKit, providing
KDE integration (for example, WebActions using KDE icons
and shortcuts, downloading using KIO, etc).
@@ -43,7 +31,7 @@ Summary: A KPart based on WebKi
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
%description -n webkitpart
-WebKitPart is a KPart that allows KPart-based applications,
+KWebKitPart is a KPart that allows KPart-based applications,
for example Konqueror, to make use of WebKit for viewing
web pages.
@@ -57,8 +45,7 @@ Development files for the webkitpart.
%prep
%setup -q -n %{name}-%{version}-svn
-%patch0 -p4
-%patch1 -p1
+%patch0
%build
mkdir -p %{_target_platform}
@@ -74,8 +61,6 @@ rm -rf $RPM_BUILD_ROOT
make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
#mkdir $RPM_BUILD_ROOT%{_kde4_appsdir}/webkitpart/kpartplugins
-%find_lang %{name}
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -93,7 +78,7 @@ if [ $1 -eq 0 ] ; then
gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
fi
-%files -f %{name}.lang
+%files
%defattr(-,root,root,-)
%doc README COPYING.LIB
@@ -113,9 +98,12 @@ fi
%{_kde4_includedir}/kwebkitpart.h
%{_kde4_includedir}/kwebkit_export.h
%{_kde4_libdir}/libkwebkit.so
-%{_kde4_appsdir}/cmake/modules/FindWebKitPart.cmake
+%{_kde4_appsdir}/cmake/modules/FindKWebKitPart.cmake
%changelog
+* Wed Feb 10 2010 Alexey Kurov <nucleo at fedoraproject.org> - 0.0.5-0.1.svn1088283
+- update to kwebkitpart snapshot from kdereview
+
* Wed Feb 10 2010 Alexey Kurov <nucleo at fedoraproject.org> - 0.0.4-0.3.svn1079265
- build only for kdelibs >= 4.4.0
--- webkitkde-svn1079265.patch DELETED ---
More information about the scm-commits
mailing list