packages (DEVEL): kde4-kdepim/kde4-kdepim.spec - 4.3 RC1 - kill stupidness ...

shadzik shadzik at pld-linux.org
Tue Jun 30 10:47:24 CEST 2009


Author: shadzik                      Date: Tue Jun 30 08:47:24 2009 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- 4.3 RC1
- kill stupidness
- This is the ver. the whole akonadi went away :)

---- Files affected:
packages/kde4-kdepim:
   kde4-kdepim.spec (1.94.2.9 -> 1.94.2.10) 

---- Diffs:

================================================================
Index: packages/kde4-kdepim/kde4-kdepim.spec
diff -u packages/kde4-kdepim/kde4-kdepim.spec:1.94.2.9 packages/kde4-kdepim/kde4-kdepim.spec:1.94.2.10
--- packages/kde4-kdepim/kde4-kdepim.spec:1.94.2.9	Sat Jun 27 17:26:49 2009
+++ packages/kde4-kdepim/kde4-kdepim.spec	Tue Jun 30 10:47:18 2009
@@ -13,16 +13,15 @@
 Summary(ru.UTF-8):	Персональный планировщик (PIM) для KDE
 Summary(uk.UTF-8):	Персональный планувальник (PIM) для KDE
 Name:		kde4-kdepim
-Version:	4.2.91
+Version:	4.2.95
 Release:	1
 License:	GPL
 Group:		X11/Applications
-Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}svn%{svn}.tar.bz2
-# Source0-md5:	7ac2dadac96d3cdf01151578be512765
+Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
+# Source0-md5:	ed66d18ce69e43e48a29ffe4cb00407b
 #Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
 #Patch100: %{name}-branch.diff
 Patch0:		%{name}-kpilot.patch
-Patch1:		%{name}-kleopatra_hack.patch
 URL:		http://www.kde.org/
 BuildRequires:	QtDesigner-devel
 BuildRequires:	akonadi-devel >= 1.1.2
@@ -39,7 +38,6 @@
 BuildRequires:	gpgme-devel >= 1:1.0.0
 %{?with_apidocs:BuildRequires:	graphviz}
 BuildRequires:	kde4-kdebase-workspace-devel >= %{version}
-BuildRequires:	kde4-kdeedu-devel >= %{version}
 BuildRequires:	kde4-kdelibs-devel >= %{version}
 BuildRequires:	kde4-kdepimlibs-devel >= %{version}
 BuildRequires:	libassuan-devel
@@ -743,11 +741,9 @@
 libksieve, libmimelib.
 
 %prep
-%setup -q -n %{orgname}-%{version}svn%{svn}
+%setup -q -n %{orgname}-%{version}
 #%patch100 -p0
 #%patch0 -p0
-# just to build hack, could broke kleopatra sorting
-%patch1 -p1
 
 #rm -r `find . -type d -name '.svn'`
 
@@ -797,20 +793,14 @@
 %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
-%{_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
-### kresources/akonadi
-%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
@@ -894,9 +884,6 @@
 %{_datadir}/kde4/servicetypes/kontactplugin.desktop
 %{_iconsdir}/*/*/*/kontact*.png
 %{_datadir}/dbus-1/interfaces/org.kde.kontact.KNotes.xml
-# subpackage this:
-%{_datadir}/kde4/services/kontact/ktimetracker_plugin.desktop
-%attr(755,root,root) %{_libdir}/kde4/kontact_ktimetrackerplugin.so
 
 %files knode -f knode.lang
 %defattr(644,root,root,755)
@@ -947,8 +934,6 @@
 %attr(755,root,root) %{_libdir}/kde4/kcm_kmail.so
 %attr(755,root,root) %{_libdir}/kde4/kmailpart.so
 %attr(755,root,root) %{_libdir}/kde4/kmail_bodypartformatter_application_octetstream.so
-%attr(755,root,root) %ghost %{_libdir}/libmbox.so.?
-%attr(755,root,root) %{_libdir}/libmbox.so.4.*.*
 %{_desktopdir}/kde4/KMail.desktop
 %{_desktopdir}/kde4/kmail_view.desktop
 %{_datadir}/apps/kmail
@@ -1213,7 +1198,6 @@
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/akonadi
 %{_includedir}/kleo
 %{_includedir}/kmail
 %{_includedir}/kpgp
@@ -1232,7 +1216,6 @@
 %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_resourceremote.so
 %attr(755,root,root) %{_libdir}/libkcal_slox.so
@@ -1243,7 +1226,6 @@
 %attr(755,root,root) %{_libdir}/libkgroupwaredav.so
 %attr(755,root,root) %{_libdir}/libknotes_xmlrpc.so
 %attr(755,root,root) %{_libdir}/libknoteskolab.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
@@ -1251,10 +1233,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
@@ -1264,11 +1242,8 @@
 #%{_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}/libakonadi-xml.so
-%attr(755,root,root) %{_libdir}/libakonadi_next.so
 %attr(755,root,root) %{_libdir}/libknodecommon.so
 %attr(755,root,root) %{_libdir}/libkorganizer_core.so
-%attr(755,root,root) %{_libdir}/libmbox.so
 %{_datadir}/apps/libkleopatra
 
 %files kio-groupwise
@@ -1353,91 +1328,91 @@
 %{_iconsdir}/*/*/apps/kpilot.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_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}/akonadi2xml
