packages: kde4-kdepim/kde4-kdepim.spec - merged from DEVEL

shadzik shadzik at pld-linux.org
Wed Jul 29 21:40:34 CEST 2009 

Author: shadzik                      Date: Wed Jul 29 19:40:34 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
packages/kde4-kdepim:
   kde4-kdepim.spec (1.99 -> 1.100) 

---- Diffs:

================================================================
Index: packages/kde4-kdepim/kde4-kdepim.spec
diff -u packages/kde4-kdepim/kde4-kdepim.spec:1.99 packages/kde4-kdepim/kde4-kdepim.spec:1.100
--- packages/kde4-kdepim/kde4-kdepim.spec:1.99	Fri Jun 26 12:04:07 2009
+++ packages/kde4-kdepim/kde4-kdepim.spec	Wed Jul 29 21:40:29 2009
@@ -3,7 +3,7 @@
 %bcond_without	apidocs			# do not prepare API documentation
 #
 %define		_state		stable
-%define		qtver		4.5.1
+%define		qtver		4.5.2
 
 %define	orgname	kdepim
 Summary:	Personal Information Management (PIM) for KDE
@@ -12,15 +12,15 @@
 Summary(ru.UTF-8):	Персональный планировщик (PIM) для KDE
 Summary(uk.UTF-8):	Персональный планувальник (PIM) для KDE
 Name:		kde4-kdepim
-Version:	4.2.4
-Release:	4
+Version:	4.3.0
+Release:	1
 License:	GPL
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5:	e3b14bea173511628767475f0dbfb6ac
-Patch100:	%{name}-branch.diff
+# Source0-md5:	ddc887f19ef9cd454f4f3226c955aaaf
+#Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
+#Patch100: %{name}-branch.diff
 Patch0:		%{name}-kpilot.patch
-Patch1:		%{name}-filtersearch.patch
 URL:		http://www.kde.org/
 BuildRequires:	QtDesigner-devel
 BuildRequires:	akonadi-devel >= 1.1.2
@@ -51,13 +51,14 @@
 BuildRequires:	qca-devel >= 2.0.0
 %{?with_apidocs:BuildRequires:	qt4-doc >= %{qtver}}
 BuildRequires:	rpmbuild(macros) >= 1.129
-BuildRequires:	soprano-devel >= 2.1.67
-BuildRequires:	strigi-devel >= 0.5.12
+BuildRequires:	soprano-devel >= 2.3.0
+BuildRequires:	strigi-devel >= 0.6.5
 BuildRequires:	xorg-lib-libXScrnSaver-devel
 BuildRequires:	zlib-devel
 BuildConflicts:	indexlib
 BuildConflicts:	kdepim-kontact-libs
 BuildConflicts:	kdepim-libkmailprivate
+Obsoletes:	kde4-kdepim-akonadi
 Requires:	%{name}-libs = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -113,8 +114,8 @@
 - and more...
 
 %description knode -l pl.UTF-8
-KNode to czytnik newsów zgodny ze specyfikacją GKNSA przeznaczony dla
-środowiska KDE. Jego możliwości obejmują:
+KNode to czytnik newsów zgodny ze specyfikacją GKNSA przeznaczony
+dla środowiska KDE. Jego możliwości obejmują:
 - wszystkie podstawowe cechy czytnika newsów (czytanie i wysyłanie
   artykułów, wątkowanie...)
 - obsługę wielu serwerów news
@@ -151,21 +152,9 @@
 tracking hours to be billed to different clients.
 
 %description ktimetracker -l pl.UTF-8
-KTimeTracker śledzi czas spędzony na różnych zajęciach. Jest przydatny
-przy obliczaniu godzin do wystawiania rachunków wielu klientom.
-
-%package kontact-plugin-ktimetracker
-Summary:	Ktimetracker plugin for Kontact
-Summary(pl.UTF-8):	plugin Ktimetracker dla Kontakt
-Group:		X11/Applications
-Requires:	%{name}-kontact = %{version}-%{release}
-Requires:	%{name}-ktimetracker = %{version}-%{release}
-
-%description kontact-plugin-ktimetracker
-Ktimetracker plugin for Kontact.
-
-%description kontact-plugin-ktimetracker -l pl.UTF-8
-plugin Ktimetracker dla Kontakt.
+KTimeTracker śledzi czas spędzony na różnych zajęciach. Jest
+przydatny przy obliczaniu godzin do wystawiania rachunków wielu
+klientom.
 
 %package kmail
 Summary:	KDE Mail client
