packages: kdepim/kdepim.spec - akregator subpackage - move kontact plugins ...

Thu Jul 15 18:02:38 CEST 2010

Author: glen                         Date: Thu Jul 15 16:02:39 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- akregator subpackage
- move kontact plugins to appropriate packages

---- Files affected:
packages/kdepim:
   kdepim.spec (1.309 -> 1.310) 

---- Diffs:

================================================================
Index: packages/kdepim/kdepim.spec
diff -u packages/kdepim/kdepim.spec:1.309 packages/kdepim/kdepim.spec:1.310

--- packages/kdepim/kdepim.spec:1.309	Thu Jul 15 10:46:02 2010
+++ packages/kdepim/kdepim.spec	Thu Jul 15 18:02:31 2010
@@ -1,9 +1,4 @@
 # $Revision$, $Date$
-# TODO
-# - subpackages for akregator?
-# - unpackaged:
-#   /usr/lib64/libknodecommon.so
-#
 # Conditional build:
 %bcond_without	apidocs			# do not prepare API documentation
 %bcond_without	hidden_visibility	# don't use gcc hidden visibility
@@ -22,7 +17,7 @@
 Summary(uk.UTF-8):	Персональный планувальник (PIM) для KDE
 Name:		kdepim
 Version:	3.5.10
-Release:	7.13
+Release:	7.19
 Epoch:		9
 License:	GPL
 Group:		X11/Applications
@@ -75,8 +70,6 @@
 BuildConflicts:	kdepim-kontact-libs
 BuildConflicts:	kdepim-libkmailprivate
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
-# subpackage akregator
-Obsoletes:	akregator
 #Obsoletes:	kdeaddons-konqueror
 Obsoletes:	kdeaddons-kontact
 Obsoletes:	kdepim-kontact
@@ -187,6 +180,18 @@
 %description -n kde-kio-scalix -l pl.UTF-8
 Obsługa protokołu Scalix.
 
+%package akregator
+Summary:	News feed reader
+Group:		X11/Applications
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+Requires:	kdebase-desktop >= %{_minbaseevr}
+Obsoletes:	akregator
+
+%description akregator
+Akregator is a news feed reader for the KDE desktop. It enables you to
+follow news sites, blogs and other RSS/Atom-enabled websites without
+the need to manually check for updates using a web browser.
+
 %package kaddressbook
 Summary:	Address book
 Summary(pl.UTF-8):	Książka adresowa
@@ -669,7 +674,7 @@
 rm -f *.lang
 
 > %{name}.lang
-%find_lang	akregator	--with-kde -a %{name}.lang
+%find_lang	akregator	--with-kde
 %find_lang	kaddressbook	--with-kde
 %find_lang	kalarm		--with-kde
 %find_lang	kandy		--with-kde
