rpms/libopensync-plugin-kdepim/devel libopensync-plugin-kdepim-0.36-kde4.patch, 1.1, 1.2 libopensync-plugin-kdepim.spec, 1.12, 1.13

Kevin Kofler (kkofler) fedora-extras-commits at redhat.com
Sat Jun 7 11:56:51 UTC 2008


Author: kkofler

Update of /cvs/pkgs/rpms/libopensync-plugin-kdepim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14939/devel

Modified Files:
	libopensync-plugin-kdepim-0.36-kde4.patch 
	libopensync-plugin-kdepim.spec 
Log Message:
Complete patch (need diff -Nur, not just -ur).
BR kdepimlibs-devel for KDE 4.

libopensync-plugin-kdepim-0.36-kde4.patch:

Index: libopensync-plugin-kdepim-0.36-kde4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-kdepim/devel/libopensync-plugin-kdepim-0.36-kde4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libopensync-plugin-kdepim-0.36-kde4.patch	7 Jun 2008 11:37:45 -0000	1.1
+++ libopensync-plugin-kdepim-0.36-kde4.patch	7 Jun 2008 11:55:46 -0000	1.2
@@ -1,4 +1,4 @@
-diff -ur libopensync-plugin-kdepim-0.36/AUTHORS libopensync-plugin-kdepim-0.36-kde4/AUTHORS
+diff -Nur libopensync-plugin-kdepim-0.36/AUTHORS libopensync-plugin-kdepim-0.36-kde4/AUTHORS
 --- libopensync-plugin-kdepim-0.36/AUTHORS	2008-01-26 18:03:04.000000000 +0100
 +++ libopensync-plugin-kdepim-0.36-kde4/AUTHORS	2008-03-07 21:22:20.000000000 +0100
 @@ -1,2 +1,4 @@
@@ -6,9 +6,7 @@
  Eduardo Pereira Habkost <ehabkost at conectiva.com.br>
 +
 +Thomas Gillespie <tomjamesgillespie at googlemail.com>
-Nur in libopensync-plugin-kdepim-0.36/cmake/modules: cmake_uninstall.cmake.in.
-Nur in libopensync-plugin-kdepim-0.36-kde4/cmake/modules: FindKDE4.cmake.
-diff -ur libopensync-plugin-kdepim-0.36/CMakeLists.txt libopensync-plugin-kdepim-0.36-kde4/CMakeLists.txt
+diff -Nur libopensync-plugin-kdepim-0.36/CMakeLists.txt libopensync-plugin-kdepim-0.36-kde4/CMakeLists.txt
 --- libopensync-plugin-kdepim-0.36/CMakeLists.txt	2008-01-26 18:03:04.000000000 +0100
 +++ libopensync-plugin-kdepim-0.36-kde4/CMakeLists.txt	2008-03-07 21:22:20.000000000 +0100
 @@ -7,12 +7,16 @@
@@ -31,7 +29,97 @@
 + 
  OPENSYNC_PACKAGE( ${PROJECT_NAME} ${VERSION} )
  