@@ -201,10 +190,10 @@
 - automatyczne szyfrowanie przy użyciu OpenPGP (PGP lub GnuPG)
 - potężne filtry pocztowe
 - zagnieżdżone skrzynki pocztowe z obsługą list pocztowych
-- ściąganie na żądanie lub usuwanie bez ściągania dużych listów z
-  serwera POP3
-- pełną obsługę listów we wszystkich językach i zestawach znaków
-  obsługiwanych przez Qt
+- ściąganie na żądanie lub usuwanie bez ściągania dużych
+  listów z serwera POP3
+- pełną obsługę listów we wszystkich językach i zestawach
+  znaków obsługiwanych przez Qt
 - przeszukiwanie wiadomości z prezentacją w wirtualnych folderach
 - usuwanie powtórzonych listów
 - wątkowanie wiadomości
@@ -230,6 +219,22 @@
 %description kontact-plugin-kmail -l pl.UTF-8
 Plugin Kmail dla Kontakt.
 
+%package kontact-plugin-ktimetracker
+Summary:        Ktimer plugin for Kontact
+Summary(pl.UTF-8):      plugin Ktimer dla Kontakt
+Group:          X11/Applications
+Requires:	%{name}-ktimetracker = %{version}-%{release}
+Requires:       %{name}-kontact = %{version}-%{release}
+Provides:       kde4-kontact-plugin-ktimetracker
+Obsoletes:      kde4-kontact-plugin-ktimetracker
+
+%description kontact-plugin-ktimetracker
+Ktimer plugin for Kontact.
+
+%description kontact-plugin-ktimetracker -l pl.UTF-8
+Plugin Ktimer dla Kontakt.
+
+
 %package kaddressbook
 Summary:	Address book
 Summary(pl.UTF-8):	Książka adresowa
@@ -440,9 +445,9 @@
 
 %description knotes -l pl.UTF-8
 KNotes pozwala umieszczać na pulpicie notatki z opcją wysyłania.
-Dodatkowo, aby móc służyć za przypominajkę, KNotes może wysyłać pocztę
-i drukować notatki, a także przyjmować przeciąganie nawet ze zdalnych
-komputerów.
+Dodatkowo, aby móc służyć za przypominajkę, KNotes może
+wysyłać pocztę i drukować notatki, a także przyjmować
+przeciąganie nawet ze zdalnych komputerów.
 
 %package kontact-plugin-knotes
 Summary:	Knotes plugin for Kontact
@@ -542,10 +547,10 @@
 
 %description kalarm -l pl.UTF-8
 KAlarm to osobisty program do planowania i przypominania poprzez
-uruchomienie polecenia lub pocztą elektroniczną. Umożliwia ustawienie
-własnej wiadomości alarmowej, która wyskoczy na ekranie o wybranym
-czasie albo zaszeregowanie poleceń do wykonania lub poczty do
-wysłania. Zawiera także demona obsługującego przypominanie.
+uruchomienie polecenia lub pocztą elektroniczną. Umożliwia
+ustawienie własnej wiadomości alarmowej, która wyskoczy na ekranie
+o wybranym czasie albo zaszeregowanie poleceń do wykonania lub poczty
+do wysłania. Zawiera także demona obsługującego przypominanie.
 
 %package konsolekalendar
 Summary:	A command line ICard tool
@@ -566,11 +571,11 @@
 - export calendar entries to other file formats
 
 %description konsolekalendar -l pl.UTF-8
-KonsoleKalendar to działający z linii poleceń interfejs do kalendarzy
-KDE. Pozwala oglądać, wstawiać, usuwać i modyfikować zdarzenia w
-kalendarzu z linii poleceń lub języka skryptowego. Ponadto
-KonsoleKalendar potrafi wyeksportować kalendarz KDE do wielu innych
-formatów.
+KonsoleKalendar to działający z linii poleceń interfejs do
+kalendarzy KDE. Pozwala oglądać, wstawiać, usuwać i modyfikować
+zdarzenia w kalendarzu z linii poleceń lub języka skryptowego.
+Ponadto KonsoleKalendar potrafi wyeksportować kalendarz KDE do wielu
+innych formatów.
 
 Główne możliwości programu KonsoleKalendar:
 - wypisywanie wpisów kalendarza od daty początkowej do końcowej
