rpms/konq-plugins/devel konq-plugins.spec,1.30,1.31
Rex Dieter
rdieter at fedoraproject.org
Sun Sep 27 20:46:07 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/konq-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4129
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
- s/kdebase4/kdebase/
Index: konq-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konq-plugins/devel/konq-plugins.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- konq-plugins.spec 2 Sep 2009 18:49:20 -0000 1.30
+++ konq-plugins.spec 27 Sep 2009 20:46:06 -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,15 @@ 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: kdebase-devel >= %{version}
+BuildRequires: webkitpart-devel
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires: kdebase4 >= 4.2
+# not using kdebase4 here: that kdebase4 Provides currently lacks %_isa, and
+# it only ever supports the native (non-compat) kdebase/konqueror anyway
+Requires: kdebase%{?_isa} >= %{version}
%description
Some additional plugins that interact with konqueror
@@ -61,6 +64,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 +88,7 @@ for lang_dir in %{buildroot}${HTML_DIR}/
fi
done
fi
+%endif
%clean
@@ -110,22 +117,28 @@ 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_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
+- s/kdebase4/kdebase/
+
* Tue Sep 01 2009 Sebastian Vahl <svahl at fedoraproject.org> - 4.3.1-1
- 4.3.1
- use scriplet for HTML docdirs
More information about the fedora-extras-commits
mailing list