-diff -ur libopensync-plugin-kdepim-0.36/src/CMakeLists.txt libopensync-plugin-kdepim-0.36-kde4/src/CMakeLists.txt
+diff -Nur libopensync-plugin-kdepim-0.36/cmake/modules/FindKDE4.cmake libopensync-plugin-kdepim-0.36-kde4/cmake/modules/FindKDE4.cmake
+--- libopensync-plugin-kdepim-0.36/cmake/modules/FindKDE4.cmake	1970-01-01 01:00:00.000000000 +0100
++++ libopensync-plugin-kdepim-0.36-kde4/cmake/modules/FindKDE4.cmake	2008-03-07 21:22:20.000000000 +0100
+@@ -0,0 +1,61 @@
++# Find KDE4 and provide all necessary variables and macros to compile software for it.
++# It looks for KDE 4 in the following directories in the given order:
++#  CMAKE_INSTALL_PREFIX
++#  KDEDIRS
++#  /opt/kde4
++#
++# Please look in FindKDE4Internal.cmake and KDE4Macros.cmake for more information.
++# They are installed with the KDE 4 libraries in $KDEDIRS/share/apps/cmake/modules/.
++#
++# Author: Alexander Neundorf <neundorf at kde.org>
++
++FILE(TO_CMAKE_PATH "$ENV{KDEDIRS}" _KDEDIRS)
++
++# For KDE4 kde-config has been renamed to kde4-config
++FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config
++   PATH_SUFFIXES bin               # the suffix is for the paths coming from KDEDIRS
++   PATHS
++   ${CMAKE_INSTALL_PREFIX}/bin
++   ${_KDEDIRS}
++   /opt/kde4/bin
++   NO_DEFAULT_PATH
++   )
++
++FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config )
++
++IF (KDE4_KDECONFIG_EXECUTABLE)
++   # then ask kde4-config for the kde data dirs
++   EXECUTE_PROCESS(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
++
++   FILE(TO_CMAKE_PATH "${_data_DIR}" _data_DIR)
++
++   # then check the data dirs for FindKDE4Internal.cmake
++   FIND_PATH(KDE4_DATA_DIR cmake/modules/FindKDE4Internal.cmake ${_data_DIR})
++
++   # if it has been found...
++   IF (KDE4_DATA_DIR)
++
++      SET(CMAKE_MODULE_PATH  ${CMAKE_MODULE_PATH} ${KDE4_DATA_DIR}/cmake/modules)
++
++      IF (KDE4_FIND_QUIETLY)
++         SET(_quiet QUIET)
++      ENDIF (KDE4_FIND_QUIETLY)
++
++      IF (KDE4_FIND_REQUIRED)
++         SET(_req REQUIRED)
++      ENDIF (KDE4_FIND_REQUIRED)
++
++      # use FindKDE4Internal.cmake to do the rest
++      FIND_PACKAGE(KDE4Internal ${_req} ${_quiet})
++   ELSE (KDE4_DATA_DIR)
++      IF (KDE4_FIND_REQUIRED)
++         MESSAGE(FATAL_ERROR "ERROR: cmake/modules/FindKDE4Internal.cmake not found in ${_data_DIR}")
++      ENDIF (KDE4_FIND_REQUIRED)
++   ENDIF (KDE4_DATA_DIR)
++
++ELSE (KDE4_KDECONFIG_EXECUTABLE)
++   IF (KDE4_FIND_REQUIRED)
++      MESSAGE(FATAL_ERROR "ERROR: Could not find KDE4 kde4-config")
++   ENDIF (KDE4_FIND_REQUIRED)
++ENDIF (KDE4_KDECONFIG_EXECUTABLE)
++
+diff -Nur libopensync-plugin-kdepim-0.36/cmake/modules/cmake_uninstall.cmake.in libopensync-plugin-kdepim-0.36-kde4/cmake/modules/cmake_uninstall.cmake.in
+--- libopensync-plugin-kdepim-0.36/cmake/modules/cmake_uninstall.cmake.in	2008-01-26 18:03:04.000000000 +0100
++++ libopensync-plugin-kdepim-0.36-kde4/cmake/modules/cmake_uninstall.cmake.in	1970-01-01 01:00:00.000000000 +0100
+@@ -1,21 +0,0 @@
+-IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+-	MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
+-ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+-
+-FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+-STRING(REGEX REPLACE "\n" ";" files "${files}")
+-FOREACH(file ${files})
+-	MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
+-	IF(EXISTS "$ENV{DESTDIR}${file}")
+-		EXEC_PROGRAM(
+-			"@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+-			OUTPUT_VARIABLE rm_out
+-			RETURN_VALUE rm_retval
+-		)
+-		IF(NOT "${rm_retval}" STREQUAL 0)
+-			MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
+-		ENDIF(NOT "${rm_retval}" STREQUAL 0)
+-	ELSE(EXISTS "$ENV{DESTDIR}${file}")
+-		MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+-	ENDIF(EXISTS "$ENV{DESTDIR}${file}")
+-ENDFOREACH(file)
+diff -Nur libopensync-plugin-kdepim-0.36/src/CMakeLists.txt libopensync-plugin-kdepim-0.36-kde4/src/CMakeLists.txt
 --- libopensync-plugin-kdepim-0.36/src/CMakeLists.txt	2008-01-26 18:03:04.000000000 +0100
 +++ libopensync-plugin-kdepim-0.36-kde4/src/CMakeLists.txt	2008-03-08 20:24:46.000000000 +0100
 @@ -1,5 +1,5 @@
@@ -72,7 +160,135 @@
  
  # Install plugins
  OPENSYNC_PLUGIN_INSTALL( kdepim-sync )
-diff -ur libopensync-plugin-kdepim-0.36/src/datasource.cpp libopensync-plugin-kdepim-0.36-kde4/src/datasource.cpp
+diff -Nur libopensync-plugin-kdepim-0.36/src/KNotesIface.h libopensync-plugin-kdepim-0.36-kde4/src/KNotesIface.h
+--- libopensync-plugin-kdepim-0.36/src/KNotesIface.h	2008-01-26 18:03:04.000000000 +0100
++++ libopensync-plugin-kdepim-0.36-kde4/src/KNotesIface.h	2008-03-07 21:22:20.000000000 +0100
+@@ -25,9 +25,9 @@
+ #include <qstring.h>
+ #include <qmap.h>
+ 
+-#include <dcopobject.h>
+-
++//#include <dcopobject.h>
+ 
++/*
+ class KNotesIface : virtual public DCOPObject
+ {
+ 		K_DCOP
+@@ -38,7 +38,7 @@
+ 		 *        KNotes will choose an appropriate name
+ 		 * @param text the body of the new note
+ 		 * @return the new notes' id
+-		 */
++		 * /
+ 		virtual QString newNote( const QString& name = QString::null,
+ 		                         const QString& text = QString::null ) = 0;
+ 
+@@ -49,72 +49,72 @@
+ 		 * @param name the name (title) of the new note, if it is empty,
+ 		 *        KNotes will choose an appropriate name
+ 		 * @return the new notes' id
+-		 */
++		 * /
+ 		virtual QString newNoteFromClipboard( const QString& name = QString::null ) = 0;
+ 
+ 		/**
+ 		 * Show a note as if it had been selected from the "notes" menu.
+ 		 * @param noteId the id of the note to show
+-		 */
++		 * /
+ 		virtual ASYNC showNote( const QString& noteId ) const = 0;
+ 
+ 		/**
+ 		 * Hide a note.
+ 		 * @param noteId the id of the note to hide
+-		 */
++		 * /
+ 		virtual ASYNC hideNote( const QString& noteId ) const = 0;
+ 
+ 		/**
+ 		 * Deletes a note forever.
+ 		 * @param noteId the id of the note to kill
+-		 */
++		 * /
+ 		virtual ASYNC killNote( const QString& noteId ) = 0;
+ 
+ 		/**
+ 		 * Deletes a note forever.
+ 		 * @param noteId the id of the note to kill
+ 		 * @param force do not request confirmation
+-		 */
++		 * /
+ 		virtual ASYNC killNote( const QString& noteId, bool force ) = 0;
+ 
+ 		/**
+ 		 * Get all the notes including their ids.
+ 		 * @return a QMap that maps the id of a note to its name
+-		 */
++		 * /
+ 		virtual QMap<QString,QString> notes() const = 0;
+ 
+ 		/**
+ 		 * Changes the title/name of a note.
+ 		 * @param noteId the id of the note to be modified
+ 		 * @param newName the new title
+-		 */
++		 * /
+ 		virtual ASYNC setName( const QString& noteId, const QString& newName ) = 0;
+ 
+ 		/**
+ 		 * Sets the text of a note. This will delete the old text!
+ 		 * @param noteId the id of the note
+ 		 * @param newText the new text for the note
+-		 */
++		 * /
+ 		virtual ASYNC setText( const QString& noteId, const QString& newText ) = 0;
+ 
+ 		/**
+ 		 * Returns the title/name of a note.
+ 		 * @param noteId the id of the note in question
+ 		 * @return the name as a QString
+-		 */
++		 * /
+ 		virtual QString name( const QString& noteId ) const = 0;
+ 
+ 		/**
+ 		 * Returns the text of a note.
+ 		 * @param noteId the id of the note in question
+ 		 * @return the body as a QString
+-		 */
++		 * /
+ 		virtual QString text( const QString& noteId ) const = 0;
+ 
+ 		/**
+ 		 * This tells KNotes that a specific app has synchronized with all the notes.
+ 		 * @param app the app that has synced with KNotes
+-		 */
++		 * /
+ 		virtual ASYNC sync( const QString& app ) = 0;
+ 
+ 		/**
+@@ -123,7 +123,7 @@
+ 		 * @param noteId the id of the note
+ 		 * @return true if the note is new, false if not or if the note does
+ 		 *         not exist
+-		 */
++		 * /
+ 		virtual bool isNew( const QString& app, const QString& noteId ) const = 0;
+ 
+ 		/**
+@@ -132,8 +132,8 @@
+ 		 * @param noteId the id of the note
+ 		 * @return true if modified (note that this will return true if the note is
+ 		 *         new as well!) and false if the note is not modified or doesn't exist
+-		 */
++		 * /
+ 		virtual bool isModified( const QString& app, const QString& noteId ) const = 0;
+ };
+-
++*/
+ #endif
+diff -Nur libopensync-plugin-kdepim-0.36/src/datasource.cpp libopensync-plugin-kdepim-0.36-kde4/src/datasource.cpp
 --- libopensync-plugin-kdepim-0.36/src/datasource.cpp	2008-01-26 18:03:04.000000000 +0100
 +++ libopensync-plugin-kdepim-0.36-kde4/src/datasource.cpp	2008-03-07 21:22:20.000000000 +0100
 @@ -87,7 +87,7 @@