@@ -754,8 +759,7 @@
 %prep
 %setup -q -n %{orgname}-%{version}
 #%patch100 -p0
-%patch0 -p0
-%patch1 -p3
+#%patch0 -p0
 
 #rm -r `find . -type d -name '.svn'`
 
@@ -764,6 +768,7 @@
 cd build
 %cmake \
 	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+	-DLIB_INSTALL_DIR=%{_libdir} \
 	-DCMAKE_BUILD_TYPE=%{!?debug:release}%{?debug:debug} \
 %if "%{_lib}" == "lib64"
 	-DLIB_SUFFIX=64 \
@@ -787,7 +792,7 @@
 #%find_lang kmobiletools --with-kde
 %find_lang knode --with-kde
 %find_lang knotes --with-kde
-%find_lang konsolekalendar --with-kde
+#%find_lang konsolekalendar --with-kde
 %find_lang kontact --with-kde
 %find_lang korganizer --with-kde
 #%find_lang korn --with-kde
@@ -805,65 +810,31 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kgpgconf
 %attr(755,root,root) %{_bindir}/kwatchgnupg
-%attr(755,root,root) %{_bindir}/kres-migrator
 %attr(755,root,root) %{_bindir}/kabcdistlistupdater
 %attr(755,root,root) %{_libdir}/libkontactinterfaces.so
 %{_datadir}/apps/kwatchgnupg
 %attr(755,root,root) %{_datadir}/apps/kconf_update/kpgp-3.1-upgrade-address-data.pl
 %{_datadir}/apps/kconf_update/kpgp.upd
-### kode
-%attr(755,root,root) %{_bindir}/kode
-%attr(755,root,root) %{_bindir}/kxforms
-%attr(755,root,root) %{_bindir}/kxml_compiler
-%attr(755,root,root) %{_bindir}/kung
-%attr(755,root,root) %{_bindir}/kwsdl_compiler
-%attr(755,root,root) %{_bindir}/schematest
-%attr(755,root,root) %{_libdir}/libkxmlcommon.so
-%attr(755,root,root) %{_libdir}/libkschema.so
-%attr(755,root,root) %{_libdir}/libkschemawidgets.so
-%attr(755,root,root) %{_libdir}/libwscl.so
-%attr(755,root,root) %{_libdir}/libwsdl.so
-%attr(755,root,root) %{_libdir}/libschema.so
-%attr(755,root,root) %{_libdir}/libkode.so
-%{_desktopdir}/kde4/kwsdl_compiler.desktop
-%{_datadir}/apps/kxforms
-%{_datadir}/config.kcfg/kxforms.kcfg
-%{_datadir}/config/kres-migratorrc
 ### strigi
 %attr(755,root,root) %{_libdir}/strigi/strigiea_ics.so
 %attr(755,root,root) %{_libdir}/strigi/strigiea_vcf.so
-### kresources/featureplan
-%attr(755,root,root) %{_libdir}/libkcal_resourcefeatureplan.so
-%attr(755,root,root) %{_libdir}/kde4/kcal_resourcefeatureplan_plugin.so
-%{_datadir}/kde4/services/kresources/kcal/kcal_resourcefeatureplan.desktop
-### kresources/akonadi
-%attr(755,root,root) %{_libdir}/kde4/kcal_akonadi.so
-%{_datadir}/kde4/services/kresources/kcal/akonadi.desktop
-%attr(755,root,root) %{_libdir}/kde4/kabc_akonadi.so
-%{_datadir}/kde4/services/kresources/kabc/akonadi.desktop
 ### kresources/slox/
 %attr(755,root,root) %{_libdir}/libkslox.so
 %attr(755,root,root) %{_libdir}/libkabc_slox.so
-%attr(755,root,root) %{_libdir}/libkcal_slox.so
-%attr(755,root,root) %{_libdir}/kde4/kcal_slox.so
 %attr(755,root,root) %{_libdir}/kde4/kabc_slox.so
+%attr(755,root,root) %{_libdir}/kde4/kcal_slox.so
 %{_datadir}/kde4/services/kresources/kabc/kabc_slox.desktop
 %{_datadir}/kde4/services/kresources/kabc/kabc_ox.desktop
 %{_datadir}/kde4/services/kresources/kabc/kabc_groupwise.desktop
