SPECS (AC-branch): kdeaddons.spec - merge with HEAD
glen
glen at pld-linux.org
Fri Feb 15 00:14:42 CET 2008
Author: glen Date: Thu Feb 14 23:14:42 2008 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- merge with HEAD
---- Files affected:
SPECS:
kdeaddons.spec (1.118.2.16 -> 1.118.2.17)
---- Diffs:
================================================================
Index: SPECS/kdeaddons.spec
diff -u SPECS/kdeaddons.spec:1.118.2.16 SPECS/kdeaddons.spec:1.118.2.17
--- SPECS/kdeaddons.spec:1.118.2.16 Fri Feb 15 00:10:22 2008
+++ SPECS/kdeaddons.spec Fri Feb 15 00:14:37 2008
@@ -1,7 +1,8 @@
# $Revision$, $Date$
+#
# Conditional build:
-%bcond_without kdegames # no kdegames dep
-%bcond_without xmms # no xmms dep
+%bcond_without kdegames # no kdegames dep
+%bcond_without xmms # xmms dep
#
%define _state stable
%define _minlibsevr 9:%{version}
@@ -26,6 +27,7 @@
#Patch100: %{name}-branch.diff
Patch0: kde-common-PLD.patch
Patch1: kde-ac260-lt.patch
+URL: http://www.kde.org/
BuildRequires: SDL-devel
BuildRequires: autoconf
BuildRequires: automake
@@ -107,7 +109,7 @@
Summary(pl.UTF-8): Wtyczki do kaddressbook
Summary(pt_BR.UTF-8): Plugins para kaddressbook
Group: X11/Applications
-Requires: kdepim-kaddressbook >= %{_minkdepimevr}
+Requires: kdepim-kaddressbook >= %{_minpimevr}
%description kaddressbook-plugins
Plugins for kaddressbook.
@@ -301,6 +303,8 @@
# unsupported
rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/locolor
+rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
+
%find_lang kate-plugins --with-kde
%find_lang kicker-applets --with-kde
%find_lang konq-plugins --with-kde
@@ -311,7 +315,6 @@
%files ark
%defattr(644,root,root,755)
-%{_libdir}/kde3/libarkplugin.la
%attr(755,root,root) %{_libdir}/kde3/libarkplugin.so
%{_datadir}/applnk/.hidden/arkplugin.desktop
%{_datadir}/services/ark_plugin.desktop
@@ -329,19 +332,15 @@
%files fsview
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/fsview
-%{_libdir}/kde3/libfsviewpart.la
%attr(755,root,root) %{_libdir}/kde3/libfsviewpart.so
%{_datadir}/apps/fsview
-%{_datadir}/applnk/.hidden/fsview.desktop
%{_datadir}/services/fsview_part.desktop
%{_iconsdir}/*/*/apps/fsview.png
#%{_mandir}/man1/fsview.1*
%files kaddressbook-plugins
%defattr(644,root,root,755)
-%{_libdir}/kde3/libkaddrbk_geo_xxport.la
%attr(755,root,root) %{_libdir}/kde3/libkaddrbk_geo_xxport.so
-%{_libdir}/kde3/libkaddrbk_gmx_xxport.la
%attr(755,root,root) %{_libdir}/kde3/libkaddrbk_gmx_xxport.so
%{_datadir}/apps/kaddressbook/geo_xxportui.rc
%{_datadir}/apps/kaddressbook/gmx_xxportui.rc
@@ -350,9 +349,7 @@
%files kate -f kate-plugins.lang
%defattr(644,root,root,755)
-%{_libdir}/kde3/kate*.la
%attr(755,root,root) %{_libdir}/kde3/kate*.so
-%{_libdir}/kde3/libkatetabbarextensionplugin.la
%attr(755,root,root) %{_libdir}/kde3/libkatetabbarextensionplugin.so
%{_datadir}/apps/kate/plugins/*
%{_datadir}/apps/kate/scripts/html-tidy.desktop
@@ -364,15 +361,10 @@
%files kicker -f kicker-applets.lang
%defattr(644,root,root,755)
-%{_libdir}/kde3/kbinaryclock_panelapplet.la
%attr(755,root,root) %{_libdir}/kde3/kbinaryclock_panelapplet.so
-%{_libdir}/kde3/kolourpicker_panelapplet.la
%attr(755,root,root) %{_libdir}/kde3/kolourpicker_panelapplet.so
-%{_libdir}/kde3/ktimemon_panelapplet.la
%attr(755,root,root) %{_libdir}/kde3/ktimemon_panelapplet.so
-%{_libdir}/kde3/math_panelapplet.la
%attr(755,root,root) %{_libdir}/kde3/math_panelapplet.so
-%{_libdir}/kde3/mediacontrol_panelapplet.la
%attr(755,root,root) %{_libdir}/kde3/mediacontrol_panelapplet.so
%{_datadir}/apps/kicker/applets/kbinaryclock.desktop
%{_datadir}/apps/kicker/applets/kolourpicker.desktop
@@ -399,72 +391,35 @@
%files konqueror -f konq-plugins.lang
%defattr(644,root,root,755)
-%{_datadir}/applnk/.hidden/crashesplugin.desktop
-%{_datadir}/applnk/.hidden/dirfilterplugin.desktop
-%{_datadir}/applnk/.hidden/khtmlsettingsplugin.desktop
-%{_datadir}/applnk/.hidden/kimgalleryplugin.desktop
-%{_datadir}/applnk/.hidden/plugin_babelfish.desktop
-%{_datadir}/applnk/.hidden/plugin_domtreeviewer.desktop
-%{_datadir}/applnk/.hidden/plugin_validators.desktop
-%{_datadir}/applnk/.hidden/plugin_webarchiver.desktop
-%{_datadir}/applnk/.hidden/uachangerplugin.desktop
%attr(755,root,root) %{_bindir}/jpegorient
%attr(755,root,root) %{_bindir}/kio_media_realfolder
-%{_libdir}/kde3/kfile_cert.la
%attr(755,root,root) %{_libdir}/kde3/kfile_cert.so
-%{_libdir}/kde3/kfile_desktop.la
%attr(755,root,root) %{_libdir}/kde3/kfile_desktop.so
-%{_libdir}/kde3/kfile_folder.la
%attr(755,root,root) %{_libdir}/kde3/kfile_folder.so
-%{_libdir}/kde3/kfile_html.la
%attr(755,root,root) %{_libdir}/kde3/kfile_html.so
-%{_libdir}/kde3/kfile_mhtml.la
%attr(755,root,root) %{_libdir}/kde3/kfile_mhtml.so
-%{_libdir}/kde3/kfile_txt.la
%attr(755,root,root) %{_libdir}/kde3/kfile_txt.so
-%{_libdir}/kde3/konqsidebar_mediaplayer.la
%attr(755,root,root) %{_libdir}/kde3/konqsidebar_mediaplayer.so
-%{_libdir}/kde3/konqsidebar_delicious.la
%attr(755,root,root) %{_libdir}/kde3/konqsidebar_delicious.so
-%{_libdir}/kde3/konqsidebar_metabar.la
%attr(755,root,root) %{_libdir}/kde3/konqsidebar_metabar.so
-%{_libdir}/kde3/libautorefresh.la
%attr(755,root,root) %{_libdir}/kde3/libautorefresh.so
-%{_libdir}/kde3/libbabelfishplugin.la
%attr(755,root,root) %{_libdir}/kde3/libbabelfishplugin.so
-%{_libdir}/kde3/libcrashesplugin.la
%attr(755,root,root) %{_libdir}/kde3/libcrashesplugin.so
-%{_libdir}/kde3/libdirfilterplugin.la
%attr(755,root,root) %{_libdir}/kde3/libdirfilterplugin.so
-%{_libdir}/kde3/libdomtreeviewerplugin.la
%attr(755,root,root) %{_libdir}/kde3/libdomtreeviewerplugin.so
-%{_libdir}/kde3/librellinksplugin.la
%attr(755,root,root) %{_libdir}/kde3/librellinksplugin.so
-%{_libdir}/kde3/libsearchbarplugin.la
%attr(755,root,root) %{_libdir}/kde3/libsearchbarplugin.so
-%{_libdir}/kde3/kcm_kuick.la
%attr(755,root,root) %{_libdir}/kde3/kcm_kuick.so
-%{_libdir}/kde3/libkhtmlsettingsplugin.la
%attr(755,root,root) %{_libdir}/kde3/libkhtmlsettingsplugin.so
-%{_libdir}/kde3/libkimgallery.la
%attr(755,root,root) %{_libdir}/kde3/libkimgallery.so
-%{_libdir}/kde3/libkuickplugin.la
%attr(755,root,root) %{_libdir}/kde3/libkuickplugin.so
-%{_libdir}/kde3/libminitoolsplugin.la
%attr(755,root,root) %{_libdir}/kde3/libminitoolsplugin.so
-%{_libdir}/kde3/libmfkonqmficon.la
%attr(755,root,root) %{_libdir}/kde3/libmfkonqmficon.so
-%{_libdir}/kde3/librenaudioplugin.la
%attr(755,root,root) %{_libdir}/kde3/librenaudioplugin.so
-%{_libdir}/kde3/librenimageplugin.la
%attr(755,root,root) %{_libdir}/kde3/librenimageplugin.so
-%{_libdir}/kde3/libuachangerplugin.la
%attr(755,root,root) %{_libdir}/kde3/libuachangerplugin.so
-%{_libdir}/kde3/libvalidatorsplugin.la
%attr(755,root,root) %{_libdir}/kde3/libvalidatorsplugin.so
-%{_libdir}/kde3/libwebarchiverplugin.la
%attr(755,root,root) %{_libdir}/kde3/libwebarchiverplugin.so
-%{_libdir}/kde3/webarchivethumbnail.la
%attr(755,root,root) %{_libdir}/kde3/webarchivethumbnail.so
%{_datadir}/apps/domtreeviewer
%{_datadir}/apps/khtml/kpartplugins/autorefresh.desktop
@@ -543,16 +498,13 @@
#%{_mandir}/man1/jpegorient.1*
#%{_mandir}/man1/orient.py.1*
# TODO - requires kdenetwork-{knewsticker,rss}
-%{_libdir}/kde3/konq_sidebarnews.la
%attr(755,root,root) %{_libdir}/kde3/konq_sidebarnews.so
%{_datadir}/apps/konqsidebartng/add/news_add.desktop
%{_datadir}/apps/konqueror/icons/crystalsvg/16x16/actions/google.png
%{_datadir}/config.kcfg/konq_sidebarnews.kcfg
%{_iconsdir}/crystalsvg/*/apps/konqsidebar_news.png
# TODO - requires kdepim (akregator)
-%{_libdir}/kde3/libakregatorkonqfeedicon.la
%attr(755,root,root) %{_libdir}/kde3/libakregatorkonqfeedicon.so
-%{_libdir}/kde3/libakregatorkonqplugin.la
%attr(755,root,root) %{_libdir}/kde3/libakregatorkonqplugin.so
%{_datadir}/apps/akregator/pics/rss.png
%{_datadir}/apps/khtml/kpartplugins/akregator_konqfeedicon.desktop
@@ -573,7 +525,6 @@
%files lnkforward
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/lnkforward
-%{_libdir}/kde3/kfile_lnk.la
%attr(755,root,root) %{_libdir}/kde3/kfile_lnk.so
%{_datadir}/applnk/.hidden/lnkforward.desktop
%{_datadir}/mimelnk/application/x-win-lnk.desktop
@@ -585,35 +536,20 @@
%attr(755,root,root) %{_bindir}/noatunsynaescope.bin
%attr(755,root,root) %{_bindir}/noatuntippecanoe.bin
%attr(755,root,root) %{_bindir}/noatuntyler.bin
-%{_libdir}/kde3/noatun_ffrs.la
%attr(755,root,root) %{_libdir}/kde3/noatun_ffrs.so
-%{_libdir}/kde3/noatunalsaplayer.la
%attr(755,root,root) %{_libdir}/kde3/noatunalsaplayer.so
-%{_libdir}/kde3/noatunblurscope.la
%attr(755,root,root) %{_libdir}/kde3/noatunblurscope.so
-%{_libdir}/kde3/noatuncharlatan.la
%attr(755,root,root) %{_libdir}/kde3/noatuncharlatan.so
-%{_libdir}/kde3/noatun_oblique.la
%attr(755,root,root) %{_libdir}/kde3/noatun_oblique.so
-%{_libdir}/kde3/noatundub.la
%attr(755,root,root) %{_libdir}/kde3/noatundub.so
-%{_libdir}/kde3/noatunluckytag.la
%attr(755,root,root) %{_libdir}/kde3/noatunluckytag.so
-%{_libdir}/kde3/noatunlyrics.la
%attr(755,root,root) %{_libdir}/kde3/noatunlyrics.so
-%{_libdir}/kde3/noatunmadness.la
%attr(755,root,root) %{_libdir}/kde3/noatunmadness.so
-%{_libdir}/kde3/noatunpitchablespeed.la
%attr(755,root,root) %{_libdir}/kde3/noatunpitchablespeed.so
-%{_libdir}/kde3/noatunsynaescope.la
%attr(755,root,root) %{_libdir}/kde3/noatunsynaescope.so
-%{_libdir}/kde3/noatuntippecanoe.la
%attr(755,root,root) %{_libdir}/kde3/noatuntippecanoe.so
-%{_libdir}/kde3/noatuntyler.la
%attr(755,root,root) %{_libdir}/kde3/noatuntyler.so
-%{_libdir}/kde3/noatunwakeup.la
%attr(755,root,root) %{_libdir}/kde3/noatunwakeup.so
-%{_libdir}/kde3/noatunwavecapture.la
%attr(755,root,root) %{_libdir}/kde3/noatunwavecapture.so
%{_datadir}/apps/noatun/*
%{_iconsdir}/crystalsvg/*/apps/synaescope.png
@@ -627,6 +563,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.118.2.17 2008-02-14 23:14:37 glen
+- merge with HEAD
+
Revision 1.118.2.16 2008-02-14 23:10:22 glen
- convert to utf8
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdeaddons.spec?r1=1.118.2.16&r2=1.118.2.17&f=u
More information about the pld-cvs-commit
mailing list