rpms/kdeutils/F-9 kdeutils-4.2.0-kjots-without-kdepim.patch, NONE, 1.1 .cvsignore, 1.53, 1.54 kdeutils.spec, 1.135, 1.136 sources, 1.60, 1.61 kdeutils-4.0.99-kjots-without-kdepim.patch, 1.3, NONE

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdeutils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29390/F-9

Modified Files:
	.cvsignore kdeutils.spec sources 
Added Files:
	kdeutils-4.2.0-kjots-without-kdepim.patch 
Removed Files:
	kdeutils-4.0.99-kjots-without-kdepim.patch 
Log Message:
Update kjots hack (upload kdepim tarball in F-9, rediff patch).

kdeutils-4.2.0-kjots-without-kdepim.patch:

--- NEW FILE kdeutils-4.2.0-kjots-without-kdepim.patch ---
diff -ur kjots-4.2.0/CMakeLists.txt kjots-4.2.0-kjots-without-kdepim/CMakeLists.txt
--- kjots-4.2.0/CMakeLists.txt	2008-12-21 21:18:58.000000000 +0100
+++ kjots-4.2.0-kjots-without-kdepim/CMakeLists.txt	2009-01-28 17:41:40.000000000 +0100
@@ -63,5 +63,7 @@
     #endif( BACKGROUND_INTERFACE_FILE_FOUND )
 endif( X11_FOUND AND QIMAGEBLITZ_FOUND)
 
+macro_optional_add_subdirectory(kjots)
+
 # --- show log ---
 macro_display_feature_log()
diff -ur kjots-4.2.0/doc/CMakeLists.txt kjots-4.2.0-kjots-without-kdepim/doc/CMakeLists.txt
--- kjots-4.2.0/doc/CMakeLists.txt	2008-09-13 10:13:57.000000000 +0200
+++ kjots-4.2.0-kjots-without-kdepim/doc/CMakeLists.txt	2009-01-28 17:41:40.000000000 +0100
@@ -12,3 +12,5 @@
    add_subdirectory(kcontrol)
    add_subdirectory(kcharselect)
 endif (UNIX)	
+
+add_subdirectory(kjots)
diff -ur kjots-4.2.0/kjots/aboutdata.cpp kjots-4.2.0-kjots-without-kdepim/kjots/aboutdata.cpp
--- kjots-4.2.0/kjots/aboutdata.cpp	2008-06-10 13:41:22.000000000 +0200
+++ kjots-4.2.0-kjots-without-kdepim/kjots/aboutdata.cpp	2009-01-28 17:41:40.000000000 +0100
@@ -24,7 +24,8 @@
 
 #include "aboutdata.h"
 #include <klocale.h>
-#include <libkdepim/pimapplication.h>
+#include <kaboutdata.h>
+#include <kdeversion.h>
 
 AboutData::AboutData()
   : KAboutData( "kjots", 0, ki18n( "KJots" ), KDE_VERSION_STRING,
diff -ur kjots-4.2.0/kjots/CMakeLists.txt kjots-4.2.0-kjots-without-kdepim/kjots/CMakeLists.txt
--- kjots-4.2.0/kjots/CMakeLists.txt	2008-11-12 17:37:52.000000000 +0100
+++ kjots-4.2.0-kjots-without-kdepim/kjots/CMakeLists.txt	2009-01-28 17:41:40.000000000 +0100
@@ -1,7 +1,6 @@
 project(kjots)
 
 add_subdirectory( icons )
-include_directories( ${CMAKE_BINARY_DIR}/libkdepim ${CMAKE_SOURCE_DIR}/libkdepim )
 
 #########################################################################
 # Main Application SECTION
@@ -36,7 +35,7 @@
 
 kde4_add_executable(kjots ${kjots_SRCS})
 
-target_link_libraries(kjots ${KDE4_KIO_LIBS} kdepim)
+target_link_libraries(kjots ${KDE4_KIO_LIBS})
 
 install(TARGETS kjots  ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
@@ -59,7 +58,7 @@
 
 kde4_add_plugin(kjotspart ${kjotspart_PART_SRCS} ${kjots_SRCS} )
 
-target_link_libraries(kjotspart ${KDE4_KPARTS_LIBS} kdepim)
+target_link_libraries(kjotspart ${KDE4_KPARTS_LIBS})
 
 install( FILES kjotspart.desktop  DESTINATION ${SERVICES_INSTALL_DIR} )
 install( FILES kjotspartui.rc  DESTINATION ${DATA_INSTALL_DIR}/kjots)
diff -ur kjots-4.2.0/kjots/main.cpp kjots-4.2.0-kjots-without-kdepim/kjots/main.cpp
--- kjots-4.2.0/kjots/main.cpp	2008-06-10 13:41:22.000000000 +0200
+++ kjots-4.2.0-kjots-without-kdepim/kjots/main.cpp	2009-01-28 17:41:40.000000000 +0100
@@ -28,7 +28,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <libkdepim/pimapplication.h>
+#include <kuniqueapplication.h>
 #include <kcmdlineargs.h>
 #include <kconfig.h>
 #include <klocale.h>
@@ -39,14 +39,14 @@
 {
     AboutData aboutData;
     KCmdLineArgs::init(argc, argv, &aboutData);
-    KPIM::PimApplication::addCmdLineOptions();
+    KUniqueApplication::addCmdLineOptions();
 
-    if (!KPIM::PimApplication::start()) {
+    if (!KUniqueApplication::start()) {
         fprintf(stderr, "kjots is already running!\n");
         exit(0);
     }
 
-    KPIM::PimApplication a;
+    KUniqueApplication a;
 
     // backwards compatibility code to convert "old" user font settings
     // to the new config settings


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-9/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore	9 Jan 2009 04:51:12 -0000	1.53
+++ .cvsignore	28 Jan 2009 16:52:13 -0000	1.54
@@ -1,2 +1,2 @@
-kdeutils-4.1.4.tar.bz2
-kdepim-4.1.4.tar.bz2
+kdeutils-4.2.0.tar.bz2
+kdepim-4.2.0.tar.bz2


Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-9/kdeutils.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- kdeutils.spec	28 Jan 2009 16:16:49 -0000	1.135
+++ kdeutils.spec	28 Jan 2009 16:52:13 -0000	1.136
@@ -21,7 +21,7 @@
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 %if 0%{?include_kjots}
 Source1:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdepim-%{version}.tar.bz2
-Patch0:         kdeutils-4.0.99-kjots-without-kdepim.patch
+Patch0:         kdeutils-4.2.0-kjots-without-kdepim.patch
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/F-9/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	28 Jan 2009 16:16:49 -0000	1.60
+++ sources	28 Jan 2009 16:52:13 -0000	1.61
@@ -1,2 +1,2 @@
 f0ca24c7d3e5bb0ab55bf6b26fc6224e  kdeutils-4.2.0.tar.bz2
-297ffe93343bc0dd62c7d90feae0ee6c  kdepim-4.1.4.tar.bz2
+a80631de21930b2544c86722138aaa6c  kdepim-4.2.0.tar.bz2


--- kdeutils-4.0.99-kjots-without-kdepim.patch DELETED ---