dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-webkitkde-0.0.1-svn.tar.bz2

.gitignore

@@ -0,0 +1 @@
+webkitkde-0.0.5-svn.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: webkitkde
-# $Id$
-NAME := webkitkde
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

import.log

@@ -1 +0,0 @@
-webkitkde-0_0_1-0_1_20090924svn_fc11:HEAD:webkitkde-0.0.1-0.1.20090924svn.fc11.src.rpm:1253896781

sources

@@ -1 +1 @@
-eccfb5d3f6c973f18b4b55cb01789756  webkitkde-0.0.1-svn.tar.bz2
+f3517d9a109b483a8df8230d61cecd95  webkitkde-0.0.5-svn.tar.bz2

webkitkde-remove-kdelauncher.patch

@@ -0,0 +1,7 @@
+--- 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)

webkitkde.spec

@@ -1,68 +1,50 @@
 Name:             webkitkde
-Version:          0.0.1
+Version:          0.0.5
-Release:          0.2.20090924svn%{?dist}
+Release:          0.2.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
+# The source for this package was pulled from upstream's vcs.
-#
+# Use the following commands to generate the tarball:
-# http://websvn.kde.org/trunk/KDE/kdesdk/scripts/createtarball/
+#  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
-# 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.1-svn
-# docs         = no
-#
-# To create a new checkout use it with anonymous svn access
-# ./create_tarball.rb -n -a webkitkde
-# svn revision 1027811
 Source0:          %{name}-%{version}-svn.tar.bz2
+Patch0:           webkitkde-remove-kdelauncher.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    cmake gettext
-BuildRequires:    kdelibs4-devel
+BuildRequires:    kdelibs4-devel >= 4.4.0
 
 %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
+- kdewebkit: The binding between KDE and QtWebKit
-- WebKitPart: A KPart based on it
+- kwebkitpart: A KPart based on it
-The WebKitKDE library sits on top of QtWebKit, providing
+The kdewebkit library sits on top of QtWebKit, providing
 KDE integration (for example, WebActions using KDE icons
 and shortcuts, downloading using KIO, etc).
-%package devel
-Summary:          Development files for %{name}
-Group:            Development/Libraries
-Requires:         kdelibs4-devel
-Requires:         %{name} = %{version}-%{release}
-
-%description devel
-Development files for the %{name}.
 
 %package -n webkitpart
 Summary:          A KPart based on WebKitKDE library
 Group:            System Environment/Libraries
 %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.
 
 %package -n webkitpart-devel
 Summary:          Development files for webkitpart
 Group:            Development/Libraries
-Requires:         %{name}-devel = %{version}-%{release}
+Requires:         kdelibs4-devel
 Requires:         webkitpart = %{version}-%{release}
 %description -n webkitpart-devel
 Development files for the webkitpart.
 
 %prep
 %setup -q -n %{name}-%{version}-svn
+%patch0
 
 %build
 mkdir -p %{_target_platform}
@@ -76,17 +58,11 @@ make %{?_smp_mflags} -C %{_target_platform}
 rm -rf $RPM_BUILD_ROOT
 
 make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
-mkdir $RPM_BUILD_ROOT%{_kde4_appsdir}/webkitpart/kpartplugins
+#mkdir $RPM_BUILD_ROOT%{_kde4_appsdir}/webkitpart/kpartplugins
-
-%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
 %post -n webkitpart
 /sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
@@ -101,37 +77,60 @@ if [ $1 -eq 0 ] ; then
   gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 fi
 
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc README COPYING.LIB
-%{_kde4_libdir}/libkdewebkit.so.*
-
-%files devel
-%defattr(-,root,root,-)
-%doc README
-%{_kde4_includedir}/KDE/KdeWebKit
-%{_kde4_includedir}/kdewebkit
-%{_kde4_libdir}/libkdewebkit.so
-%{_kde4_appsdir}/cmake/modules/FindKdeWebKit.cmake
-
 %files -n webkitpart
 %defattr(-,root,root,-)
 %doc README COPYING.LIB
-%{_kde4_libdir}/kde4/webkitkdepart.so
+%{_kde4_libdir}/kde4/kwebkitpart.so*
-%{_kde4_libdir}/libwebkitkde.so.*
+%{_kde4_libdir}/libkwebkit.so.*
 %{_kde4_iconsdir}/hicolor/*/apps/webkit.png
-%{_kde4_appsdir}/webkitpart
+%{_kde4_appsdir}/kwebkitpart
-%{_kde4_datadir}/kde4/services/webkitpart.desktop
+%{_kde4_datadir}/kde4/services/kwebkitpart.desktop
 
 %files -n webkitpart-devel
 %defattr(-,root,root,-)
 %doc README
-%{_kde4_includedir}/KDE/WebKitPart
+%{_kde4_includedir}/KDE/KWebKitPart
-%{_kde4_includedir}/webkitkde
+%{_kde4_includedir}/kwebkitpart.h
-%{_kde4_libdir}/libwebkitkde.so
+%{_kde4_includedir}/kwebkit_export.h
-%{_kde4_appsdir}/cmake/modules/FindWebKitPart.cmake
+%{_kde4_libdir}/libkwebkit.so
+%{_kde4_appsdir}/cmake/modules/FindKWebKitPart.cmake
 
 %changelog
+* Wed Mar 24 2010 Alexey Kurov <nucleo@fedoraproject.org> - 0.0.5-0.2.svn1088283
+- drop webkitkde package
+- removed Requires: webkitkde from webkitpart
+
+* Wed Feb 10 2010 Alexey Kurov <nucleo@fedoraproject.org> - 0.0.5-0.1.svn1088283
+- update to kwebkitpart snapshot from kdereview
+
+* Wed Feb 10 2010 Alexey Kurov <nucleo@fedoraproject.org> - 0.0.4-0.3.svn1079265
+- build only for kdelibs >= 4.4.0
+
+* Sun Jan 24 2010 Alexey Kurov <nucleo@fedoraproject.org> - 0.0.4-0.2.svn1079265
+- svn 1079265. Fixed the library and header file names.
+
+* Sat Jan 23 2010 Alexey Kurov <nucleo@fedoraproject.org> - 0.0.4-0.1.svn1078162
+- svn 1078162
+
+* Thu Dec  3 2009 Alexey Kurov <nucleo@fedoraproject.org> - 0.0.3-0.2.svn1057318
+- svn 1057318
+
+* Tue Nov 24 2009 Alexey Kurov <nucleo@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@fedoraproject.org> - 0.0.2-0.2.20091109svn
+- rebuild (qt-4.6.0-rc1, fc13+)
+
+* Mon Nov  9 2009 Alexey Kurov <nucleo@fedoraproject.org> - 0.0.2-0.1.20091109svn
+- version changed to 0.0.2 for new API
+
+* Mon Nov  9 2009 Alexey Kurov <nucleo@fedoraproject.org> - 0.0.1-0.6.20091109svn
+- removed kdelauncher from CMakeLists because it not installs
+
+* Mon Nov  9 2009 Alexey Kurov <nucleo@fedoraproject.org> - 0.0.1-0.5.20091109svn
+- snapshot 1046552 with new API
+
 * Sun Sep 27 2009 Alexey Kurov <nucleo@fedoraproject.org> - 0.0.1-0.2.20090924svn
 - webkitpart should owns kpartplugins in webkitpart apps dir