From 6219d417fe0f23d513b0233a5cc03b1954857510 Mon Sep 17 00:00:00 2001 From: nucleo Date: Wed, 24 Mar 2010 18:59:42 +0000 Subject: [PATCH 1/5] drop webkitkde --- webkitkde.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/webkitkde.spec b/webkitkde.spec index 6cf8713..20d69c7 100644 --- a/webkitkde.spec +++ b/webkitkde.spec @@ -1,6 +1,6 @@ Name: webkitkde Version: 0.0.5 -Release: 0.1.svn1088283%{?dist} +Release: 0.2.svn1088283%{?dist} Summary: QtWebKit bindings to KDE Group: System Environment/Libraries License: LGPLv2+ @@ -29,7 +29,6 @@ and shortcuts, downloading using KIO, etc). %package -n webkitpart Summary: A KPart based on WebKitKDE library Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} %description -n webkitpart KWebKitPart is a KPart that allows KPart-based applications, for example Konqueror, to make use of WebKit for viewing @@ -78,10 +77,6 @@ if [ $1 -eq 0 ] ; then gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: fi -%files -%defattr(-,root,root,-) -%doc README COPYING.LIB - %files -n webkitpart %defattr(-,root,root,-) %doc README COPYING.LIB @@ -101,6 +96,10 @@ fi %{_kde4_appsdir}/cmake/modules/FindKWebKitPart.cmake %changelog +* Wed Mar 24 2010 Alexey Kurov - 0.0.5-0.2.svn1088283 +- drop webkitkde package +- removed Requires: webkitkde from webkitpart + * Wed Feb 10 2010 Alexey Kurov - 0.0.5-0.1.svn1088283 - update to kwebkitpart snapshot from kdereview From 4b61f32b831bb743913c869d042a579072c6e63e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 8 May 2010 21:08:48 +0000 Subject: [PATCH 2/5] - BR: qt4-webkit-devel --- webkitkde.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/webkitkde.spec b/webkitkde.spec index 20d69c7..51b716e 100644 --- a/webkitkde.spec +++ b/webkitkde.spec @@ -1,6 +1,6 @@ Name: webkitkde Version: 0.0.5 -Release: 0.2.svn1088283%{?dist} +Release: 0.3.svn1088283%{?dist} Summary: QtWebKit bindings to KDE Group: System Environment/Libraries License: LGPLv2+ @@ -14,8 +14,9 @@ URL: http://techbase.kde.org/Projects/WebKit Source0: %{name}-%{version}-svn.tar.bz2 Patch0: webkitkde-remove-kdelauncher.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: cmake gettext +BuildRequires: gettext BuildRequires: kdelibs4-devel >= 4.4.0 +BuildRequires: qt4-webkit-devel %description This project aims to integrate WebKit (QtWebKit) into KDE. @@ -96,6 +97,9 @@ fi %{_kde4_appsdir}/cmake/modules/FindKWebKitPart.cmake %changelog +* Sat May 08 2010 Rex Dieter - 0.0.5-0.3.svn1088283 +- BR: qt4-webkit-devel + * Wed Mar 24 2010 Alexey Kurov - 0.0.5-0.2.svn1088283 - drop webkitkde package - removed Requires: webkitkde from webkitpart From 8df1f72783ab9efe118c0123a742b5dbabaed2ee Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 8 May 2010 21:24:55 +0000 Subject: [PATCH 3/5] - revert BR: qt4-webkit-devel, rebuild against newer kdelibs-devel that includes it --- webkitkde.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/webkitkde.spec b/webkitkde.spec index 51b716e..ffb8092 100644 --- a/webkitkde.spec +++ b/webkitkde.spec @@ -1,6 +1,6 @@ Name: webkitkde Version: 0.0.5 -Release: 0.3.svn1088283%{?dist} +Release: 0.4.svn1088283%{?dist} Summary: QtWebKit bindings to KDE Group: System Environment/Libraries License: LGPLv2+ @@ -16,7 +16,6 @@ Patch0: webkitkde-remove-kdelauncher.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext BuildRequires: kdelibs4-devel >= 4.4.0 -BuildRequires: qt4-webkit-devel %description This project aims to integrate WebKit (QtWebKit) into KDE. @@ -97,6 +96,9 @@ fi %{_kde4_appsdir}/cmake/modules/FindKWebKitPart.cmake %changelog +* Sat May 08 2010 Rex Dieter - 0.0.5-0.4.svn1088283 +- revert BR: qt4-webkit-devel, rebuild against newer kdelibs-devel that includes it + * Sat May 08 2010 Rex Dieter - 0.0.5-0.3.svn1088283 - BR: qt4-webkit-devel From 859bf47ed740da4856bbab11ccb6978471a5a7dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:14:39 +0000 Subject: [PATCH 4/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 6f594a5..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: webkitkde -# $Id: Makefile,v 1.1 2009/09/25 16:30:04 kevin Exp $ -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 $$d/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) diff --git a/import.log b/import.log deleted file mode 100644 index 41e0ee2..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -webkitkde-0_0_1-0_1_20090924svn_fc11:HEAD:webkitkde-0.0.1-0.1.20090924svn.fc11.src.rpm:1253896781 From 565e737db386b907cb2acbefc8064a9cd5c2cfd2 Mon Sep 17 00:00:00 2001 From: nucleo Date: Fri, 24 Sep 2010 00:46:11 +0300 Subject: [PATCH 5/5] Retire webkitkde. --- dead.package | 1 + sources | 1 - webkitkde-remove-kdelauncher.patch | 7 -- webkitkde.spec | 144 ----------------------------- 4 files changed, 1 insertion(+), 152 deletions(-) create mode 100644 dead.package delete mode 100644 sources delete mode 100644 webkitkde-remove-kdelauncher.patch delete mode 100644 webkitkde.spec diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..af60ff1 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Renamed to kwebkitpart diff --git a/sources b/sources deleted file mode 100644 index 0665e7d..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -f3517d9a109b483a8df8230d61cecd95 webkitkde-0.0.5-svn.tar.bz2 diff --git a/webkitkde-remove-kdelauncher.patch b/webkitkde-remove-kdelauncher.patch deleted file mode 100644 index 9174a16..0000000 --- a/webkitkde-remove-kdelauncher.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- 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) diff --git a/webkitkde.spec b/webkitkde.spec deleted file mode 100644 index ffb8092..0000000 --- a/webkitkde.spec +++ /dev/null @@ -1,144 +0,0 @@ -Name: webkitkde -Version: 0.0.5 -Release: 0.4.svn1088283%{?dist} -Summary: QtWebKit bindings to KDE -Group: System Environment/Libraries -License: LGPLv2+ -URL: http://techbase.kde.org/Projects/WebKit - -# 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-remove-kdelauncher.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gettext -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: -- 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). - -%package -n webkitpart -Summary: A KPart based on WebKitKDE library -Group: System Environment/Libraries -%description -n webkitpart -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: 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} -pushd %{_target_platform} -%{cmake_kde4} .. -popd - -make %{?_smp_mflags} -C %{_target_platform} - -%install -rm -rf $RPM_BUILD_ROOT - -make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform} -#mkdir $RPM_BUILD_ROOT%{_kde4_appsdir}/webkitpart/kpartplugins - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -n webkitpart -/sbin/ldconfig -touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: - -%posttrans -n webkitpart -gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: - -%postun -n webkitpart -/sbin/ldconfig -if [ $1 -eq 0 ] ; then - touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: - gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: -fi - -%files -n webkitpart -%defattr(-,root,root,-) -%doc README COPYING.LIB -%{_kde4_libdir}/kde4/kwebkitpart.so* -%{_kde4_libdir}/libkwebkit.so.* -%{_kde4_iconsdir}/hicolor/*/apps/webkit.png -%{_kde4_appsdir}/kwebkitpart -%{_kde4_datadir}/kde4/services/kwebkitpart.desktop - -%files -n webkitpart-devel -%defattr(-,root,root,-) -%doc README -%{_kde4_includedir}/KDE/KWebKitPart -%{_kde4_includedir}/kwebkitpart.h -%{_kde4_includedir}/kwebkit_export.h -%{_kde4_libdir}/libkwebkit.so -%{_kde4_appsdir}/cmake/modules/FindKWebKitPart.cmake - -%changelog -* Sat May 08 2010 Rex Dieter - 0.0.5-0.4.svn1088283 -- revert BR: qt4-webkit-devel, rebuild against newer kdelibs-devel that includes it - -* Sat May 08 2010 Rex Dieter - 0.0.5-0.3.svn1088283 -- BR: qt4-webkit-devel - -* Wed Mar 24 2010 Alexey Kurov - 0.0.5-0.2.svn1088283 -- drop webkitkde package -- removed Requires: webkitkde from webkitpart - -* Wed Feb 10 2010 Alexey Kurov - 0.0.5-0.1.svn1088283 -- update to kwebkitpart snapshot from kdereview - -* Wed Feb 10 2010 Alexey Kurov - 0.0.4-0.3.svn1079265 -- build only for kdelibs >= 4.4.0 - -* Sun Jan 24 2010 Alexey Kurov - 0.0.4-0.2.svn1079265 -- svn 1079265. Fixed the library and header file names. - -* Sat Jan 23 2010 Alexey Kurov - 0.0.4-0.1.svn1078162 -- svn 1078162 - -* Thu Dec 3 2009 Alexey Kurov - 0.0.3-0.2.svn1057318 -- svn 1057318 - -* Tue Nov 24 2009 Alexey Kurov - 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 - 0.0.2-0.2.20091109svn -- rebuild (qt-4.6.0-rc1, fc13+) - -* Mon Nov 9 2009 Alexey Kurov - 0.0.2-0.1.20091109svn -- version changed to 0.0.2 for new API - -* Mon Nov 9 2009 Alexey Kurov - 0.0.1-0.6.20091109svn -- removed kdelauncher from CMakeLists because it not installs - -* Mon Nov 9 2009 Alexey Kurov - 0.0.1-0.5.20091109svn -- snapshot 1046552 with new API - -* Sun Sep 27 2009 Alexey Kurov - 0.0.1-0.2.20090924svn -- webkitpart should owns kpartplugins in webkitpart apps dir - -* Thu Sep 24 2009 Alexey Kurov - 0.0.1-0.1.20090924svn -- Initial RPM release