-%attr(755,root,root) %{_bindir}/akonadi_birthdays_resource
-%attr(755,root,root) %{_bindir}/akonadi_imap_resource
-%attr(755,root,root) %{_bindir}/akonadi_kolabproxy_resource
-%attr(755,root,root) %{_bindir}/akonadi_mbox_resource
-%attr(755,root,root) %{_bindir}/akonadi_microblog_resource
-%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_microblog.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}/kde4/kcal_akonadi.so
-%dir %{_datadir}/apps/akonadi
-%{_datadir}/apps/akonadi/akonadi-xml.xsd
-%dir %{_datadir}/apps/akonadi_knut_resource
-%{_datadir}/apps/akonadi_knut_resource/knut-template.xml
-%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/akonadi/plugins/serializer/akonadi_serializer_microblog.desktop
-%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/nepomukcontactfeeder.desktop
-%{_datadir}/akonadi/agents/nepomukemailfeeder.desktop
-%{_datadir}/akonadi/agents/nepomuktagresource.desktop
-%{_datadir}/akonadi/agents/vcarddirresource.desktop
-%{_datadir}/akonadi/agents/birthdaysresource.desktop
-%{_datadir}/akonadi/agents/imapresource.desktop
-%{_datadir}/akonadi/agents/kolabproxyresource.desktop
-%{_datadir}/akonadi/agents/mboxresource.desktop
-%{_datadir}/akonadi/agents/microblog.desktop
-%{_datadir}/akonadi/agents/notesresource.desktop
-%dir %{_datadir}/apps/akonadi/firstrun
-%{_datadir}/apps/akonadi/firstrun/defaultaddressbook
-%{_datadir}/apps/akonadi/firstrun/defaultcalendar
-%{_datadir}/kde4/services/akonadi.protocol
-%{_desktopdir}/kde4/akonadiconsole.desktop
-%dir %{_datadir}/apps/akonadiconsole
-%{_datadir}/apps/akonadiconsole/akonadiconsoleui.rc
-%{_datadir}/kde4/services/kcm_akonadi_resources.desktop
-%{_datadir}/kde4/services/kcm_akonadi.desktop
-%{_datadir}/kde4/services/kcm_akonadi_server.desktop
-%{_desktopdir}/kde4/akonaditray.desktop
-%{_datadir}/kde4/services/kresources/kcal/akonadi.desktop
-%{_datadir}/dbus-1/interfaces/org.kde.Akonadi.Maildir.Settings.xml
-%{_iconsdir}/*/*/apps/kolab.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_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}/akonadi2xml
+#%attr(755,root,root) %{_bindir}/akonadi_birthdays_resource
+#%attr(755,root,root) %{_bindir}/akonadi_imap_resource
+#%attr(755,root,root) %{_bindir}/akonadi_kolabproxy_resource
+#%attr(755,root,root) %{_bindir}/akonadi_mbox_resource
+#%attr(755,root,root) %{_bindir}/akonadi_microblog_resource
+#%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_microblog.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}/kde4/kcal_akonadi.so
+#%dir %{_datadir}/apps/akonadi
+#%{_datadir}/apps/akonadi/akonadi-xml.xsd
+#%dir %{_datadir}/apps/akonadi_knut_resource
+#%{_datadir}/apps/akonadi_knut_resource/knut-template.xml
+#%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/akonadi/plugins/serializer/akonadi_serializer_microblog.desktop
+#%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/nepomukcontactfeeder.desktop
+#%{_datadir}/akonadi/agents/nepomukemailfeeder.desktop
+#%{_datadir}/akonadi/agents/nepomuktagresource.desktop
+#%{_datadir}/akonadi/agents/vcarddirresource.desktop
+#%{_datadir}/akonadi/agents/birthdaysresource.desktop
+#%{_datadir}/akonadi/agents/imapresource.desktop
+#%{_datadir}/akonadi/agents/kolabproxyresource.desktop
+#%{_datadir}/akonadi/agents/mboxresource.desktop
+#%{_datadir}/akonadi/agents/microblog.desktop
+#%{_datadir}/akonadi/agents/notesresource.desktop
+#%dir %{_datadir}/apps/akonadi/firstrun
+#%{_datadir}/apps/akonadi/firstrun/defaultaddressbook
+#%{_datadir}/apps/akonadi/firstrun/defaultcalendar
+#%{_datadir}/kde4/services/akonadi.protocol
+#%{_desktopdir}/kde4/akonadiconsole.desktop
+#%dir %{_datadir}/apps/akonadiconsole
+#%{_datadir}/apps/akonadiconsole/akonadiconsoleui.rc
+#%{_datadir}/kde4/services/kcm_akonadi_resources.desktop
+#%{_datadir}/kde4/services/kcm_akonadi.desktop
+#%{_datadir}/kde4/services/kcm_akonadi_server.desktop
+#%{_desktopdir}/kde4/akonaditray.desktop
+#%{_datadir}/kde4/services/kresources/kcal/akonadi.desktop
+#%{_datadir}/dbus-1/interfaces/org.kde.Akonadi.Maildir.Settings.xml
+#%{_iconsdir}/*/*/apps/kolab.png
 
 %files kleopatra -f kleopatra.lang
 %defattr(644,root,root,755)