@@ -135,7 +351,7 @@
  	}
  
  	osync_trace(TRACE_EXIT, "%s", __PRETTY_FUNCTION__);
-diff -ur libopensync-plugin-kdepim-0.36/src/kaddrbook.cpp libopensync-plugin-kdepim-0.36-kde4/src/kaddrbook.cpp
+diff -Nur libopensync-plugin-kdepim-0.36/src/kaddrbook.cpp libopensync-plugin-kdepim-0.36-kde4/src/kaddrbook.cpp
 --- libopensync-plugin-kdepim-0.36/src/kaddrbook.cpp	2008-01-26 18:03:04.000000000 +0100
 +++ libopensync-plugin-kdepim-0.36-kde4/src/kaddrbook.cpp	2008-03-07 21:22:20.000000000 +0100
 @@ -28,8 +28,8 @@
@@ -213,7 +429,7 @@
  
  	osync_context_report_success(ctx);
  	osync_trace(TRACE_EXIT, "%s", __PRETTY_FUNCTION__);
-diff -ur libopensync-plugin-kdepim-0.36/src/kcal.cpp libopensync-plugin-kdepim-0.36-kde4/src/kcal.cpp
+diff -Nur libopensync-plugin-kdepim-0.36/src/kcal.cpp libopensync-plugin-kdepim-0.36-kde4/src/kcal.cpp
 --- libopensync-plugin-kdepim-0.36/src/kcal.cpp	2008-01-26 18:03:04.000000000 +0100
 +++ libopensync-plugin-kdepim-0.36-kde4/src/kcal.cpp	2008-03-07 21:22:20.000000000 +0100
 @@ -28,7 +28,7 @@