-%{_datadir}/kde4/services/kresources/kcal/kcal_slox.desktop
-%{_datadir}/kde4/services/kresources/kcal/kcal_ox.desktop
-%{_datadir}/kde4/services/kresources/kcal/kcal_groupwise.desktop
 ### kresources/scalix
 %attr(755,root,root) %{_bindir}/scalixadmin
-%attr(755,root,root) %{_libdir}/libkcalscalix.so
 %attr(755,root,root) %{_libdir}/libkabcscalix.so
 %attr(755,root,root) %{_libdir}/libknotesscalix.so
 %attr(755,root,root) %{_libdir}/kde4/knotes_scalix.so
 %attr(755,root,root) %{_libdir}/kde4/kabc_scalix.so
-%attr(755,root,root) %{_libdir}/kde4/kcal_scalix.so
 %attr(755,root,root) %{_libdir}/kde4/kio_scalix.so
+%attr(755,root,root) %{_libdir}/kde4/kcal_scalix.so
 %{_datadir}/autostart/kabcdistlistupdater.desktop
-%{_datadir}/kde4/services/kresources/kcal/scalix.desktop
 %{_datadir}/kde4/services/scalix.protocol
 %{_datadir}/kde4/services/scalixs.protocol
 %{_datadir}/kde4/services/kresources/kabc/scalix.desktop
@@ -876,6 +847,10 @@
 %attr(755,root,root) %{_libdir}/kde4/kabc_groupdav.so
 %{_datadir}/kde4/services/kresources/kabc/kabc_groupdav.desktop
 %{_datadir}/kde4/services/kresources/kcal/kcal_groupdav.desktop
+%{_datadir}/kde4/services/kresources/kcal/kcal_groupwise.desktop
+%{_datadir}/kde4/services/kresources/kcal/kcal_ox.desktop
+%{_datadir}/kde4/services/kresources/kcal/kcal_slox.desktop
+%{_datadir}/kde4/services/kresources/kcal/scalix.desktop
 ### kresources/remote
 %attr(755,root,root) %{_libdir}/libkcal_resourceremote.so
 %attr(755,root,root) %{_libdir}/kde4/kcal_remote.so
@@ -932,7 +907,8 @@
 %attr(755,root,root) %{_bindir}/knode
 %attr(755,root,root) %{_libdir}/kde4/kcm_knode.so
 %attr(755,root,root) %{_libdir}/kde4/knodepart.so
-%attr(755,root,root) %{_libdir}/libknodecommon.so
+%attr(755,root,root) %ghost %{_libdir}/libknodecommon.so.?
+%attr(755,root,root) %{_libdir}/libknodecommon.so.4.*.*
 %{_desktopdir}/kde4/KNode.desktop
 %{_datadir}/apps/knode
 %{_datadir}/dbus-1/interfaces/org.kde.knode.xml
@@ -940,7 +916,6 @@
 %{_datadir}/kde4/services/knode_*.desktop
 %{_iconsdir}/*/*/apps/knode.png
 %{_iconsdir}/*/*/apps/knode2.png
-%lang(en) %{_kdedocdir}/en/kioslave/news
 
 %files kontact-plugin-knode
 %defattr(644,root,root,755)
@@ -952,20 +927,17 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/karm
 %attr(755,root,root) %{_bindir}/ktimetracker
-%attr(755,root,root) %{_libdir}/kde4/kcm_ktimetrackerconfig.so
 %attr(755,root,root) %{_libdir}/kde4/ktimetrackerpart.so
+%attr(755,root,root) %{_libdir}/kde4/kcm_ktimetracker.so
 %{_desktopdir}/kde4/ktimetracker.desktop
 %{_datadir}/apps/ktimetracker
 %{_datadir}/dbus-1/interfaces/org.kde.ktimetracker.ktimetracker.xml
-%{_datadir}/kde4/services/ktimetrackerconfig.desktop
 %{_datadir}/kde4/services/ktimetrackerpart.desktop
+%{_datadir}/kde4/services/ktimetracker_config_behavior.desktop
+%{_datadir}/kde4/services/ktimetracker_config_display.desktop
+%{_datadir}/kde4/services/ktimetracker_config_storage.desktop
 %{_iconsdir}/*/*/apps/ktimetracker.png
 
-%files kontact-plugin-ktimetracker
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/kde4/kontact_ktimetrackerplugin.so
-%{_datadir}/kde4/services/kontact/ktimetracker_plugin.desktop
-
 %files kmail -f kmail.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kmail
