rpms/konq-plugins/F-11 konq-plugins.spec,1.30,1.31

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/konq-plugins/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7359

Modified Files:
	konq-plugins.spec 
Log Message:
* Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
- BR: webkitpart-devel
- use %find_lang --all-names --with-kde
- Requires: kdebase4%{_?isa} >= %version



Index: konq-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konq-plugins/F-11/konq-plugins.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- konq-plugins.spec	6 Sep 2009 16:11:27 -0000	1.30
+++ konq-plugins.spec	18 Oct 2009 18:24:41 -0000	1.31
@@ -2,7 +2,7 @@
 
 Name:           konq-plugins
 Version:        4.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plugins that interact with konqueror
 
 Group:          Applications/Internet
@@ -11,12 +11,13 @@ URL:            http://extragear.kde.org
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/extragear/konq-plugins-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: kdebase4-devel >= %{version}
 BuildRequires: cmake
 BuildRequires: gettext
+BuildRequires: kdebase4-devel >= %{version}
+BuildRequires: webkitpart-devel
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires: kdebase4 >= 4.2
+Requires: kdebase4%{?_isa} >= %{version} 
 
 %description
 Some additional plugins that interact with konqueror
@@ -61,6 +62,9 @@ rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
+%if 1
+%find_lang %{name} --all-name --with-kde
+%else
 # locale
 for locale in adblock akregator_konqplugin autorefresh babelfish crashesplugin \
   dirfilterplugin domtreeviewer \
@@ -82,6 +86,7 @@ for lang_dir in %{buildroot}${HTML_DIR}/
   fi
 done
 fi
+%endif
 
 
 %clean
@@ -110,22 +115,29 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %doc COPYING COPYING.DOC COPYING.LIB README
 %{_kde4_bindir}/fsview
 %{_datadir}/config/translaterc
+# co-owned with kdepim, since there's no shared dep
 %{_kde4_appsdir}/akregator/
-%{_kde4_appsdir}/dolphinpart/kpartplugins/
+%{_kde4_appsdir}/dolphinpart/kpartplugins/*
 %{_kde4_appsdir}/domtreeviewer/
 %{_kde4_appsdir}/fsview/
 %{_kde4_appsdir}/khtml/kpartplugins/*
-%{_kde4_appsdir}/konqueror/icons/oxygen/*/actions/google.*
+%{_kde4_appsdir}/konqueror/icons/*
 %{_kde4_appsdir}/konqueror/kpartplugins/*
 %{_kde4_appsdir}/konqueror/opensearch/*
 %{_kde4_appsdir}/webkitpart/kpartplugins/*
 %{_kde4_datadir}/config.kcfg/validators.kcfg
-%{_kde4_datadir}/kde4/services/*
+%{_kde4_datadir}/kde4/services/*.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/*.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
-%{_kde4_libdir}/kde4/*
+%{_kde4_libdir}/kde4/*.so
 
 %changelog
+* Sun Sep 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
+- BR: webkitpart-devel
+- use %%find_lang --all-names --with-kde
+- Requires: kdebase4%%{_?isa} >= %%version
+
 * Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 4.3.1-1
 - 4.3.1
 - use scriplet for HTML docdirs
@@ -133,8 +145,8 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 * Tue Aug 11 2009 Sebastian Vahl <fedora at deadbabylon.de> 4.3.0-1
 * KDE 4.3.0
 
-* Wed Jun  3 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Fri May 08 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.3-1
 - 4.2.3