@@ -704,7 +709,6 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README.Kolab
-%attr(755,root,root) %{_bindir}/akregator
 %attr(755,root,root) %{_bindir}/exchangewizard
 %attr(755,root,root) %{_bindir}/*groupwarewizard
 %attr(755,root,root) %{_bindir}/groupwisewizard
@@ -746,22 +750,13 @@
 %attr(755,root,root) %{_libdir}/kde3/kcm_sdsummary.so
 %attr(755,root,root) %{_libdir}/kde3/kded_networkstatus.so
 %attr(755,root,root) %{_libdir}/kde3/kfile_ics.so
-%attr(755,root,root) %{_libdir}/kde3/libakregatorpart.so*
 %attr(755,root,root) %{_libdir}/kde3/libexchangewizard.so
 %attr(755,root,root) %{_libdir}/kde3/libgroupwisewizard.so*
-%attr(755,root,root) %{_libdir}/kde3/libakregator_mk4storage_plugin.so
-%attr(755,root,root) %{_libdir}/kde3/libkontact_akregator.so
-%attr(755,root,root) %{_libdir}/kde3/libkontact_journalplugin.so
 %attr(755,root,root) %{_libdir}/kde3/libkontact_kaddressbookplugin.so
 %attr(755,root,root) %{_libdir}/kde3/libkontact_karm.so
 %attr(755,root,root) %{_libdir}/kde3/libkontact_kmailplugin.so
-%attr(755,root,root) %{_libdir}/kde3/libkontact_knodeplugin.so
 %attr(755,root,root) %{_libdir}/kde3/libkontact_knotesplugin.so
-%attr(755,root,root) %{_libdir}/kde3/libkontact_korganizerplugin.so
-%attr(755,root,root) %{_libdir}/kde3/libkontact_todoplugin.so
 %attr(755,root,root) %{_libdir}/kde3/libkontact_kpilotplugin.so
-%attr(755,root,root) %{_libdir}/kde3/libkontact_newstickerplugin.so
-%attr(755,root,root) %{_libdir}/kde3/libkontact_specialdatesplugin.so
 %attr(755,root,root) %{_libdir}/kde3/libkontact_summaryplugin.so
 %attr(755,root,root) %{_libdir}/kde3/libkontact_weatherplugin.so
 %attr(755,root,root) %{_libdir}/kde3/libegroupwarewizard.so*
@@ -771,7 +766,6 @@
 %attr(755,root,root) %{_libdir}/kde3/resourcecalendarexchange.so
 %attr(755,root,root) %{_libdir}/kde3/plugins/designer/kdepimwidgets.so
 %attr(755,root,root) %{_libdir}/kde3/plugins/designer/kpartsdesignerplugin.so
-%{_datadir}/apps/akregator
 %{_datadir}/apps/kconf_update/kolab-resource.upd
 %attr(755,root,root) %{_datadir}/apps/kconf_update/upgrade-resourcetype.pl
 %{_datadir}/apps/kdepimwidgets
@@ -779,7 +773,6 @@
 %{_datadir}/apps/kontactsummary
 %{_datadir}/apps/kdepim
 %{_datadir}/autostart/kabcdistlistupdater.desktop
-%{_datadir}/config.kcfg/akregator.kcfg
 %{_datadir}/config.kcfg/custommimeheader.kcfg
 %{_datadir}/config.kcfg/customtemplates_kfg.kcfg
 %{_datadir}/config.kcfg/egroupware.kcfg
@@ -793,8 +786,6 @@
 %{_datadir}/config.kcfg/slox.kcfg
 %{_datadir}/config.kcfg/templatesconfiguration_kfg.kcfg
 
-%{_datadir}/services/akregator_mk4storage_plugin.desktop
-%{_datadir}/services/akregator_part.desktop
 %{_datadir}/services/feed.protocol
 %{_datadir}/services/kcmkmailsummary.desktop
 %{_datadir}/services/kcmkontactknt.desktop
@@ -803,7 +794,10 @@
 %{_datadir}/services/kcmsdsummary.desktop
 %{_datadir}/services/kded/networkstatus.desktop
 %{_datadir}/services/kfile_ics.desktop
-%{_datadir}/services/kontact
+%dir %{_datadir}/services/kontact
+%{_datadir}/services/kontact/specialdatesplugin.desktop
+%{_datadir}/services/kontact/summaryplugin.desktop
+%{_datadir}/services/kontact/weatherplugin.desktop
 %{_datadir}/services/kontactconfig.desktop
 %{_datadir}/services/kresources/kabc/imap.desktop
 %{_datadir}/services/kresources/kabc/kabc_groupdav.desktop
@@ -817,16 +811,13 @@
 %{_datadir}/services/kresources/kabc/scalix.desktop
 %{_datadir}/services/kresources/kcal
 %{_datadir}/services/kresources/kcal_manager.desktop
-%{_datadir}/servicetypes/akregator_plugin.desktop
 %{_datadir}/servicetypes/kaddressbookimprotocol.desktop
 %{_datadir}/servicetypes/kontactplugin.desktop
 %{_datadir}/servicetypes/korgprintplugin.desktop
 %{_desktopdir}/kde/Kontact.desktop
-%{_desktopdir}/kde/akregator.desktop
 
 %{_desktopdir}/kde/groupwarewizard.desktop
 %{_desktopdir}/kde/kontactdcop.desktop
-%{_iconsdir}/*/*/apps/akregator*
 %{_iconsdir}/*/*/apps/kontact.png
 %{_iconsdir}/*/*/actions/kontact_*.png
 %{_iconsdir}/*/*/actions/*rss*
@@ -939,6 +930,22 @@
 %{_datadir}/services/scalix.protocol
 %{_datadir}/services/scalixs.protocol
 
+%files akregator -f akregator.lang
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/akregator
+%attr(755,root,root) %{_libdir}/libakregatorprivate.so
+%attr(755,root,root) %{_libdir}/kde3/libakregatorpart.so*
+%attr(755,root,root) %{_libdir}/kde3/libakregator_mk4storage_plugin.so
+%attr(755,root,root) %{_libdir}/kde3/libkontact_akregator.so
+%{_datadir}/apps/akregator
+%{_datadir}/config.kcfg/akregator.kcfg
+%{_datadir}/services/akregator_mk4storage_plugin.desktop
+%{_datadir}/services/akregator_part.desktop
+%{_datadir}/services/kontact/akregatorplugin*.desktop
+%{_datadir}/servicetypes/akregator_plugin.desktop
+%{_desktopdir}/kde/akregator.desktop
+%{_iconsdir}/*/*/apps/akregator*
+
 %files kaddressbook -f kaddressbook.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kabc2mutt
@@ -964,6 +971,7 @@
 %{_datadir}/services/kaddressbook
 %{_datadir}/services/kfile_vcf.desktop
 %{_datadir}/services/ldifvcardthumbnail.desktop
+%{_datadir}/services/kontact/kaddressbookplugin.desktop
 %{_datadir}/servicetypes/dcopaddressbook.desktop
 %{_datadir}/servicetypes/kaddressbook_contacteditorwidget.desktop
 %{_datadir}/servicetypes/kaddressbook_extension.desktop
@@ -996,6 +1004,7 @@
 %{_datadir}/apps/karm
 %{_datadir}/apps/karmpart
 %{_datadir}/services/karm_part.desktop