@@ -1007,21 +979,12 @@
 %{_iconsdir}/oxygen/*/status/mail-task.*
 
 %{_iconsdir}/oxygen/*/actions/ldap_lookup.png
-%{_iconsdir}/oxygen/*/actions/meeting-*.*
 %{_iconsdir}/oxygen/*/actions/smallclock.png
 %{_iconsdir}/oxygen/*/actions/upindicator.png
 %{_iconsdir}/oxygen/*/actions/checkmark.png
 # conflicts with kde-icons-oxygen
 %{_iconsdir}/oxygen/*/actions/edit-delete-page.png
-%{_iconsdir}/oxygen/*/actions/journal-new.png
-%{_iconsdir}/oxygen/*/actions/task-new.png
 %{_iconsdir}/oxygen/*/status/mail-tagged.png
-%{_iconsdir}/oxygen/*/status/appointment-recurring.png
-%{_iconsdir}/oxygen/*/status/appointment-reminder.png
-%{_iconsdir}/oxygen/*/status/meeting-organizer.png
-%{_iconsdir}/oxygen/*/status/task-complete.png
-%{_iconsdir}/oxygen/*/status/task-recurring.png
-%{_iconsdir}/oxygen/*/status/task-reminder.png
 
 ### libkleo
 %attr(755,root,root) %{_libdir}/libkleo.so
@@ -1033,6 +996,11 @@
 %{_datadir}/kde4/services/kontact/kmailplugin.desktop
 %{_datadir}/kde4/services/kcmkmailsummary.desktop
 
+%files kontact-plugin-ktimetracker
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/kde4/kontact_ktimetrackerplugin.so
+%{_datadir}/kde4/services/kontact/ktimetracker_plugin.desktop
+
 %files kaddressbook -f kaddressbook.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kaddressbook
@@ -1081,8 +1049,9 @@
 %attr(755,root,root) %{_libdir}/kde4/kcm_korganizer.so
 %attr(755,root,root) %{_libdir}/kde4/korg_*.so
 %attr(755,root,root) %{_libdir}/kde4/korganizerpart.so
-%attr(755,root,root) %{_libdir}/libkocorehelper.so
 %attr(755,root,root) %{_libdir}/libkorg_stdprinting.so
+%attr(755,root,root) %ghost %{_libdir}/libkorganizer_core.so.?
+%attr(755,root,root) %{_libdir}/libkorganizer_core.so.4.*.*
 %attr(755,root,root) %{_libdir}/libkorganizer_calendar.so
 %attr(755,root,root) %{_libdir}/libkorganizer_eventviewer.so
 %attr(755,root,root) %{_libdir}/libkorganizer_interfaces.so
@@ -1106,9 +1075,6 @@
 %{_desktopdir}/kde4/korganizer-import.desktop
 %{_desktopdir}/kde4/korganizer.desktop
 %{_iconsdir}/*/*/apps/korganizer.*
-### libkholidays
-%attr(755,root,root) %{_libdir}/libkholidays.so
-%{_datadir}/apps/libkholidays
 
 %files kontact-plugin-korganizer
 %defattr(644,root,root,755)
@@ -1184,6 +1150,7 @@
 %files akregator -f akregator.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/akregator
+%attr(755,root,root) %{_bindir}/akregatorstorageexporter
 %attr(755,root,root) %{_libdir}/libakregatorinterfaces.so
 %attr(755,root,root) %{_libdir}/kde4/akregator_mk4storage_plugin.so
 %attr(755,root,root) %{_libdir}/kde4/akregator_config_general.so
@@ -1192,8 +1159,6 @@
 %attr(755,root,root) %{_libdir}/kde4/akregator_config_browser.so
 %attr(755,root,root) %{_libdir}/kde4/akregator_config_advanced.so
 %attr(755,root,root) %{_libdir}/kde4/akregatorpart.so
-%attr(755,root,root) %{_libdir}/kde4/akregator_config_onlinesync.so
-%attr(755,root,root) %{_libdir}/kde4/akregator_onlinesync_plugin.so
 %{_desktopdir}/kde4/akregator.desktop
 %{_datadir}/apps/akregator
 %{_datadir}/kde4/services/akregator_*.desktop