@@ -281,7 +497,7 @@
  				calendar->addIncidence(e);
  			}
  			break;
-diff -ur libopensync-plugin-kdepim-0.36/src/kcal.h libopensync-plugin-kdepim-0.36-kde4/src/kcal.h
+diff -Nur libopensync-plugin-kdepim-0.36/src/kcal.h libopensync-plugin-kdepim-0.36-kde4/src/kcal.h
 --- libopensync-plugin-kdepim-0.36/src/kcal.h	2008-01-26 18:03:04.000000000 +0100
 +++ libopensync-plugin-kdepim-0.36-kde4/src/kcal.h	2008-03-07 21:22:20.000000000 +0100
 @@ -24,10 +24,10 @@
@@ -299,7 +515,7 @@
  #include <kdeversion.h>
  
  #include "osyncbase.h"
-diff -ur libopensync-plugin-kdepim-0.36/src/kdepim_impl.cpp libopensync-plugin-kdepim-0.36-kde4/src/kdepim_impl.cpp
+diff -Nur libopensync-plugin-kdepim-0.36/src/kdepim_impl.cpp libopensync-plugin-kdepim-0.36-kde4/src/kdepim_impl.cpp
 --- libopensync-plugin-kdepim-0.36/src/kdepim_impl.cpp	2008-01-26 18:03:04.000000000 +0100
 +++ libopensync-plugin-kdepim-0.36-kde4/src/kdepim_impl.cpp	2008-03-08 20:24:46.000000000 +0100
 @@ -25,14 +25,14 @@
