[webkitgtk3/f21] Disable support for webkit2 API

[Kalev Lember]

commit 5d6c646b7a195102525829ca60eadb2ffae27f2e
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Tue Aug 26 17:52:14 2014 +0200

    Disable support for webkit2 API
    
    It's now provided by the webkitgtk4 package.

 webkitgtk3.spec |   42 ++++++------------------------------------
 1 files changed, 6 insertions(+), 36 deletions(-)
---
diff --git a/webkitgtk3.spec b/webkitgtk3.spec
index 2da9831..fac0b0b 100644
--- a/webkitgtk3.spec
+++ b/webkitgtk3.spec
@@ -7,7 +7,7 @@
 
 Name:           webkitgtk3
 Version:        2.4.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GTK+ Web content engine library
 
 Group:          Development/Libraries
@@ -65,21 +65,10 @@ GTK+ platform.
 
 This package contains WebKitGTK+ for GTK+ 3.
 
-%package -n     libwebkit2gtk
-Summary:        The libwebkit2gtk library
-Group:          Development/Libraries
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       geoclue2
-
-%description -n libwebkit2gtk
-The libwebkit2gtk package contains the libwebkit2gtk library
-that is part of %{name}.
-
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
 Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       libwebkit2gtk%{?_isa} = %{version}-%{release}
 
 %description    devel
 The %{name}-devel package contains libraries, build data, and header
@@ -128,6 +117,7 @@ This package contains developer documentation for %{name}.
 
 %configure                                                      \
                         --with-gtk=3.0                          \
+                        --disable-webkit2                       \
 %ifarch s390 s390x ppc %{power64} aarch64
                         --disable-jit                           \
 %else
@@ -150,16 +140,11 @@ make install DESTDIR=%{buildroot}
 
 install -d -m 755 %{buildroot}%{_libexecdir}/%{name}
 install -m 755 Programs/GtkLauncher %{buildroot}%{_libexecdir}/%{name}
-install -m 755 Programs/MiniBrowser %{buildroot}%{_libexecdir}/%{name}
 
 # Remove lib64 rpaths
 chrpath --delete %{buildroot}%{_bindir}/jsc-3
 chrpath --delete %{buildroot}%{_libdir}/libwebkitgtk-3.0.so
-chrpath --delete %{buildroot}%{_libdir}/libwebkit2gtk-3.0.so
 chrpath --delete %{buildroot}%{_libexecdir}/%{name}/GtkLauncher
-chrpath --delete %{buildroot}%{_libexecdir}/%{name}/MiniBrowser
-chrpath --delete %{buildroot}%{_libexecdir}/WebKitPluginProcess
-chrpath --delete %{buildroot}%{_libexecdir}/WebKitWebProcess
 
 # Remove .la files
 find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete
@@ -183,9 +168,6 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%post -n libwebkit2gtk -p /sbin/ldconfig
-%postun -n libwebkit2gtk -p /sbin/ldconfig
-
 
 %files -f WebKitGTK-3.0.lang
 %doc %{_pkgdocdir}/
@@ -197,39 +179,27 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete
 %{_libexecdir}/%{name}/GtkLauncher
 %{_datadir}/webkitgtk-3.0
 
-%files -n libwebkit2gtk
-%{_libdir}/libwebkit2gtk-3.0.so.*
-%{_libdir}/webkit2gtk-3.0/
-%{_libdir}/girepository-1.0/WebKit2-3.0.typelib
-%{_libdir}/girepository-1.0/WebKit2WebExtension-3.0.typelib
-%{_libexecdir}/%{name}/MiniBrowser
-%{_libexecdir}/WebKitNetworkProcess
-%{_libexecdir}/WebKitPluginProcess
-%{_libexecdir}/WebKitWebProcess
-
 %files  devel
 %{_bindir}/jsc-3
 %{_includedir}/webkitgtk-3.0
 %{_libdir}/libwebkitgtk-3.0.so
-%{_libdir}/libwebkit2gtk-3.0.so
 %{_libdir}/libjavascriptcoregtk-3.0.so
 %{_libdir}/pkgconfig/webkitgtk-3.0.pc
-%{_libdir}/pkgconfig/webkit2gtk-3.0.pc
-%{_libdir}/pkgconfig/webkit2gtk-web-extension-3.0.pc
 %{_libdir}/pkgconfig/javascriptcoregtk-3.0.pc
 %{_datadir}/gir-1.0/WebKit-3.0.gir
-%{_datadir}/gir-1.0/WebKit2-3.0.gir
-%{_datadir}/gir-1.0/WebKit2WebExtension-3.0.gir
 %{_datadir}/gir-1.0/JavaScriptCore-3.0.gir
 
 %files doc
 %dir %{_datadir}/gtk-doc
 %dir %{_datadir}/gtk-doc/html
 %{_datadir}/gtk-doc/html/webkitgtk
-%{_datadir}/gtk-doc/html/webkit2gtk
 %{_datadir}/gtk-doc/html/webkitdomgtk
 
 %changelog
+* Tue Aug 26 2014 Kalev Lember <kalevlember at gmail.com> - 2.4.5-2
+- Disable support for webkit2 API which is now provided by the webkitgtk4
+  package
+
 * Tue Aug 26 2014 Tomas Popela <tpopela at redhat.com> - 2.4.5-1
 - Update to 2.4.5