@@ -1203,8 +1168,6 @@
 %{_datadir}/config.kcfg/akregator.kcfg
 %{_iconsdir}/*/*/apps/akregator_empty.png
 %{_iconsdir}/*/*/apps/akregator.*
-%dir %{_datadir}/apps/akregator_onlinesync_plugin
-%{_datadir}/apps/akregator_onlinesync_plugin/akregator_onlinesync_plugin.rc
 
 %files kontact-plugin-akregator
 %defattr(644,root,root,755)
@@ -1220,6 +1183,7 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/knotes
 %attr(755,root,root) %{_libdir}/kde4/knotes_local.so
+%attr(755,root,root) %{_libdir}/kde4/kcm_knote.so
 %{_desktopdir}/kde4/knotes.desktop
 %{_datadir}/apps/knotes
 %{_datadir}/config.kcfg/knoteconfig.kcfg
@@ -1227,6 +1191,11 @@
 %{_datadir}/dbus-1/interfaces/org.kde.KNotes.xml
 %{_datadir}/kde4/services/kresources/knotes_manager.desktop
 %{_datadir}/kde4/services/kresources/knotes/local.desktop
+%{_datadir}/kde4/services/knote_config_action.desktop
+%{_datadir}/kde4/services/knote_config_display.desktop
+%{_datadir}/kde4/services/knote_config_editor.desktop
+%{_datadir}/kde4/services/knote_config_network.desktop
+%{_datadir}/kde4/services/knote_config_style.desktop
 %{_iconsdir}/*/*/apps/knotes.png
 
 %files kontact-plugin-knotes
@@ -1240,16 +1209,17 @@
 %attr(755,root,root) %{_bindir}/kjots
 %attr(755,root,root) %{_libdir}/kde4/kjotspart.so
 %attr(755,root,root) %{_libdir}/kde4/kontact_kjotsplugin.so
+%attr(755,root,root) %{_libdir}/kde4/kcm_kjots.so
 %{_datadir}/kde4/services/kjotspart.desktop
 %{_desktopdir}/kde4/Kjots.desktop
 %{_datadir}/apps/kjots
 %{_datadir}/config.kcfg/kjots.kcfg
 %{_datadir}/kde4/services/kontact/kjots_plugin.desktop
+%{_datadir}/kde4/services/kjots_config_misc.desktop
 %{_iconsdir}/*/*/apps/kjots.png
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/*.h
 %{_includedir}/kleo
 %{_includedir}/kmail
 %{_includedir}/kpgp
@@ -1261,7 +1231,6 @@
 %{_includedir}/akregator
 %{_includedir}/kaddressbook
 %attr(755,root,root) %{_libdir}/libakregatorinterfaces.so
-%attr(755,root,root) %{_libdir}/libimap.so
 %attr(755,root,root) %{_libdir}/libgwsoap.so
 %attr(755,root,root) %{_libdir}/libkabc_groupdav.so
 %attr(755,root,root) %{_libdir}/libkabc_slox.so
@@ -1269,9 +1238,7 @@
 %attr(755,root,root) %{_libdir}/libkabcgroupwise.so
 %attr(755,root,root) %{_libdir}/libkabckolab.so
 %attr(755,root,root) %{_libdir}/libkabinterfaces.so
-#%attr(755,root,root) %{_libdir}/libkaddressbookprivate.so
 %attr(755,root,root) %{_libdir}/libkcalgroupwise.so
-%attr(755,root,root) %{_libdir}/libkcal_resourcefeatureplan.so
 %attr(755,root,root) %{_libdir}/libkcal_resourceremote.so
 %attr(755,root,root) %{_libdir}/libkcal_slox.so
 %attr(755,root,root) %{_libdir}/libkcal_xmlrpc.so
@@ -1279,12 +1246,8 @@
 %attr(755,root,root) %{_libdir}/libkdepim.so
 %attr(755,root,root) %{_libdir}/libkgroupwarebase.so
 %attr(755,root,root) %{_libdir}/libkgroupwaredav.so
-%attr(755,root,root) %{_libdir}/libkholidays.so
 %attr(755,root,root) %{_libdir}/libknotes_xmlrpc.so
 %attr(755,root,root) %{_libdir}/libknoteskolab.so
-%attr(755,root,root) %{_libdir}/libkocorehelper.so
-%attr(755,root,root) %{_libdir}/libkode.so
-#%attr(755,root,root) %{_libdir}/libkontactprivate.so
 %attr(755,root,root) %{_libdir}/libkorganizer_eventviewer.so
 %attr(755,root,root) %{_libdir}/libkorganizer_calendar.so
 %attr(755,root,root) %{_libdir}/libkorg_stdprinting.so
@@ -1292,10 +1255,6 @@
 %attr(755,root,root) %{_libdir}/libkpilot.so
 %attr(755,root,root) %{_libdir}/libksieve.so
 %attr(755,root,root) %{_libdir}/libmimelib.so
-%attr(755,root,root) %{_libdir}/libakonadi-kabccommon.so
-%attr(755,root,root) %{_libdir}/libakonadi-kcal.so
-#%attr(755,root,root) %{_libdir}/libkmobiletoolsengineui.so
-#%attr(755,root,root) %{_libdir}/libkmobiletoolslib.so
 %attr(755,root,root) %{_libdir}/libkabcommon.so
 %attr(755,root,root) %{_libdir}/libkabcscalix.so
 %attr(755,root,root) %{_libdir}/libkcal_groupdav.so
@@ -1305,10 +1264,10 @@
 #%{_libdir}ttr(755,root,root) /libqopensync.so
 %attr(755,root,root) %{_libdir}/libkleopatraclientcore.so
 %attr(755,root,root) %{_libdir}/libkleopatraclientgui.so
+%attr(755,root,root) %{_libdir}/libknodecommon.so
+%attr(755,root,root) %{_libdir}/libkorganizer_core.so
 %{_datadir}/apps/libkleopatra
 
-%{_datadir}/apps/cmake/modules/*.cmake
-
 %files kio-groupwise
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/kde4/kio_groupwise.so
@@ -1338,14 +1297,19 @@
 %{_datadir}/kde4/services/kresources/kalarm_manager.desktop
 %{_iconsdir}/*/*/apps/*kalarm.png
 %{_iconsdir}/*/*/actions/document-new-from-template.png
