rpms/webkitkde/devel .cvsignore, 1.3, 1.4 sources, 1.6, 1.7 webkitkde-remove-kdelauncher.patch, 1.1, 1.2 webkitkde.spec, 1.9, 1.10
nucleo
nucleo at fedoraproject.org
Tue Nov 24 20:12:55 UTC 2009
Author: nucleo
Update of /cvs/pkgs/rpms/webkitkde/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20472
Modified Files:
.cvsignore sources webkitkde-remove-kdelauncher.patch
webkitkde.spec
Log Message:
Update to svn 1049337
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/webkitkde/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 9 Nov 2009 15:50:13 -0000 1.3
+++ .cvsignore 24 Nov 2009 20:12:54 -0000 1.4
@@ -1 +1 @@
-webkitkde-0.0.2-svn.tar.bz2
+webkitkde-svn1049337.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/webkitkde/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources 9 Nov 2009 15:50:13 -0000 1.6
+++ sources 24 Nov 2009 20:12:54 -0000 1.7
@@ -1 +1 @@
-a4a7e6bb355a15a21f2949986567e3c1 webkitkde-0.0.2-svn.tar.bz2
+26f7c96342ff474ba114a4297128fb0e webkitkde-svn1049337.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.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- webkitkde-remove-kdelauncher.patch 9 Nov 2009 14:33:45 -0000 1.1
+++ webkitkde-remove-kdelauncher.patch 24 Nov 2009 20:12:54 -0000 1.2
@@ -1,8 +1,8 @@
---- webkitkde-0.0.1-svn/CMakeLists.txt 2009-11-09 15:48:59.000000000 +0200
-+++ webkitkde-0.0.1-svn/CMakeLists.txt 2009-11-09 16:25:23.000000000 +0200
-@@ -14,7 +14,6 @@
- add_subdirectory(icons)
- add_subdirectory(kdewebkit)
+--- 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)
-add_subdirectory(kdelauncher)
find_package(Msgfmt REQUIRED)
Index: webkitkde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitkde/devel/webkitkde.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- webkitkde.spec 18 Nov 2009 23:01:33 -0000 1.9
+++ webkitkde.spec 24 Nov 2009 20:12:54 -0000 1.10
@@ -1,29 +1,17 @@
Name: webkitkde
-Version: 0.0.2
-Release: 0.2.20091109svn%{?dist}
+Version: 0.0.3
+Release: 0.1.svn1049337%{?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.2-svn
-# docs = no
-#
-# To create a new checkout use it with anonymous svn access
-# ./create_tarball.rb -n -a webkitkde
-Source0: %{name}-%{version}-svn.tar.bz2
+# The source for this package was pulled from upstream's vcs.
+# Use the following commands to generate the tarball:
+# svn export -r 1049337 svn://anonsvn.kde.org/home/kde/trunk/playground/libs/webkitkde
+# tar -cjf webkitkde-svn1049337.tar.bz2 kvirc
Patch0: webkitkde-remove-kdelauncher.patch
+Source0: %{name}-svn1049337.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake gettext
BuildRequires: kdelibs4-devel
@@ -36,6 +24,8 @@ The project is made up of the following
The WebKitKDE library sits on top of QtWebKit, providing
KDE integration (for example, WebActions using KDE icons
and shortcuts, downloading using KIO, etc).
+
+%if 0%{?fedora} < 13
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
@@ -44,10 +34,12 @@ Requires: %{name} = %{version}-%
%description devel
Development files for the %{name}.
+%endif
%package -n webkitpart
Summary: A KPart based on WebKitKDE library
Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
%description -n webkitpart
WebKitPart is a KPart that allows KPart-based applications,
for example Konqueror, to make use of WebKit for viewing
@@ -56,13 +48,16 @@ web pages.
%package -n webkitpart-devel
Summary: Development files for webkitpart
Group: Development/Libraries
+%if 0%{?fedora} < 13
Requires: %{name}-devel = %{version}-%{release}
+%endif
+Requires: kdelibs4-devel
Requires: webkitpart = %{version}-%{release}
%description -n webkitpart-devel
Development files for the webkitpart.
%prep
-%setup -q -n %{name}-%{version}-svn
+%setup -q -n %{name}
%patch0 -p1
%build
@@ -84,9 +79,11 @@ mkdir $RPM_BUILD_ROOT%{_kde4_appsdir}/we
%clean
rm -rf $RPM_BUILD_ROOT
+%if 0%{?fedora} < 13
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
+%endif
%post -n webkitpart
/sbin/ldconfig
@@ -105,6 +102,8 @@ fi
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc README COPYING.LIB
+
+%if 0%{?fedora} < 13
%{_kde4_libdir}/libkdewebkit.so.*
%files devel
@@ -114,6 +113,7 @@ fi
%{_kde4_includedir}/kdewebkit
%{_kde4_libdir}/libkdewebkit.so
%{_kde4_appsdir}/cmake/modules/FindKdeWebKit.cmake
+%endif
%files -n webkitpart
%defattr(-,root,root,-)
@@ -133,7 +133,11 @@ fi
%{_kde4_appsdir}/cmake/modules/FindWebKitPart.cmake
%changelog
-* Wed Nov 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.0.2-0.2.20091109svn
+* Tue Nov 24 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.0.3-0.1.svn1049337
+- version changed to 0.0.3 (kdewebkit moved to kdelibs 4.4)
+- drop webkitkde-devel subpackage for KDE 4.4
+
+* Wed Nov 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.0.2-0.2.20091109svn
- rebuild (qt-4.6.0-rc1, fc13+)
* Mon Nov 9 2009 Alexey Kurov <nucleo at fedoraproject.org> - 0.0.2-0.1.20091109svn
More information about the scm-commits
mailing list