rpms/webkitkde/devel webkitkde.spec,1.14,1.15

nucleo nucleo at fedoraproject.org
Wed Feb 10 14:17:32 UTC 2010


Author: nucleo

Update of /cvs/pkgs/rpms/webkitkde/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10386

Modified Files:
	webkitkde.spec 
Log Message:
build only for kdelibs >= 4.4.0


Index: webkitkde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitkde/devel/webkitkde.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- webkitkde.spec	24 Jan 2010 00:31:24 -0000	1.14
+++ webkitkde.spec	10 Feb 2010 14:17:32 -0000	1.15
@@ -1,14 +1,6 @@
-
-# easy kde43 toggle 
-%if 0%{?fedora} < 13
-%define kde43 1
-%else
-%define kde_version 4.3.95
-%endif
-
 Name:             webkitkde
 Version:          0.0.4
-Release:          0.2.svn1079265%{?dist}
+Release:          0.3.svn1079265%{?dist}
 Summary:          QtWebKit bindings to KDE
 Group:            System Environment/Libraries
 License:          LGPLv2+
@@ -34,7 +26,7 @@ Source0:          %{name}-%{version}-svn
 Patch0:           webkitkde-svn1079265.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    cmake gettext
-BuildRequires:    kdelibs4-devel %{?kde_version: >= %{kde_version}}
+BuildRequires:    kdelibs4-devel >= 4.4.0
 
 %description
 This project aims to integrate WebKit (QtWebKit) into KDE.
@@ -45,17 +37,6 @@ The WebKitKDE library sits on top of QtW
 KDE integration (for example, WebActions using KDE icons
 and shortcuts, downloading using KIO, etc).
 
-%if 0%{?kde43} 
-%package devel
-Summary:          Development files for %{name}
-Group:            Development/Libraries
-Requires:         kdelibs4-devel
-Requires:         %{name} = %{version}-%{release}
-
-%description devel
-Development files for the %{name}.
-%endif
-
 %package -n webkitpart
 Summary:          A KPart based on WebKitKDE library
 Group:            System Environment/Libraries
@@ -68,9 +49,6 @@ web pages.
 %package -n webkitpart-devel
 Summary:          Development files for webkitpart
 Group:            Development/Libraries
-%if 0%{?kde43}
-Requires:         %{name}-devel = %{version}-%{release}
-%endif
 Requires:         kdelibs4-devel
 Requires:         webkitpart = %{version}-%{release}
 %description -n webkitpart-devel
@@ -99,12 +77,6 @@ make install/fast DESTDIR=$RPM_BUILD_ROO
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if 0%{?kde43}
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-%endif
-
 %post -n webkitpart
 /sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
@@ -123,23 +95,6 @@ fi
 %defattr(-,root,root,-)
 %doc README COPYING.LIB
 
-%if 0%{?kde43}
-%{_kde4_libdir}/libkdewebkit.so.*
-
-%files devel
-%defattr(-,root,root,-)
-%doc README
-%{_kde4_includedir}/KDE/KWebPage
-%{_kde4_includedir}/KDE/KWebPluginFactory
-%{_kde4_includedir}/KDE/KWebView
-%{_kde4_includedir}/kdewebkit_export.h
-%{_kde4_includedir}/kwebpage.h
-%{_kde4_includedir}/kwebpluginfactory.h
-%{_kde4_includedir}/kwebview.h
-%{_kde4_libdir}/libkdewebkit.so
-%{_kde4_appsdir}/cmake/modules/FindKdeWebKit.cmake
-%endif
-
 %files -n webkitpart
 %defattr(-,root,root,-)
 %doc README COPYING.LIB
@@ -159,6 +114,9 @@ fi
 %{_kde4_appsdir}/cmake/modules/FindWebKitPart.cmake
 
 %changelog
+* Wed Feb 10 2010 Alexey Kurov <nucleo at fedoraproject.org> - 0.0.4-0.3.svn1079265
+- build only for kdelibs >= 4.4.0
+
 * Sun Jan 24 2010 Alexey Kurov <nucleo at fedoraproject.org> - 0.0.4-0.2.svn1079265
 - svn 1079265. Fixed the library and header file names.
 



More information about the scm-commits mailing list