@@ -401,7 +617,7 @@
  		KdePluginImplementation *imp = new KdePluginImplementation();
  		if (!imp->initialize(plugin, info, error)) {
  			delete imp;
-diff -ur libopensync-plugin-kdepim-0.36/src/kdepim_sync.cpp libopensync-plugin-kdepim-0.36-kde4/src/kdepim_sync.cpp
+diff -Nur libopensync-plugin-kdepim-0.36/src/kdepim_sync.cpp libopensync-plugin-kdepim-0.36-kde4/src/kdepim_sync.cpp
 --- libopensync-plugin-kdepim-0.36/src/kdepim_sync.cpp	2008-01-26 18:03:04.000000000 +0100
 +++ libopensync-plugin-kdepim-0.36-kde4/src/kdepim_sync.cpp	2008-03-08 20:24:46.000000000 +0100
 @@ -98,7 +98,7 @@
@@ -422,7 +638,7 @@
  {
  	return 1;
  }
-diff -ur libopensync-plugin-kdepim-0.36/src/knotes.cpp libopensync-plugin-kdepim-0.36-kde4/src/knotes.cpp
+diff -Nur libopensync-plugin-kdepim-0.36/src/knotes.cpp libopensync-plugin-kdepim-0.36-kde4/src/knotes.cpp
 --- libopensync-plugin-kdepim-0.36/src/knotes.cpp	2008-01-26 18:03:04.000000000 +0100
 +++ libopensync-plugin-kdepim-0.36-kde4/src/knotes.cpp	2008-03-07 21:22:20.000000000 +0100
 @@ -31,8 +31,10 @@
@@ -477,8 +693,8 @@
  	osync_trace(TRACE_EXIT, "%s", __func__);
  }
 +*/
-\ Kein Zeilenumbruch am Dateiende.
-diff -ur libopensync-plugin-kdepim-0.36/src/knotes.h libopensync-plugin-kdepim-0.36-kde4/src/knotes.h
+\ No newline at end of file
+diff -Nur libopensync-plugin-kdepim-0.36/src/knotes.h libopensync-plugin-kdepim-0.36-kde4/src/knotes.h
 --- libopensync-plugin-kdepim-0.36/src/knotes.h	2008-01-26 18:03:04.000000000 +0100
 +++ libopensync-plugin-kdepim-0.36-kde4/src/knotes.h	2008-03-07 21:22:20.000000000 +0100
 @@ -33,10 +33,10 @@
@@ -517,132 +733,4 @@
  		virtual void commit(OSyncPluginInfo *info, OSyncContext *ctx, OSyncChange *chg);
  };
 +*/
