packages (DEVEL): kde4-kdepim/kde4-kdepim.spec, kde4-kdepim/kde4-kdepim-kle...

[cactus]

Author: cactus                       Date: Sat Jun 27 15:09:51 2009 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- hack to build kdepim, but could broke sorting in kleopatra
- files

---- Files affected:
packages/kde4-kdepim:
   kde4-kdepim.spec (1.94.2.6 -> 1.94.2.7) , kde4-kdepim-kleopatra_hack.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/kde4-kdepim/kde4-kdepim.spec
diff -u packages/kde4-kdepim/kde4-kdepim.spec:1.94.2.6 packages/kde4-kdepim/kde4-kdepim.spec:1.94.2.7
--- packages/kde4-kdepim/kde4-kdepim.spec:1.94.2.6	Sat Jun 13 11:31:46 2009
+++ packages/kde4-kdepim/kde4-kdepim.spec	Sat Jun 27 17:09:45 2009
@@ -22,6 +22,7 @@
 #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
@@ -745,6 +746,8 @@
 %setup -q -n %{orgname}-%{version}svn%{svn}
 #%patch100 -p0
 #%patch0 -p0
+# just to build hack, could broke kleopatra sorting
+%patch1 -p0
 
 #rm -r `find . -type d -name '.svn'`
 
@@ -891,6 +894,9 @@
 %{_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)
@@ -971,21 +977,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
@@ -1310,6 +1307,10 @@
 %attr(755,root,root) %{_bindir}/konsolekalendar
 %attr(755,root,root) %{_bindir}/kabcclient
 %{_desktopdir}/kde4/konsolekalendar.desktop
+%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.*
 
@@ -1350,7 +1351,7 @@
 %{_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)
@@ -1390,6 +1391,8 @@
 %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
@@ -1433,6 +1436,8 @@
 %{_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)
@@ -1620,6 +1625,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.94.2.7  2009/06/27 15:09:45  cactus
+- hack to build kdepim, but could broke sorting in kleopatra
+- files
+
 Revision 1.94.2.6  2009/06/13 09:31:46  cactus
 - up to 4.2.91
 

================================================================
Index: packages/kde4-kdepim/kde4-kdepim-kleopatra_hack.patch
diff -u /dev/null packages/kde4-kdepim/kde4-kdepim-kleopatra_hack.patch:1.1
--- /dev/null	Sat Jun 27 17:09:51 2009
+++ packages/kde4-kdepim/kde4-kdepim-kleopatra_hack.patch	Sat Jun 27 17:09:45 2009
@@ -0,0 +1,24 @@
+--- kdepim-4.2.91svn979380/kleopatra/models/keylistmodel.cpp.orig	2009-03-10 13:25:10.000000000 +0100
++++ kdepim-4.2.91svn979380/kleopatra/models/keylistmodel.cpp	2009-06-27 15:38:59.000000000 +0200
+@@ -684,7 +684,7 @@
+ 
+ // sorts 'keys' such that parent always come before their children:
+ static std::vector<Key> topological_sort( const std::vector<Key> & keys ) {
+-
++/*
+     adjacency_list<> graph( keys.size() );
+ 
+     // add edges from children to parents:
+@@ -698,10 +698,10 @@
+             continue;
+         add_edge( i, std::distance( keys.begin(), it ), graph );
+     }
+-
++*/
+     std::vector<int> order;
+     order.reserve( keys.size() );
+-    topological_sort( graph, std::back_inserter( order ) );
++    //topological_sort( graph, std::back_inserter( order ) );
+ 
+     assert( order.size() == keys.size() );
+ 
================================================================

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