@@ -1525,14 +1500,6 @@
 %{_datadir}/apps/kdepimwidgets
 %{_iconsdir}/*/*/actions/button_more.png
 %{_iconsdir}/*/*/actions/button_fewer.png
-%attr(755,root,root) %ghost %{_libdir}/libakonadi-kabccommon.so.?
-%attr(755,root,root) %{_libdir}/libakonadi-kabccommon.so.4.*.*
-%attr(755,root,root) %ghost %{_libdir}/libakonadi-kcal.so.?
-%attr(755,root,root) %{_libdir}/libakonadi-kcal.so.4.*.*
-%attr(755,root,root) %ghost %{_libdir}/libakonadi-xml.so.?
-%attr(755,root,root) %{_libdir}/libakonadi-xml.so.4.*.*
-%attr(755,root,root) %ghost %{_libdir}/libakonadi_next.so.?
-%attr(755,root,root) %{_libdir}/libakonadi_next.so.4.*.*
 %attr(755,root,root) %ghost %{_libdir}/libakregatorinterfaces.so.?
 %attr(755,root,root) %{_libdir}/libakregatorinterfaces.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libakregatorprivate.so.?
@@ -1613,9 +1580,6 @@
 %attr(755,root,root) %{_libdir}/libksieve.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libkslox.so.?
 %attr(755,root,root) %{_libdir}/libkslox.so.*.*.*
-%attr(755,root,root) %{_libdir}/libmaildir.so
-%attr(755,root,root) %ghost %{_libdir}/libmaildir.so.?
-%attr(755,root,root) %{_libdir}/libmaildir.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libmimelib.so.?
 %attr(755,root,root) %{_libdir}/libmimelib.so.*.*.*
 
@@ -1625,6 +1589,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.94.2.10  2009/06/30 08:47:18  shadzik
+- 4.3 RC1
+- kill stupidness
+- This is the ver. the whole akonadi went away :)
+
 Revision 1.94.2.9  2009/06/27 15:26:49  cactus
 - R: pinentry-qt -> pinentry-qt4
 
================================================================

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



More information about the pld-cvs-commit mailing list