-\ Kein Zeilenumbruch am Dateiende.
-diff -ur libopensync-plugin-kdepim-0.36/src/KNotesIface.h libopensync-plugin-kdepim-0.36-kde4/src/KNotesIface.h
---- libopensync-plugin-kdepim-0.36/src/KNotesIface.h	2008-01-26 18:03:04.000000000 +0100
-+++ libopensync-plugin-kdepim-0.36-kde4/src/KNotesIface.h	2008-03-07 21:22:20.000000000 +0100
-@@ -25,9 +25,9 @@
- #include <qstring.h>
- #include <qmap.h>
- 
--#include <dcopobject.h>
--
-+//#include <dcopobject.h>
- 
-+/*
- class KNotesIface : virtual public DCOPObject
- {
- 		K_DCOP
-@@ -38,7 +38,7 @@
- 		 *        KNotes will choose an appropriate name
- 		 * @param text the body of the new note
- 		 * @return the new notes' id
--		 */
-+		 * /
- 		virtual QString newNote( const QString& name = QString::null,
- 		                         const QString& text = QString::null ) = 0;
- 
-@@ -49,72 +49,72 @@
- 		 * @param name the name (title) of the new note, if it is empty,
- 		 *        KNotes will choose an appropriate name
- 		 * @return the new notes' id
--		 */
-+		 * /
- 		virtual QString newNoteFromClipboard( const QString& name = QString::null ) = 0;
- 
- 		/**
- 		 * Show a note as if it had been selected from the "notes" menu.
- 		 * @param noteId the id of the note to show
--		 */
-+		 * /
- 		virtual ASYNC showNote( const QString& noteId ) const = 0;
- 
- 		/**
- 		 * Hide a note.
- 		 * @param noteId the id of the note to hide
--		 */
-+		 * /
- 		virtual ASYNC hideNote( const QString& noteId ) const = 0;
- 
- 		/**
- 		 * Deletes a note forever.
- 		 * @param noteId the id of the note to kill
--		 */
-+		 * /
- 		virtual ASYNC killNote( const QString& noteId ) = 0;
- 
- 		/**
- 		 * Deletes a note forever.
- 		 * @param noteId the id of the note to kill
- 		 * @param force do not request confirmation
--		 */
-+		 * /
- 		virtual ASYNC killNote( const QString& noteId, bool force ) = 0;
- 
- 		/**
- 		 * Get all the notes including their ids.
- 		 * @return a QMap that maps the id of a note to its name
--		 */
-+		 * /
- 		virtual QMap<QString,QString> notes() const = 0;
- 
- 		/**
- 		 * Changes the title/name of a note.
- 		 * @param noteId the id of the note to be modified
- 		 * @param newName the new title
--		 */
-+		 * /
- 		virtual ASYNC setName( const QString& noteId, const QString& newName ) = 0;
- 
- 		/**
- 		 * Sets the text of a note. This will delete the old text!
- 		 * @param noteId the id of the note
- 		 * @param newText the new text for the note
--		 */
-+		 * /
- 		virtual ASYNC setText( const QString& noteId, const QString& newText ) = 0;
- 
- 		/**
- 		 * Returns the title/name of a note.
- 		 * @param noteId the id of the note in question
- 		 * @return the name as a QString
--		 */
-+		 * /
- 		virtual QString name( const QString& noteId ) const = 0;
- 
- 		/**
- 		 * Returns the text of a note.
- 		 * @param noteId the id of the note in question
- 		 * @return the body as a QString
--		 */
-+		 * /
- 		virtual QString text( const QString& noteId ) const = 0;
- 
- 		/**
- 		 * This tells KNotes that a specific app has synchronized with all the notes.
- 		 * @param app the app that has synced with KNotes
--		 */
-+		 * /
- 		virtual ASYNC sync( const QString& app ) = 0;
- 
- 		/**
-@@ -123,7 +123,7 @@
- 		 * @param noteId the id of the note
- 		 * @return true if the note is new, false if not or if the note does
- 		 *         not exist
--		 */
-+		 * /
- 		virtual bool isNew( const QString& app, const QString& noteId ) const = 0;
- 
- 		/**
-@@ -132,8 +132,8 @@
- 		 * @param noteId the id of the note
- 		 * @return true if modified (note that this will return true if the note is
- 		 *         new as well!) and false if the note is not modified or doesn't exist
--		 */
-+		 * /
- 		virtual bool isModified( const QString& app, const QString& noteId ) const = 0;
- };
--
-+*/
- #endif
+\ No newline at end of file


Index: libopensync-plugin-kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libopensync-plugin-kdepim/devel/libopensync-plugin-kdepim.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libopensync-plugin-kdepim.spec	7 Jun 2008 11:37:45 -0000	1.12
+++ libopensync-plugin-kdepim.spec	7 Jun 2008 11:55:46 -0000	1.13
@@ -1,3 +1,7 @@
+%if 0%{?fedora} > 9
+%define kdepim4 1
+%endif
+
 Name:           libopensync-plugin-kdepim
 Version:        0.36
 Release:        1%{?dist}
@@ -14,15 +18,18 @@
 BuildRequires:  cmake
 BuildRequires:  libopensync-devel >= 0.36
 BuildRequires:  libstdc++-devel
-BuildRequires:  kdepim-devel
-# BuildRequires:  kdelibs-devel (kdepim-devel already drags in the right version of this)
+%if 0%{?kdepim4}
+BuildRequires:  kdepimlibs-devel
+%else
+BuildRequires:  kdepim3-devel
+%endif
 
 %description
 %{summary}
 
 %prep
 %setup -q
-%if 0%{?fedora} > 9
+%if 0%{?kdepim4}
 %patch0 -p1 -b .kdepim4
 %endif
 




More information about the fedora-extras-commits mailing list