+%{_iconsdir}/oxygen/*x*/actions/*alarm*.png
 
-%files konsolekalendar -f konsolekalendar.lang
+%files konsolekalendar
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/konsolekalendar
 %attr(755,root,root) %{_bindir}/kabcclient
 %{_desktopdir}/kde4/konsolekalendar.desktop
-%lang(en) %{_kdedocdir}/en/kabcclient
-%{_mandir}/man1/kabcclient.1.*
+%dir %{_datadir}/apps
+%dir %{_datadir}/apps/konsolekalendar
+%dir %{_datadir}/apps/konsolekalendar/pics
+%{_datadir}/apps/konsolekalendar/pics/*.png
+#%lang(en) %{_kdedocdir}/en/kabcclient
+#%{_mandir}/man1/kabcclient.1.*
 
 #%files korn -f korn.lang
 #%defattr(644,root,root,755)
@@ -1384,85 +1348,93 @@
 %{_desktopdir}/kde4/kpilotdaemon.desktop
 %{_iconsdir}/*/*/actions/kpilot_*.png
 %{_iconsdir}/*/*/apps/kpilot.png
-%{_iconsdir}/*/*/apps/kpilotDaemon.png
+%{_iconsdir}/*/*/apps/kpilotdaemon.png
 
-%files akonadi
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/akonadi_distlist_resource
-%attr(755,root,root) %{_bindir}/akonadi_ical_resource
-%attr(755,root,root) %{_bindir}/akonadi_imaplib_resource
-%attr(755,root,root) %{_bindir}/akonadi_kabc_resource
-%attr(755,root,root) %{_bindir}/akonadi_kcal_resource
-%attr(755,root,root) %{_bindir}/akonadi_knut_resource
-%attr(755,root,root) %{_bindir}/akonadi_localbookmarks_resource
-%attr(755,root,root) %{_bindir}/akonadi_maildir_resource
-%attr(755,root,root) %{_bindir}/akonadi_mailthreader_agent
-%attr(755,root,root) %{_bindir}/akonadi_nepomuk_contact_feeder
-%attr(755,root,root) %{_bindir}/akonadi_nepomuk_email_feeder
-%attr(755,root,root) %{_bindir}/akonadi_nepomuktag_resource
-%attr(755,root,root) %{_bindir}/akonadi_nntp_resource
-%attr(755,root,root) %{_bindir}/akonadi_strigi_feeder
-%attr(755,root,root) %{_bindir}/akonadi_vcard_resource
-%attr(755,root,root) %{_bindir}/akonadi_vcarddir_resource
-%attr(755,root,root) %{_bindir}/akonadiconsole
-%attr(755,root,root) %{_bindir}/akonaditray
-#%attr(755,root,root) %{_bindir}/akonamail
-#%attr(755,root,root) %{_bindir}/kabcviewer
-#%attr(755,root,root) %{_bindir}/kabceditor
-#%attr(755,root,root) %{_bindir}/akonalendar
-#%attr(755,root,root) %{_bindir}/kcontactmanager
-%attr(755,root,root) %{_libdir}/kde4/akonadi_serializer_addressee.so
-%attr(755,root,root) %{_libdir}/kde4/akonadi_serializer_contactgroup.so
-%attr(755,root,root) %{_libdir}/kde4/akonadi_serializer_mail.so
-%attr(755,root,root) %{_libdir}/kde4/akonadi_serializer_kcal.so
-%attr(755,root,root) %{_libdir}/kde4/akonadi_serializer_bookmark.so
-%attr(755,root,root) %{_libdir}/kde4/kio_akonadi.so
-%attr(755,root,root) %{_libdir}/kde4/kcm_akonadi_resources.so
-%attr(755,root,root) %{_libdir}/kde4/kcm_akonadi.so
-%attr(755,root,root) %{_libdir}/kde4/kcm_akonadi_server.so
-#%attr(755,root,root) %{_libdir}/libopensync1/plugins/akonadi_opensync_plugin.so
-#%{_datadir}/libopensync1/defaults/akonadi-sync
-%dir %{_datadir}/apps/akonadi
-%dir %{_datadir}/apps/akonadi/plugins
-%dir %{_datadir}/apps/akonadi/plugins/serializer
-%{_datadir}/apps/akonadi/plugins/serializer/akonadi_serializer_addressee.desktop
-%{_datadir}/apps/akonadi/plugins/serializer/akonadi_serializer_contactgroup.desktop
-%{_datadir}/apps/akonadi/plugins/serializer/akonadi_serializer_mail.desktop
-%{_datadir}/apps/akonadi/plugins/serializer/akonadi_serializer_kcal.desktop
-%{_datadir}/apps/akonadi/plugins/serializer/akonadi_serializer_bookmark.desktop
-%{_datadir}/apps/nepomuk/ontologies/nco.trig
-%{_datadir}/apps/nepomuk/ontologies/nco.desktop
-%{_datadir}/apps/nepomuk/ontologies/nmo.desktop
-%{_datadir}/apps/nepomuk/ontologies/nmo.trig
-%dir %{_datadir}/akonadi
-%dir %{_datadir}/akonadi/agents
-%{_datadir}/akonadi/agents/distlistresource.desktop
-%{_datadir}/akonadi/agents/mailthreaderagent.desktop
-%{_datadir}/akonadi/agents/strigifeeder.desktop
-%{_datadir}/akonadi/agents/vcardresource.desktop
-%{_datadir}/akonadi/agents/nntpresource.desktop
-%{_datadir}/akonadi/agents/kcalresource.desktop
-%{_datadir}/akonadi/agents/knutresource.desktop
-%{_datadir}/akonadi/agents/icalresource.desktop
-%{_datadir}/akonadi/agents/kabcresource.desktop
-%{_datadir}/akonadi/agents/localbookmarksresource.desktop
-%{_datadir}/akonadi/agents/maildirresource.desktop
-%{_datadir}/akonadi/agents/imaplibresource.desktop
-%{_datadir}/akonadi/agents/nepomukcontactfeeder.desktop
-%{_datadir}/akonadi/agents/nepomukemailfeeder.desktop
-%{_datadir}/akonadi/agents/nepomuktagresource.desktop
-%{_datadir}/akonadi/agents/vcarddirresource.desktop
-%{_datadir}/kde4/services/akonadi.protocol
-#%dir %{_datadir}/apps/kcontactmanager
-#%{_datadir}/apps/kcontactmanager/kcontactmanagerui.rc
-#%{_desktopdir}/kde4/kcontactmanager.desktop
-%{_desktopdir}/kde4/akonadiconsole.desktop
-%dir %{_datadir}/apps/akonadiconsole
<<Diff was trimmed, longer than 597 lines>>

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

More information about the pld-cvs-commit mailing list