+%{_datadir}/services/kontact/karmplugin.desktop
 %{_desktopdir}/kde/karm.desktop
 %{_iconsdir}/*/*/*/karm.png
 
@@ -1055,6 +1064,7 @@
 %{_datadir}/services/kleopatra_config_appear.desktop
 %{_datadir}/services/kleopatra_config_dirserv.desktop
 %{_datadir}/services/kleopatra_config_dnorder.desktop
+%{_datadir}/services/kontact/kmailplugin.desktop
 %{_datadir}/servicetypes/dcopimap.desktop
 %{_datadir}/servicetypes/dcopmail.desktop
 %{_desktopdir}/kde/KMail.desktop
@@ -1085,6 +1095,7 @@
 %attr(755,root,root) %{_bindir}/knode
 %attr(755,root,root) %{_libdir}/kde3/kcm_knode.so
 %attr(755,root,root) %{_libdir}/kde3/libknodepart.so*
+%attr(755,root,root) %{_libdir}/kde3/libkontact_knodeplugin.so
 %{_datadir}/apps/knode
 %{_datadir}/services/knewsservice.protocol
 %{_datadir}/services/knode_config_accounts.desktop
@@ -1094,6 +1105,7 @@
 %{_datadir}/services/knode_config_post_news.desktop
 %{_datadir}/services/knode_config_privacy.desktop
 %{_datadir}/services/knode_config_read_news.desktop
+%{_datadir}/services/kontact/knodeplugin.desktop
 %{_desktopdir}/kde/KNode.desktop
 %{_iconsdir}/*/*/*/knode.png
 %{_iconsdir}/*/*/*/knode2.png
@@ -1115,6 +1127,7 @@
 %{_datadir}/services/kresources/knotes/knotes_xmlrpc.desktop
 %{_datadir}/services/kresources/knotes/kolabresource.desktop
 %{_datadir}/services/kresources/knotes_manager.desktop
+%{_datadir}/services/kontact/knotesplugin.desktop
 %{_desktopdir}/kde/knotes.desktop
 %{_iconsdir}/*/*/*/knotes.png
 
@@ -1127,7 +1140,7 @@
 %files korganizer -f korganizer.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/korgac
-%attr(755,root,root) %{_bindir}/korganizer*
+%attr(755,root,root) %{_bindir}/korganizer
 %attr(755,root,root) %{_bindir}/ical2vcal
 %attr(755,root,root) %{_libdir}/libkorganizer.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libkorganizer.so.1
@@ -1136,6 +1149,11 @@
 %attr(755,root,root) %{_libdir}/libkorganizer_eventviewer.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libkorganizer_eventviewer.so.1
 %attr(755,root,root) %{_libdir}/kde3/kcm_korganizer.so
+%attr(755,root,root) %{_libdir}/kde3/libkontact_journalplugin.so
+%attr(755,root,root) %{_libdir}/kde3/libkontact_korganizerplugin.so
+%attr(755,root,root) %{_libdir}/kde3/libkontact_newstickerplugin.so
+%attr(755,root,root) %{_libdir}/kde3/libkontact_specialdatesplugin.so
+%attr(755,root,root) %{_libdir}/kde3/libkontact_todoplugin.so
 %attr(755,root,root) %{_libdir}/kde3/libkorg_*.so
 %attr(755,root,root) %{_libdir}/kde3/libkorganizerpart.so
 %{_datadir}/apps/kgantt
@@ -1146,6 +1164,10 @@
 %{_datadir}/config.kcfg/korganizer.kcfg
 %{_datadir}/services/korganizer
 %{_datadir}/services/korganizer_*.desktop
+%{_datadir}/services/kontact/journalplugin.desktop
+%{_datadir}/services/kontact/korganizerplugin.desktop
+%{_datadir}/services/kontact/newstickerplugin.desktop
+%{_datadir}/services/kontact/todoplugin.desktop
 %{_datadir}/services/webcal.protocol
 %{_datadir}/servicetypes/calendardecoration.desktop
 %{_datadir}/servicetypes/calendarplugin.desktop
@@ -1196,6 +1218,7 @@
 %{_datadir}/services/kpilot_config.desktop
 %{_datadir}/services/*conduit.desktop
 %{_datadir}/servicetypes/kpilotconduit.desktop
+%{_datadir}/services/kontact/kpilotplugin.desktop
 %{_desktopdir}/kde/kpalmdoc.desktop
 %{_desktopdir}/kde/kpilot*.desktop
 %{_iconsdir}/*/*/apps/kpalmdoc.png
@@ -1204,7 +1227,6 @@
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libakregatorprivate.so
 %attr(755,root,root) %{_libdir}/libindex.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libindex.so.0
 %attr(755,root,root) %{_libdir}/libgpgme++.so.*.*.*
@@ -1310,6 +1332,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.310  2010/07/15 16:02:31  glen
+- akregator subpackage
+- move kontact plugins to appropriate packages
+
 Revision 1.309  2010/07/15 08:46:02  glen
 - move more korganizer files, package more files, libkorg_stdprinting.so remove was mistake, put it back
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdepim/kdepim.spec?r1=1.309&r2=1.310&f=u

