rpms/kdesvn/FC-5 kdesvn-0.9.2-lib64.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 kdesvn.spec, 1.15, 1.16 sources, 1.9, 1.10 kdesvn-0.7.1-x.patch, 1.3, NONE
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Fri Sep 1 15:41:14 UTC 2006
Author: orion
Update of /cvs/extras/rpms/kdesvn/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14091
Modified Files:
.cvsignore kdesvn.spec sources
Added Files:
kdesvn-0.9.2-lib64.patch
Removed Files:
kdesvn-0.7.1-x.patch
Log Message:
- Update to 0.9.2, uses cmake
- Add patch from Rajko Albrecht to fix lib64 installs
- Drop old X patch
kdesvn-0.9.2-lib64.patch:
--- NEW FILE kdesvn-0.9.2-lib64.patch ---
Index: src/kdesvnd/kdesvnd_dcop.cpp
===================================================================
--- src/kdesvnd/kdesvnd_dcop.cpp (.../tags/rel_0_9_2) (Revision 962)
+++ src/kdesvnd/kdesvnd_dcop.cpp (.../branches/rel_0_9) (Revision 962)
@@ -24,11 +24,11 @@
#include "src/ksvnwidgets/ssltrustprompt_impl.h"
#include "src/ksvnwidgets/logmsg_impl.h"
#include "src/settings/kdesvnsettings.h"
-#include "svnqt/client.hpp"
-#include "svnqt/revision.hpp"
-#include "svnqt/status.hpp"
-#include "svnqt/context_listener.hpp"
-#include "svnqt/url.hpp"
+#include "src/svnqt/client.hpp"
+#include "src/svnqt/revision.hpp"
+#include "src/svnqt/status.hpp"
+#include "src/svnqt/context_listener.hpp"
+#include "src/svnqt/url.hpp"
#include "helpers/ktranslateurl.h"
#include <kdebug.h>
Index: src/kdesvnd/CMakeLists.txt
===================================================================
--- src/kdesvnd/CMakeLists.txt (.../tags/rel_0_9_2) (Revision 962)
+++ src/kdesvnd/CMakeLists.txt (.../branches/rel_0_9) (Revision 962)
@@ -8,7 +8,7 @@
KDE3_ADD_KPART(kded_kdesvnd ${kded_kdesvnd_src})
-TARGET_LINK_LIBRARIES(kded_kdesvnd
+TARGET_LINK_LIBRARIES(kded_kdesvnd
svnqt
ksvnwidgets
kdesvnhelpers
@@ -20,8 +20,8 @@
LINK_FLAGS "${APR_EXTRA_LIBFLAGS} ${APU_EXTRA_LIBFLAGS} -avoid-version -module")
INSTALL(TARGETS kded_kdesvnd
- RUNTIME DESTINATION ${KDE3_BINDIR}
- LIBRARY DESTINATION lib/kde3)
+ RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+ LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
KDESVN_GENERATE_LIBTOOL_FILE(kded_kdesvnd)
@@ -39,11 +39,11 @@
SET(ACTION_MENU "Actions=Update;Commit;Add;Delete;Blame;Log;Diff;Checkout;Export;Info;Addnew;Switch;Revert;Rename;Tree")
ENDIF(VERSION_OK)
-CONFIGURE_FILE(kdesvn_subversion.desktop.in
+CONFIGURE_FILE(kdesvn_subversion.desktop.in
${CMAKE_CURRENT_BINARY_DIR}/kdesvn_subversion.desktop @ONLY)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdesvn_subversion.desktop
- DESTINATION ${KDE3_APPSDIR}/konqueror/servicemenus)
+ DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/kdesvnd.desktop
- DESTINATION ${KDE3_SERVICESDIR}/kded)
+ DESTINATION ${SERVICES_INSTALL_DIR}/kded)
Index: src/settings/CMakeLists.txt
===================================================================
--- src/settings/CMakeLists.txt (.../tags/rel_0_9_2) (Revision 962)
+++ src/settings/CMakeLists.txt (.../branches/rel_0_9) (Revision 962)
@@ -16,11 +16,16 @@
SET(settings_sources
dispcolorsettings_impl.cpp
displaysettings_impl.cpp
- revisiontreesettingsdlg_impl.cpp
+ revisiontreesettingsdlg_impl.cpp
subversionsettings_impl.cpp
cmdexecsettings_impl.cpp)
KDE3_AUTOMOC(${settings_sources})
ADD_LIBRARY(settingsdlgs STATIC ${settings_ui_sources} ${settings_sources})
ADD_DEPENDENCIES(settingsdlgs kdesvncfgreader)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/kdesvn_part.kcfg DESTINATION ${KDE3_DATADIR}/config.kcfg)
+
+SET_TARGET_PROPERTIES(kdesvncfgreader settingsdlgs
+ PROPERTIES
+ COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS})
+
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/kdesvn_part.kcfg DESTINATION ${KCFG_INSTALL_DIR})
Index: src/kdesvn_part.cpp
===================================================================
--- src/kdesvn_part.cpp (.../tags/rel_0_9_2) (Revision 962)
+++ src/kdesvn_part.cpp (.../branches/rel_0_9) (Revision 962)
@@ -28,8 +28,8 @@
#include "kdesvnview.h"
#include "commandline_part.h"
#include "../config.h"
-#include "svnqt/version_check.hpp"
-#include "svnqt/url.hpp"
+#include "src/svnqt/version_check.hpp"
+#include "src/svnqt/url.hpp"
#include "helpers/ktranslateurl.h"
#include <kinstance.h>
Index: src/helpers/sub2qt.cpp
===================================================================
--- src/helpers/sub2qt.cpp (.../tags/rel_0_9_2) (Revision 962)
+++ src/helpers/sub2qt.cpp (.../branches/rel_0_9) (Revision 962)
@@ -19,7 +19,7 @@
***************************************************************************/
#include "sub2qt.h"
-#include "svnqt/revision.hpp"
+#include "src/svnqt/revision.hpp"
#include "kglobal.h"
#include "klocale.h"
#include <qmap.h>
Index: src/helpers/sub2qt.h
===================================================================
--- src/helpers/sub2qt.h (.../tags/rel_0_9_2) (Revision 962)
+++ src/helpers/sub2qt.h (.../branches/rel_0_9) (Revision 962)
@@ -20,7 +20,7 @@
#ifndef HELPERSSUB2QT_H
#define HELPERSSUB2QT_H
-#include "svnqt/revision.hpp"
+#include "src/svnqt/revision.hpp"
#include <qdatetime.h>
#include <qstring.h>
#include <svn_time.h>
Index: src/helpers/CMakeLists.txt
===================================================================
--- src/helpers/CMakeLists.txt (.../tags/rel_0_9_2) (Revision 962)
+++ src/helpers/CMakeLists.txt (.../branches/rel_0_9) (Revision 962)
@@ -5,4 +5,8 @@
KDE3_AUTOMOC(${helperssrc} )
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-ADD_LIBRARY(kdesvnhelpers ${helperssrc})
+ADD_LIBRARY(kdesvnhelpers STATIC ${helperssrc})
+
+SET_TARGET_PROPERTIES(kdesvnhelpers
+ PROPERTIES
+ COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS})
Index: src/kdesvnview.cpp
===================================================================
--- src/kdesvnview.cpp (.../tags/rel_0_9_2) (Revision 962)
+++ src/kdesvnview.cpp (.../branches/rel_0_9) (Revision 962)
@@ -27,8 +27,8 @@
#include "svnfrontend/loaddmpdlg_impl.h"
#include "svnfrontend/stopdlg.h"
#include "src/settings/kdesvnsettings.h"
-#include "svnqt/url.hpp"
-#include "svnqt/repository.hpp"
+#include "src/svnqt/url.hpp"
+#include "src/svnqt/repository.hpp"
#include <qpainter.h>
#include <qlayout.h>
Index: src/svnfrontend/mergedlg_impl.cpp
===================================================================
--- src/svnfrontend/mergedlg_impl.cpp (.../tags/rel_0_9_2) (Revision 962)
+++ src/svnfrontend/mergedlg_impl.cpp (.../branches/rel_0_9) (Revision 962)
@@ -19,7 +19,7 @@
***************************************************************************/
#include "mergedlg_impl.h"
#include "rangeinput_impl.h"
-#include "svnqt/url.hpp"
+#include "src/svnqt/url.hpp"
#include <kurlrequester.h>
#include <kdialogbase.h>
Index: src/svnfrontend/cacheentry.h
===================================================================
--- src/svnfrontend/cacheentry.h (.../tags/rel_0_9_2) (Revision 962)
+++ src/svnfrontend/cacheentry.h (.../branches/rel_0_9) (Revision 962)
@@ -20,8 +20,8 @@
#ifndef HELPERSCACHEENTRY_H
#define HELPERSCACHEENTRY_H
-#include "svnqt/client.hpp"
-#include "svnqt/status.hpp"
+#include "src/svnqt/client.hpp"
+#include "src/svnqt/status.hpp"
// std::map 'cause QMap isn't usable
#include <map>
Index: src/svnfrontend/svnlogdlgimp.h
===================================================================
--- src/svnfrontend/svnlogdlgimp.h (.../tags/rel_0_9_2) (Revision 962)
+++ src/svnfrontend/svnlogdlgimp.h (.../branches/rel_0_9) (Revision 962)
@@ -21,8 +21,8 @@
#define SVNLOGDLGIMP_H
#include "svnlogdlg.h"
-#include "svnqt/log_entry.hpp"
-#include "svnqt/client.hpp"
+#include "src/svnqt/log_entry.hpp"
+#include "src/svnqt/client.hpp"
#include <qsize.h>
Index: src/svnfrontend/kdesvnfilelist.cpp
===================================================================
--- src/svnfrontend/kdesvnfilelist.cpp (.../tags/rel_0_9_2) (Revision 962)
+++ src/svnfrontend/kdesvnfilelist.cpp (.../branches/rel_0_9) (Revision 962)
@@ -30,11 +30,11 @@
#include "opencontextmenu.h"
#include "checkoutinfo_impl.h"
#include "src/settings/kdesvnsettings.h"
-#include "svnqt/revision.hpp"
-#include "svnqt/dirent.hpp"
-#include "svnqt/client.hpp"
-#include "svnqt/status.hpp"
-#include "svnqt/url.hpp"
+#include "src/svnqt/revision.hpp"
+#include "src/svnqt/dirent.hpp"
+#include "src/svnqt/client.hpp"
+#include "src/svnqt/status.hpp"
+#include "src/svnqt/url.hpp"
#include "helpers/sshagent.h"
#include "helpers/sub2qt.h"
Index: src/svnfrontend/svnactions.h
===================================================================
--- src/svnfrontend/svnactions.h (.../tags/rel_0_9_2) (Revision 962)
+++ src/svnfrontend/svnactions.h (.../branches/rel_0_9) (Revision 962)
@@ -20,8 +20,8 @@
#ifndef SVNACTIONS_H
#define SVNACTIONS_H
-#include "svnqt/client.hpp"
-#include "svnqt/revision.hpp"
+#include "src/svnqt/client.hpp"
+#include "src/svnqt/revision.hpp"
#include "helpers/smart_pointer.h"
#include <kurl.h>
Index: src/svnfrontend/ccontextlistener.h
===================================================================
--- src/svnfrontend/ccontextlistener.h (.../tags/rel_0_9_2) (Revision 962)
+++ src/svnfrontend/ccontextlistener.h (.../branches/rel_0_9) (Revision 962)
@@ -20,7 +20,7 @@
#ifndef CCONTEXTLISTENER_H
#define CCONTEXTLISTENER_H
-#include "svnqt/context_listener.hpp"
+#include "src/svnqt/context_listener.hpp"
#include "helpers/smart_pointer.h"
#include <qobject.h>
Index: src/svnfrontend/svnlogdlgimp.cpp
===================================================================
--- src/svnfrontend/svnlogdlgimp.cpp (.../tags/rel_0_9_2) (Revision 962)
+++ src/svnfrontend/svnlogdlgimp.cpp (.../branches/rel_0_9) (Revision 962)
@@ -19,7 +19,7 @@
***************************************************************************/
#include "svnlogdlgimp.h"
#include "src/settings/kdesvnsettings.h"
-#include "svnqt/log_entry.hpp"
+#include "src/svnqt/log_entry.hpp"
#include "helpers/sub2qt.h"
#include "svnactions.h"
Index: src/svnfrontend/svnactions.cpp
===================================================================
--- src/svnfrontend/svnactions.cpp (.../tags/rel_0_9_2) (Revision 962)
+++ src/svnfrontend/svnactions.cpp (.../branches/rel_0_9) (Revision 962)
@@ -30,14 +30,14 @@
#include "src/ksvnwidgets/logmsg_impl.h"
#include "graphtree/revisiontree.h"
#include "src/settings/kdesvnsettings.h"
-#include "svnqt/client.hpp"
-#include "svnqt/annotate_line.hpp"
-#include "svnqt/context_listener.hpp"
-#include "svnqt/dirent.hpp"
-#include "svnqt/targets.hpp"
-#include "svnqt/url.hpp"
-#include "svnqt/wc.hpp"
-#include "svnqt/svnqt_defines.hpp"
+#include "src/svnqt/client.hpp"
+#include "src/svnqt/annotate_line.hpp"
+#include "src/svnqt/context_listener.hpp"
+#include "src/svnqt/dirent.hpp"
+#include "src/svnqt/targets.hpp"
+#include "src/svnqt/url.hpp"
+#include "src/svnqt/wc.hpp"
+#include "src/svnqt/svnqt_defines.hpp"
#include "helpers/sub2qt.h"
#include "svnfrontend/fronthelpers/oimagescrollview.h"
#include "cacheentry.h"
Index: src/svnfrontend/propertiesdlg.h
===================================================================
--- src/svnfrontend/propertiesdlg.h (.../tags/rel_0_9_2) (Revision 962)
+++ src/svnfrontend/propertiesdlg.h (.../branches/rel_0_9) (Revision 962)
@@ -16,7 +16,7 @@
#include <qmap.h>
#include <qstring.h>
-#include "svnqt/revision.hpp"
+#include "src/svnqt/revision.hpp"
class QVBoxLayout;
class QHBoxLayout;
Index: src/svnfrontend/svnitem.h
===================================================================
--- src/svnfrontend/svnitem.h (.../tags/rel_0_9_2) (Revision 962)
+++ src/svnfrontend/svnitem.h (.../branches/rel_0_9) (Revision 962)
@@ -22,7 +22,7 @@
#define __SVN_ITEM_H
#include "helpers/smart_pointer.h"
-#include "svnqt/status.hpp"
+#include "src/svnqt/status.hpp"
#include <kmimetype.h>
#include <qstring.h>
#include <qdatetime.h>
Index: src/svnfrontend/filelistviewitem.h
===================================================================
--- src/svnfrontend/filelistviewitem.h (.../tags/rel_0_9_2) (Revision 962)
+++ src/svnfrontend/filelistviewitem.h (.../branches/rel_0_9) (Revision 962)
@@ -24,7 +24,7 @@
#include <klistview.h>
#include <qdatetime.h>
#include <qptrlist.h>
-#include "svnqt/status.hpp"
+#include "src/svnqt/status.hpp"
class QPainter;
class KFileItem;
Index: src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp
===================================================================
--- src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp (.../tags/rel_0_9_2) (Revision 962)
+++ src/svnfrontend/fronthelpers/checkoutinfo_impl.cpp (.../branches/rel_0_9) (Revision 962)
@@ -19,7 +19,7 @@
***************************************************************************/
#include "checkoutinfo_impl.h"
#include "rangeinput_impl.h"
-#include "svnqt/url.hpp"
+#include "src/svnqt/url.hpp"
#include <kurlrequester.h>
#include <qlabel.h>
#include <klineedit.h>
Index: src/svnfrontend/fronthelpers/rangeinput_impl.h
===================================================================
--- src/svnfrontend/fronthelpers/rangeinput_impl.h (.../tags/rel_0_9_2) (Revision 962)
+++ src/svnfrontend/fronthelpers/rangeinput_impl.h (.../branches/rel_0_9) (Revision 962)
@@ -21,7 +21,7 @@
#define RANGEINPUT_IMPL_H
#include "rangeinput.h"
-#include "svnqt/revision.hpp"
+#include "src/svnqt/revision.hpp"
#include <qpair.h>
class Rangeinput_impl: public RangeInputDlg {
Index: src/svnfrontend/fronthelpers/checkoutinfo_impl.h
===================================================================
--- src/svnfrontend/fronthelpers/checkoutinfo_impl.h (.../tags/rel_0_9_2) (Revision 962)
+++ src/svnfrontend/fronthelpers/checkoutinfo_impl.h (.../branches/rel_0_9) (Revision 962)
@@ -21,7 +21,7 @@
#define CHECKOUTINFO_IMPL_H
#include "checkoutinfo.h"
-#include "svnqt/revision.hpp"
+#include "src/svnqt/revision.hpp"
#include "kurl.h"
class CheckoutInfo_impl: public CheckoutInfo {
Index: src/svnfrontend/kdesvnfilelist.h
===================================================================
--- src/svnfrontend/kdesvnfilelist.h (.../tags/rel_0_9_2) (Revision 962)
+++ src/svnfrontend/kdesvnfilelist.h (.../branches/rel_0_9) (Revision 962)
@@ -22,8 +22,8 @@
#include "itemdisplay.h"
#include "filelistviewitem.h"
-#include "svnqt/status.hpp"
-#include "svnqt/client.hpp"
+#include "src/svnqt/status.hpp"
+#include "src/svnqt/client.hpp"
#include <klistview.h>
#include <kurl.h>
Index: src/svnfrontend/CMakeLists.txt
===================================================================
--- src/svnfrontend/CMakeLists.txt (.../tags/rel_0_9_2) (Revision 962)
+++ src/svnfrontend/CMakeLists.txt (.../branches/rel_0_9) (Revision 962)
@@ -55,4 +55,8 @@
KDE3_ADD_UI_FILES(frontend_ui_sources ${svnfrontendui})
ADD_LIBRARY(svnfrontend STATIC ${svnfrontendsrc} ${frontend_ui_sources})
+SET_TARGET_PROPERTIES(svnfrontend
+ PROPERTIES
+ COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS})
+
ADD_DEPENDENCIES(svnfrontend ksvnwidgets)
Index: src/svnfrontend/graphtree/revgraphview.cpp
===================================================================
--- src/svnfrontend/graphtree/revgraphview.cpp (.../tags/rel_0_9_2) (Revision 962)
+++ src/svnfrontend/graphtree/revgraphview.cpp (.../branches/rel_0_9) (Revision 962)
@@ -23,7 +23,7 @@
#include "graphtree_defines.h"
#include "src/settings/kdesvnsettings.h"
#include "../stopdlg.h"
-#include "svnqt/client.hpp"
+#include "src/svnqt/client.hpp"
#include <kapp.h>
#include <kdebug.h>
Index: src/svnfrontend/graphtree/revisiontree.cpp
===================================================================
--- src/svnfrontend/graphtree/revisiontree.cpp (.../tags/rel_0_9_2) (Revision 962)
+++ src/svnfrontend/graphtree/revisiontree.cpp (.../branches/rel_0_9) (Revision 962)
@@ -19,7 +19,7 @@
***************************************************************************/
#include "revisiontree.h"
#include "../stopdlg.h"
-#include "svnqt/log_entry.hpp"
+#include "src/svnqt/log_entry.hpp"
#include "helpers/sub2qt.h"
#include "revtreewidget.h"
#include "revgraphview.h"
Index: src/svnfrontend/graphtree/revisiontree.h
===================================================================
--- src/svnfrontend/graphtree/revisiontree.h (.../tags/rel_0_9_2) (Revision 962)
+++ src/svnfrontend/graphtree/revisiontree.h (.../branches/rel_0_9) (Revision 962)
@@ -20,9 +20,9 @@
#ifndef REVISIONTREE_H
#define REVISIONTREE_H
-#include "svnqt/log_entry.hpp"
-#include "svnqt/revision.hpp"
-#include "svnqt/client.hpp"
+#include "src/svnqt/log_entry.hpp"
+#include "src/svnqt/revision.hpp"
+#include "src/svnqt/client.hpp"
#include <qstring.h>
#include <qmap.h>
Index: src/svnfrontend/modifiedthread.h
===================================================================
--- src/svnfrontend/modifiedthread.h (.../tags/rel_0_9_2) (Revision 962)
+++ src/svnfrontend/modifiedthread.h (.../branches/rel_0_9) (Revision 962)
@@ -1,9 +1,9 @@
#ifndef _MODIFIED_THREAD_H
#define _MODIFIED_THREAD_H
-#include "svnqt/client.hpp"
-#include "svnqt/revision.hpp"
-#include "svnqt/status.hpp"
+#include "src/svnqt/client.hpp"
+#include "src/svnqt/revision.hpp"
+#include "src/svnqt/status.hpp"
#include "ccontextlistener.h"
#include "eventnumbers.h"
Index: src/svnfrontend/threadcontextlistenerdata.h
===================================================================
--- src/svnfrontend/threadcontextlistenerdata.h (.../tags/rel_0_9_2) (Revision 962)
+++ src/svnfrontend/threadcontextlistenerdata.h (.../branches/rel_0_9) (Revision 962)
@@ -20,7 +20,7 @@
#ifndef THREADCONTEXTLISTENERDATA_H
#define THREADCONTEXTLISTENERDATA_H
-#include "svnqt/context_listener.hpp"
+#include "src/svnqt/context_listener.hpp"
#include <qthread.h>
#include <qstring.h>
Index: src/svnfrontend/propertiesdlg.cpp
===================================================================
--- src/svnfrontend/propertiesdlg.cpp (.../tags/rel_0_9_2) (Revision 962)
+++ src/svnfrontend/propertiesdlg.cpp (.../branches/rel_0_9) (Revision 962)
@@ -10,7 +10,7 @@
#include "propertiesdlg.h"
#include "editproperty_impl.h"
#include "svnitem.h"
-#include "svnqt/client.hpp"
+#include "src/svnqt/client.hpp"
#include <qvariant.h>
#include <qlabel.h>
Index: src/svnfrontend/commandexec.cpp
===================================================================
--- src/svnfrontend/commandexec.cpp (.../tags/rel_0_9_2) (Revision 962)
+++ src/svnfrontend/commandexec.cpp (.../branches/rel_0_9) (Revision 962)
@@ -21,13 +21,13 @@
#include "src/settings/kdesvnsettings.h"
#include "svnfrontend/svnactions.h"
#include "svnfrontend/dummydisplay.h"
-#include "svnqt/targets.hpp"
-#include "svnqt/url.hpp"
-#include "svnqt/dirent.hpp"
-#include "helpers/sub2qt.h"
-#include "helpers/ktranslateurl.h"
-#include "svnfrontend/fronthelpers/rangeinput_impl.h"
-#include "svnfrontend/copymoveview_impl.h"
+#include "src/svnqt/targets.hpp"
+#include "src/svnqt/url.hpp"
+#include "src/svnqt/dirent.hpp"
+#include "src/helpers/sub2qt.h"
+#include "src/helpers/ktranslateurl.h"
+#include "src/svnfrontend/fronthelpers/rangeinput_impl.h"
+#include "src/svnfrontend/copymoveview_impl.h"
#include <kapp.h>
#include <kglobal.h>
Index: src/svnfrontend/svnitem.cpp
===================================================================
--- src/svnfrontend/svnitem.cpp (.../tags/rel_0_9_2) (Revision 962)
+++ src/svnfrontend/svnitem.cpp (.../branches/rel_0_9) (Revision 962)
@@ -22,7 +22,7 @@
#include "svnactions.h"
#include "kdesvn_part.h"
#include "src/settings/kdesvnsettings.h"
-#include "svnqt/status.hpp"
+#include "src/svnqt/status.hpp"
#include "helpers/smart_pointer.h"
#include "helpers/sub2qt.h"
Index: src/svnfrontend/filelistviewitem.cpp
===================================================================
--- src/svnfrontend/filelistviewitem.cpp (.../tags/rel_0_9_2) (Revision 962)
+++ src/svnfrontend/filelistviewitem.cpp (.../branches/rel_0_9) (Revision 962)
@@ -21,10 +21,10 @@
#include "kdesvnfilelist.h"
#include "src/settings/kdesvnsettings.h"
#include "helpers/sub2qt.h"
-#include "svnqt/status.hpp"
-#include "svnqt/revision.hpp"
-#include "svnqt/exception.hpp"
-#include "svnqt/url.hpp"
+#include "src/svnqt/status.hpp"
+#include "src/svnqt/revision.hpp"
+#include "src/svnqt/exception.hpp"
+#include "src/svnqt/url.hpp"
#include <klocale.h>
#include <kiconloader.h>
Index: src/svnfrontend/Makefile.am
===================================================================
--- src/svnfrontend/Makefile.am (.../tags/rel_0_9_2) (Revision 962)
+++ src/svnfrontend/Makefile.am (.../branches/rel_0_9) (Revision 962)
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/svnfrontend/fronthelpers -I$(top_builddir)/src/svnfrontend/fronthelpers $(all_includes)
+INCLUDES = -I$(top_builddir)/src -I$(top_srcdir)/src -I$(top_srcdir)/src/svnfrontend/fronthelpers -I$(top_builddir)/src/svnfrontend/fronthelpers $(all_includes)
METASOURCES = AUTO
SUBDIRS = fronthelpers graphtree
Index: src/ksvnwidgets/logmsg_impl.h
===================================================================
--- src/ksvnwidgets/logmsg_impl.h (.../tags/rel_0_9_2) (Revision 962)
+++ src/ksvnwidgets/logmsg_impl.h (.../branches/rel_0_9) (Revision 962)
@@ -21,7 +21,7 @@
#define LOGMSG_IMPL_H
#include "src/ksvnwidgets/logmessage.h"
-#include "svnqt/commititem.hpp"
+#include "src/svnqt/commititem.hpp"
#include <qvaluelist.h>
#include <qpair.h>
Index: src/ksvnwidgets/CMakeLists.txt
===================================================================
--- src/ksvnwidgets/CMakeLists.txt (.../tags/rel_0_9_2) (Revision 962)
+++ src/ksvnwidgets/CMakeLists.txt (.../branches/rel_0_9) (Revision 962)
@@ -15,4 +15,8 @@
KDE3_AUTOMOC(${ksvnwidgetsrc})
ADD_LIBRARY(ksvnwidgets STATIC ${ksvnwidgetsrc} ${kdesvn_shared_ui})
+SET_TARGET_PROPERTIES(ksvnwidgets
+ PROPERTIES
+ COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS})
+
ADD_DEPENDENCIES(ksvnwidgets kdesvncfgreader)
Index: src/kiosvn/kiosvn.cpp
===================================================================
--- src/kiosvn/kiosvn.cpp (.../tags/rel_0_9_2) (Revision 962)
+++ src/kiosvn/kiosvn.cpp (.../branches/rel_0_9) (Revision 962)
@@ -21,11 +21,11 @@
#include "kiosvn.h"
#include "kiolistener.h"
-#include "svnqt/dirent.hpp"
-#include "svnqt/url.hpp"
-#include "svnqt/status.hpp"
-#include "svnqt/targets.hpp"
-#include "svnqt/info_entry.hpp"
+#include "src/svnqt/dirent.hpp"
+#include "src/svnqt/url.hpp"
+#include "src/svnqt/status.hpp"
+#include "src/svnqt/targets.hpp"
+#include "src/svnqt/info_entry.hpp"
#include "helpers/sub2qt.h"
#include <stdlib.h>
Index: src/kiosvn/CMakeLists.txt
===================================================================
--- src/kiosvn/CMakeLists.txt (.../tags/rel_0_9_2) (Revision 962)
+++ src/kiosvn/CMakeLists.txt (.../branches/rel_0_9) (Revision 962)
@@ -2,7 +2,7 @@
KDE3_ADD_KPART(kio_ksvn ${kiosvn_src})
-TARGET_LINK_LIBRARIES(kio_ksvn
+TARGET_LINK_LIBRARIES(kio_ksvn
svnqt
kdesvnhelpers
${QT_AND_KDECORE_LIBS}
@@ -13,9 +13,9 @@
LINK_FLAG "${LINK_NO_UNDEFINED}")
INSTALL(TARGETS kio_ksvn
- LIBRARY DESTINATION lib/kde3)
+ LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
FILE(GLOB PROTFILES *.protocol)
INSTALL(FILES ${PROTFILES}
- DESTINATION ${KDE3_SERVICESDIR})
+ DESTINATION ${SERVICES_INSTALL_DIR})
Index: src/kiosvn/kiolistener.h
===================================================================
--- src/kiosvn/kiolistener.h (.../tags/rel_0_9_2) (Revision 962)
+++ src/kiosvn/kiolistener.h (.../branches/rel_0_9) (Revision 962)
@@ -20,7 +20,7 @@
#ifndef KIOLISTENER_H
#define KIOLISTENER_H
-#include "svnqt/context_listener.hpp"
+#include "src/svnqt/context_listener.hpp"
namespace KIO {
class SlaveBase;
Index: src/svnqt/CMakeLists.txt
===================================================================
--- src/svnqt/CMakeLists.txt (.../tags/rel_0_9_2) (Revision 962)
+++ src/svnqt/CMakeLists.txt (.../branches/rel_0_9) (Revision 962)
@@ -38,6 +38,9 @@
IF(NOT WIN32)
ADD_LIBRARY(svnqt SHARED ${SOURCES} )
+ SET_TARGET_PROPERTIES(svnqt
+ PROPERTIES
+ COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS})
ELSE(NOT WIN32)
ADD_LIBRARY(svnqt STATIC ${SOURCES} )
ENDIF(NOT WIN32)
@@ -63,8 +66,8 @@
#may some of that guy may give a hint.
IF(NOT WIN32)
-SET_TARGET_PROPERTIES(svnqt PROPERTIES
- SOVERSION ${LIB_MAJOR}
+SET_TARGET_PROPERTIES(svnqt PROPERTIES
+ SOVERSION ${LIB_MAJOR}
VERSION ${_soversion})
ENDIF(NOT WIN32)
@@ -80,7 +83,7 @@
# install rules
# in win32 we don't install it
IF(NOT WIN32)
- INSTALL(TARGETS svnqt DESTINATION lib)
+ INSTALL(TARGETS svnqt DESTINATION ${LIB_INSTALL_DIR})
INSTALL(FILES ${HEADERS} DESTINATION include/svnqt)
# and a libtool file
@@ -105,6 +108,6 @@
FILE(APPEND ${_laname} "# Should we warn about portability when linking against -modules?\nshouldnotlink=no\n")
FILE(APPEND ${_laname} "# Files to dlopen/dlpreopen\ndlopen=''\ndlpreopen=''\n")
FILE(APPEND ${_laname} "# Directory that this library needs to be installed in:\n")
- FILE(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/lib'\n")
- INSTALL_FILES(/lib FILES ${_laname})
+ FILE(APPEND ${_laname} "libdir='${LIB_INSTALL_DIR}'\n")
+ INSTALL(FILES ${_laname} DESTINATION ${LIB_INSTALL_DIR})
ENDIF(NOT WIN32)
Index: src/CMakeLists.txt
===================================================================
--- src/CMakeLists.txt (.../tags/rel_0_9_2) (Revision 962)
+++ src/CMakeLists.txt (.../branches/rel_0_9) (Revision 962)
@@ -40,10 +40,10 @@
TARGET_LINK_LIBRARIES(kdesvn ${QT_AND_KDECORE_LIBS} ${KDE3_UI_LIBRARY} ${KDE3_PART_LIBRARY})
INSTALL(TARGETS kdesvn kdesvnaskpass kdesvnpart
- RUNTIME DESTINATION ${KDE3_BINDIR}
- LIBRARY DESTINATION lib/kde3)
+ RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+ LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
# the resources
-INSTALL(FILES kdesvnui.rc DESTINATION ${KDE3_APPSDIR}/kdesvn)
-INSTALL(FILES kdesvn_part.rc DESTINATION ${KDE3_APPSDIR}/kdesvnpart)
-INSTALL(FILES kdesvn.desktop DESTINATION ${KDE3_APPLICATIONSDIR})
+INSTALL(FILES kdesvnui.rc DESTINATION ${DATA_INSTALL_DIR}/kdesvn)
+INSTALL(FILES kdesvn_part.rc DESTINATION ${DATA_INSTALL_DIR}/kdesvnpart)
+INSTALL(FILES kdesvn.desktop DESTINATION ${XDG_APPS_DIR})
Index: doc/CMakeLists.txt
===================================================================
--- doc/CMakeLists.txt (.../tags/rel_0_9_2) (Revision 962)
+++ doc/CMakeLists.txt (.../branches/rel_0_9) (Revision 962)
@@ -21,14 +21,14 @@
# )
INSTALL(FILES
${CMAKE_CURRENT_BINARY_DIR}/en_index.cache.bz2
- DESTINATION ${KDE3_DATADIR}/doc/HTML/en/kdesvn
+ DESTINATION ${HTML_INSTALL_DIR}/en/kdesvn
RENAME
index.cache.bz2
)
INSTALL(FILES
${CMAKE_CURRENT_SOURCE_DIR}/en/index.docbook
${docimages}
- DESTINATION ${KDE3_DATADIR}/doc/HTML/en/kdesvn
+ DESTINATION ${HTML_INSTALL_DIR}/en/kdesvn
)
# creates the link to the common-section during install
INSTALL(SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/makelink.cmake)
Index: cmakemodules/kde3uic.cmake
===================================================================
--- cmakemodules/kde3uic.cmake (.../tags/rel_0_9_2) (Revision 0)
+++ cmakemodules/kde3uic.cmake (.../branches/rel_0_9) (Revision 962)
@@ -0,0 +1,20 @@
+
+
+# used internally by KDE3Macros.cmake
+# neundorf at kde.org
+
+
+EXECUTE_PROCESS(COMMAND ${KDE_UIC_EXECUTABLE}
+ -L ${KDE_UIC_PLUGIN_DIR} -nounload -tr tr2i18n
+ -impl ${KDE_UIC_H_FILE}
+ ${KDE_UIC_FILE}
+ OUTPUT_VARIABLE _uic_CONTENTS
+ ERROR_QUIET
+ )
+
+STRING(REGEX REPLACE "tr2i18n\\(\"\"\\)" "QString::null" _uic_CONTENTS "${_uic_CONTENTS}" )
+STRING(REGEX REPLACE "tr2i18n\\(\"\", \"\"\\)" "QString::null" _uic_CONTENTS "${_uic_CONTENTS}" )
+
+FILE(WRITE ${KDE_UIC_CPP_FILE} "#include <kdialog.h>\n#include <klocale.h>\n\n")
+FILE(APPEND ${KDE_UIC_CPP_FILE} "${_uic_CONTENTS}")
+
Index: cmakemodules/KDE3Macros.cmake
===================================================================
--- cmakemodules/KDE3Macros.cmake (.../tags/rel_0_9_2) (Revision 0)
+++ cmakemodules/KDE3Macros.cmake (.../branches/rel_0_9) (Revision 962)
@@ -0,0 +1,391 @@
+#
+
+# See FindKDE3.cmake for documentation.
+#
+# this file contains the following macros:
+# KDE3_ADD_DCOP_SKELS
+# KDE3_ADD_DCOP_STUBS
+# KDE3_ADD_MOC_FILES
+# KDE3_ADD_UI_FILES
+# KDE3_ADD_KCFG_FILES
+# KDE3_AUTOMOC
+# KDE3_INSTALL_LIBTOOL_FILE
+# KDE3_CREATE_FINAL_FILE
+# KDE3_ADD_KPART
+# KDE3_ADD_KDEINIT_EXECUTABLE
+# KDE3_ADD_EXECUTABLE
+
+
+#neundorf at kde.org
+
+INCLUDE(AddFileDependencies)
+
+#create the kidl and skeletion file for dcop stuff
+#usage: KDE_ADD_COP_SKELS(foo_SRCS ${dcop_headers})
+MACRO(KDE3_ADD_DCOP_SKELS _sources)
+ FOREACH (_current_FILE ${ARGN})
+
+ GET_FILENAME_COMPONENT(_tmp_FILE ${_current_FILE} ABSOLUTE)
+ GET_FILENAME_COMPONENT(_basename ${_tmp_FILE} NAME_WE)
+
+ SET(_skel ${CMAKE_CURRENT_BINARY_DIR}/${_basename}_skel.cpp)
+ SET(_kidl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.kidl)
+
+ IF (NOT HAVE_${_basename}_KIDL_RULE)
+ SET(HAVE_${_basename}_KIDL_RULE ON)
+
+ ADD_CUSTOM_COMMAND(OUTPUT ${_kidl}
+ COMMAND ${KDE3_DCOPIDL_EXECUTABLE}
+ ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE} > ${_kidl}
+ DEPENDS ${_tmp_FILE}
+ )
+ ENDIF (NOT HAVE_${_basename}_KIDL_RULE)
+
+ IF (NOT HAVE_${_basename}_SKEL_RULE)
+ SET(HAVE_${_basename}_SKEL_RULE ON)
+
+ ADD_CUSTOM_COMMAND(OUTPUT ${_skel}
+ COMMAND ${KDE3_DCOPIDL2CPP_EXECUTABLE}
+ ARGS --c++-suffix cpp --no-signals --no-stub ${_kidl}
+ DEPENDS ${_kidl}
+ )
+
+ ENDIF (NOT HAVE_${_basename}_SKEL_RULE)
+
+ SET(${_sources} ${${_sources}} ${_skel})
+
+ ENDFOREACH (_current_FILE)
+
+ENDMACRO(KDE3_ADD_DCOP_SKELS)
+
+
+MACRO(KDE3_ADD_DCOP_STUBS _sources)
+ FOREACH (_current_FILE ${ARGN})
+
+ GET_FILENAME_COMPONENT(_tmp_FILE ${_current_FILE} ABSOLUTE)
+
+ GET_FILENAME_COMPONENT(_basename ${_tmp_FILE} NAME_WE)
+
+ SET(_stub_CPP ${CMAKE_CURRENT_BINARY_DIR}/${_basename}_stub.cpp)
+ SET(_kidl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.kidl)
+
+ IF (NOT HAVE_${_basename}_KIDL_RULE)
+ SET(HAVE_${_basename}_KIDL_RULE ON)
+
+
+ ADD_CUSTOM_COMMAND(OUTPUT ${_kidl}
+ COMMAND ${KDE3_DCOPIDL_EXECUTABLE}
+ ARGS ${tmp_FILE} > ${_kidl}
+ DEPENDS ${tmp_FILE}
+ )
+
+ ENDIF (NOT HAVE_${_basename}_KIDL_RULE)
+
+
+ IF (NOT HAVE_${_basename}_STUB_RULE)
+ SET(HAVE_${_basename}_STUB_RULE ON)
+
+ ADD_CUSTOM_COMMAND(OUTPUT ${_stub_CPP}
+ COMMAND ${KDE3_DCOPIDL2CPP_EXECUTABLE}
+ ARGS --c++-suffix cpp --no-signals --no-skel ${_kidl}
+ DEPENDS ${_kidl}
+ )
+
+ ENDIF (NOT HAVE_${_basename}_STUB_RULE)
+
+ SET(${_sources} ${${_sources}} ${_stub_CPP})
+
+ ENDFOREACH (_current_FILE)
+
+ENDMACRO(KDE3_ADD_DCOP_STUBS)
+
+
+MACRO(KDE3_ADD_KCFG_FILES _sources)
+ FOREACH (_current_FILE ${ARGN})
+
+ GET_FILENAME_COMPONENT(_tmp_FILE ${_current_FILE} ABSOLUTE)
+
+ GET_FILENAME_COMPONENT(_basename ${_tmp_FILE} NAME_WE)
+
+ FILE(READ ${_tmp_FILE} _contents)
+ STRING(REGEX REPLACE "^(.*\n)?File=([^\n]+)\n.*$" "\\2" _kcfg_FILE "${_contents}")
+
+ SET(_src_FILE ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp)
+ SET(_header_FILE ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h)
+
+ ADD_CUSTOM_COMMAND(OUTPUT ${_src_FILE}
+ COMMAND ${KDE3_KCFGC_EXECUTABLE}
+ ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${_kcfg_FILE} ${_tmp_FILE}
+ DEPENDS ${_tmp_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/${_kcfg_FILE} )
+
+ SET(${_sources} ${${_sources}} ${_src_FILE})
+
+ ENDFOREACH (_current_FILE)
+
+ENDMACRO(KDE3_ADD_KCFG_FILES)
+
+
+#create the moc files and add them to the list of sources
+#usage: KDE_ADD_MOC_FILES(foo_SRCS ${moc_headers})
+MACRO(KDE3_ADD_MOC_FILES _sources)
+ FOREACH (_current_FILE ${ARGN})
+
+ GET_FILENAME_COMPONENT(_tmp_FILE ${_current_FILE} ABSOLUTE)
+
+ GET_FILENAME_COMPONENT(_basename ${_tmp_FILE} NAME_WE)
+ SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc.cpp)
+
+ ADD_CUSTOM_COMMAND(OUTPUT ${_moc}
+ COMMAND ${QT_MOC_EXECUTABLE}
+ ARGS ${_tmp_FILE} -o ${_moc}
+ DEPENDS ${_tmp_FILE}
+ )
+
+ SET(${_sources} ${${_sources}} ${_moc})
+
+ ENDFOREACH (_current_FILE)
+ENDMACRO(KDE3_ADD_MOC_FILES)
+
+
+GET_FILENAME_COMPONENT( KDE3_MODULE_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
+
+#create the implementation files from the ui files and add them to the list of sources
+#usage: KDE_ADD_UI_FILES(foo_SRCS ${ui_files})
+MACRO(KDE3_ADD_UI_FILES _sources )
+ FOREACH (_current_FILE ${ARGN})
+
+ GET_FILENAME_COMPONENT(_tmp_FILE ${_current_FILE} ABSOLUTE)
+
+ GET_FILENAME_COMPONENT(_basename ${_tmp_FILE} NAME_WE)
+ SET(_header ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h)
+ SET(_src ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp)
+ SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc.cpp)
+
+ ADD_CUSTOM_COMMAND(OUTPUT ${_header}
+ COMMAND ${QT_UIC_EXECUTABLE}
+ ARGS -L ${KDE3_LIB_DIR}/kde3/plugins/designer -nounload -o ${_header} ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE}
+ DEPENDS ${_tmp_FILE}
+ )
+
+ ADD_CUSTOM_COMMAND(OUTPUT ${_src}
+ COMMAND ${CMAKE_COMMAND}
+ ARGS
+ -DKDE_UIC_PLUGIN_DIR:FILEPATH=${KDE3_LIB_DIR}/kde3/plugins/designer
+ -DKDE_UIC_EXECUTABLE:FILEPATH=${QT_UIC_EXECUTABLE}
+ -DKDE_UIC_FILE:FILEPATH=${_tmp_FILE}
+ -DKDE_UIC_CPP_FILE:FILEPATH=${_src}
+ -DKDE_UIC_H_FILE:FILEPATH=${_header}
+ -P ${KDE3_MODULE_DIR}/kde3uic.cmake
+ DEPENDS ${_header}
+ )
+
+ ADD_CUSTOM_COMMAND(OUTPUT ${_moc}
+ COMMAND ${QT_MOC_EXECUTABLE}
+ ARGS ${_header} -o ${_moc}
+ DEPENDS ${_header}
+ )
+
+ SET(${_sources} ${${_sources}} ${_src} ${_moc} )
+
+ ENDFOREACH (_current_FILE)
+ENDMACRO(KDE3_ADD_UI_FILES)
+
+
+MACRO(KDE3_AUTOMOC)
+ SET(_matching_FILES )
+ FOREACH (_current_FILE ${ARGN})
+
+ GET_FILENAME_COMPONENT(_abs_FILE ${_current_FILE} ABSOLUTE)
+
+ # if "SKIP_AUTOMOC" is set to true, we will not handle this file here.
+ # here. this is required to make bouic work correctly:
+ # we need to add generated .cpp files to the sources (to compile them),
+ # but we cannot let automoc handle them, as the .cpp files don't exist yet when
+ # cmake is run for the very first time on them -> however the .cpp files might
+ # exist at a later run. at that time we need to skip them, so that we don't add two
+ # different rules for the same moc file
+ GET_SOURCE_FILE_PROPERTY(_skip ${_abs_FILE} SKIP_AUTOMOC)
+
+ IF (EXISTS ${_abs_FILE} AND NOT _skip)
+
+ FILE(READ ${_abs_FILE} _contents)
+
+ GET_FILENAME_COMPONENT(_abs_PATH ${_abs_FILE} PATH)
+
+ STRING(REGEX MATCHALL "#include +[^ ]+\\.moc[\">]" _match "${_contents}")
+ IF(_match)
+ FOREACH (_current_MOC_INC ${_match})
+ STRING(REGEX MATCH "[^ <\"]+\\.moc" _current_MOC "${_current_MOC_INC}")
+
+ GET_FILENAME_COMPONENT(_basename ${_current_MOC} NAME_WE)
+# SET(_header ${CMAKE_CURRENT_SOURCE_DIR}/${_basename}.h)
+ SET(_header ${_abs_PATH}/${_basename}.h)
+ SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC})
+
+ ADD_CUSTOM_COMMAND(OUTPUT ${_moc}
+ COMMAND ${QT_MOC_EXECUTABLE}
+ ARGS ${_header} -o ${_moc}
+ DEPENDS ${_header}
+ )
+
+ ADD_FILE_DEPENDENCIES(${_abs_FILE} ${_moc})
+
+ ENDFOREACH (_current_MOC_INC)
+ ENDIF(_match)
+
+ ENDIF (EXISTS ${_abs_FILE} AND NOT _skip)
+ ENDFOREACH (_current_FILE)
+ENDMACRO(KDE3_AUTOMOC)
+
+# only used internally by KDE3_INSTALL_ICONS
+MACRO (_KDE3_ADD_ICON_INSTALL_RULE _install_SCRIPT _install_PATH _group _orig_NAME _install_NAME)
+
+ # if the string doesn't match the pattern, the result is the full string, so all three have the same content
+ IF (NOT ${_group} STREQUAL ${_install_NAME} )
+ SET(_icon_GROUP "actions")
+
+ IF (${_group} STREQUAL "mime")
+ SET(_icon_GROUP "mimetypes")
+ ENDIF (${_group} STREQUAL "mime")
+
+ IF (${_group} STREQUAL "filesys")
+ SET(_icon_GROUP "filesystems")
+ ENDIF (${_group} STREQUAL "filesys")
+
+ IF (${_group} STREQUAL "device")
+ SET(_icon_GROUP "devices")
+ ENDIF (${_group} STREQUAL "device")
+
+ IF (${_group} STREQUAL "app")
+ SET(_icon_GROUP "apps")
+ ENDIF (${_group} STREQUAL "app")
+
+ IF (${_group} STREQUAL "action")
+ SET(_icon_GROUP "actions")
+ ENDIF (${_group} STREQUAL "action")
+
+# message(STATUS "icon: ${_current_ICON} size: ${_size} group: ${_group} name: ${_name}" )
+ INSTALL(FILES ${_orig_NAME} DESTINATION ${_install_PATH}/${_icon_GROUP}/ RENAME ${_install_NAME} )
+ ENDIF (NOT ${_group} STREQUAL ${_install_NAME} )
+
+ENDMACRO (_KDE3_ADD_ICON_INSTALL_RULE)
+
+
+MACRO (KDE3_INSTALL_ICONS _theme )
+ SET(_defaultpath "${CMAKE_INSTALL_PREFIX}/share/icons")
+ # first the png icons
+ FILE(GLOB _icons *.png)
+ FOREACH (_current_ICON ${_icons} )
+ STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\1" _size "${_current_ICON}")
+ STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\2" _group "${_current_ICON}")
+ STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\3" _name "${_current_ICON}")
+ _KDE3_ADD_ICON_INSTALL_RULE(${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake
+ ${_defaultpath}/${_theme}/${_size}x${_size}
+ ${_group} ${_current_ICON} ${_name})
+ ENDFOREACH (_current_ICON)
+
+ # and now the svg icons
+ FILE(GLOB _icons *.svgz)
+ FOREACH (_current_ICON ${_icons} )
+ STRING(REGEX REPLACE "^.*/crsc\\-([a-z]+)\\-(.+\\.svgz)$" "\\1" _group "${_current_ICON}")
+ STRING(REGEX REPLACE "^.*/crsc\\-([a-z]+)\\-(.+\\.svgz)$" "\\2" _name "${_current_ICON}")
+ _KDE3_ADD_ICON_INSTALL_RULE(${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake
+ ${_defaultpath}/${_theme}/scalable
+ ${_group} ${_current_ICON} ${_name})
+ ENDFOREACH (_current_ICON)
+
+ENDMACRO (KDE3_INSTALL_ICONS)
+
+MACRO(KDE3_INSTALL_LIBTOOL_FILE _target)
+ GET_TARGET_PROPERTY(_target_location ${_target} LOCATION)
+
+ GET_FILENAME_COMPONENT(_laname ${_target_location} NAME_WE)
+ GET_FILENAME_COMPONENT(_soname ${_target_location} NAME)
+ SET(_laname ${CMAKE_CURRENT_BINARY_DIR}/${_laname}.la)
+
+ FILE(WRITE ${_laname} "# ${_laname} - a libtool library file, generated by cmake \n")
+ FILE(APPEND ${_laname} "# The name that we can dlopen(3).\n")
+ FILE(APPEND ${_laname} "dlname='${_soname}'\n")
+ FILE(APPEND ${_laname} "# Names of this library\n")
+ FILE(APPEND ${_laname} "library_names='${_soname} ${_soname} ${_soname}'\n")
+ FILE(APPEND ${_laname} "# The name of the static archive\n")
+ FILE(APPEND ${_laname} "old_library=''\n")
+ FILE(APPEND ${_laname} "# Libraries that this one depends upon.\n")
+ FILE(APPEND ${_laname} "dependency_libs=''\n")
+# FILE(APPEND ${_laname} "dependency_libs='${${_target}_LIB_DEPENDS}'\n")
+ FILE(APPEND ${_laname} "# Version information.\ncurrent=0\nage=0\nrevision=0\n")
+ FILE(APPEND ${_laname} "# Is this an already installed library?\ninstalled=yes\n")
+ FILE(APPEND ${_laname} "# Should we warn about portability when linking against -modules?\nshouldnotlink=yes\n")
+ FILE(APPEND ${_laname} "# Files to dlopen/dlpreopen\ndlopen=''\ndlpreopen=''\n")
+ FILE(APPEND ${_laname} "# Directory that this library needs to be installed in:\n")
+ FILE(APPEND ${_laname} "libdir='${PLUGIN_INSTALL_DIR}'\n")
+ INSTALL(FILES ${_laname} DESTINATION ${PLUGIN_INSTALL_DIR})
+ENDMACRO(KDE3_INSTALL_LIBTOOL_FILE)
+
+
+MACRO(KDE3_CREATE_FINAL_FILE _filename)
+ FILE(WRITE ${_filename} "//autogenerated file\n")
+ FOREACH (_current_FILE ${ARGN})
+ FILE(APPEND ${_filename} "#include \"${_current_FILE}\"\n")
+ ENDFOREACH (_current_FILE)
+
+ENDMACRO(KDE3_CREATE_FINAL_FILE)
+
+
+OPTION(KDE3_ENABLE_FINAL "Enable final all-in-one compilation")
+OPTION(KDE3_BUILD_TESTS "Build the tests")
+
+
+MACRO(KDE3_ADD_KPART _target_NAME _with_PREFIX)
+#is the first argument is "WITH_PREFIX" then keep the standard "lib" prefix, otherwise SET the prefix empty
+ IF (${_with_PREFIX} STREQUAL "WITH_PREFIX")
+ SET(_first_SRC)
+ ELSE (${_with_PREFIX} STREQUAL "WITH_PREFIX")
+ SET(_first_SRC ${_with_PREFIX})
+ ENDIF (${_with_PREFIX} STREQUAL "WITH_PREFIX")
+
+ IF (KDE3_ENABLE_FINAL)
+ KDE3_CREATE_FINAL_FILE(${_target_NAME}_final.cpp ${_first_SRC} ${ARGN})
+ ADD_LIBRARY(${_target_NAME} MODULE ${_target_NAME}_final.cpp)
+ ELSE (KDE3_ENABLE_FINAL)
+ ADD_LIBRARY(${_target_NAME} MODULE ${_first_SRC} ${ARGN})
+ ENDIF (KDE3_ENABLE_FINAL)
+
+ IF(_first_SRC)
+ SET_TARGET_PROPERTIES(${_target_NAME} PROPERTIES PREFIX "")
+ ENDIF(_first_SRC)
+
+ KDE3_INSTALL_LIBTOOL_FILE(${_target_NAME})
+
+ENDMACRO(KDE3_ADD_KPART)
+
+
+MACRO(KDE3_ADD_KDEINIT_EXECUTABLE _target_NAME )
+
+ IF (KDE3_ENABLE_FINAL)
+ KDE3_CREATE_FINAL_FILE(${_target_NAME}_final.cpp ${ARGN})
+ ADD_LIBRARY(kdeinit_${_target_NAME} SHARED ${_target_NAME}_final.cpp)
+ ELSE (KDE3_ENABLE_FINAL)
+ ADD_LIBRARY(kdeinit_${_target_NAME} SHARED ${ARGN} )
+ ENDIF (KDE3_ENABLE_FINAL)
+
+ CONFIGURE_FILE(${KDE3_MODULE_DIR}/kde3init_dummy.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp)
+
+ ADD_EXECUTABLE( ${_target_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp )
+ TARGET_LINK_LIBRARIES( ${_target_NAME} kdeinit_${_target_NAME} )
+
+ENDMACRO(KDE3_ADD_KDEINIT_EXECUTABLE)
+
+
+MACRO(KDE3_ADD_EXECUTABLE _target_NAME )
+
+ IF (KDE3_ENABLE_FINAL)
+ KDE3_CREATE_FINAL_FILE(${_target_NAME}_final.cpp ${ARGN})
+ ADD_EXECUTABLE(${_target_NAME} ${_target_NAME}_final.cpp)
+ ELSE (KDE3_ENABLE_FINAL)
+ ADD_EXECUTABLE(${_target_NAME} ${ARGN} )
+ ENDIF (KDE3_ENABLE_FINAL)
+
+ENDMACRO(KDE3_ADD_EXECUTABLE)
+
+
Index: cmakemodules/FindKdeLibs.cmake
===================================================================
--- cmakemodules/FindKdeLibs.cmake (.../tags/rel_0_9_2) (Revision 962)
+++ cmakemodules/FindKdeLibs.cmake (.../branches/rel_0_9) (Revision 962)
@@ -1,10 +1,10 @@
-include(${CMAKE_ROOT}/Modules/FindQt3.cmake)
-include(${CMAKE_ROOT}/Modules/FindKDE3.cmake)
-include(${CMAKE_SOURCE_DIR}/cmakemodules/kdesvnMacros.cmake)
+include(FindQt3)
+include(FindKDE3)
+include(kdesvnMacros)
-FIND_LIBRARY(KDE3_UI_LIBRARY NAMES kdeui
- PATHS
- ${KDE3_LIB_DIR}
+set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" FORCE)
+
+SET(LIB_SEARCH_PATHES ${KDE3_LIB_DIR}
$ENV{KDEDIR}/lib
/opt/kde/lib
/opt/kde3/lib
@@ -12,34 +12,34 @@
/usr/local/lib
)
+IF (LIB_SUFFIX)
+ SET(LIB_SEARCH_PATHES
+ $ENV{KDEDIR}/lib${LIB_SUFFIX}
+ /opt/kde/lib${LIB_SUFFIX}
+ /opt/kde3/lib${LIB_SUFFIX}
+ /usr/lib${LIB_SUFFIX}
+ /usr/local/lib${LIB_SUFFIX}
+ ${LIB_SEARCH_PATHES})
+ENDIF (LIB_SUFFIX)
+
+FIND_LIBRARY(KDE3_UI_LIBRARY NAMES kdeui
+ PATHS
+ ${LIB_SEARCH_PATHES}
+)
+
FIND_LIBRARY(KDE3_PART_LIBRARY NAMES kparts
PATHS
- ${KDE3_LIB_DIR}
- $ENV{KDEDIR}/lib
- /opt/kde/lib
- /opt/kde3/lib
- /usr/lib
- /usr/local/lib
+ ${LIB_SEARCH_PATHES}
)
FIND_LIBRARY(KDE3_KIO_LIBRARY NAMES kio
PATHS
- ${KDE3_LIB_DIR}
- $ENV{KDEDIR}/lib
- /opt/kde/lib
- /opt/kde3/lib
- /usr/lib
- /usr/local/lib
+ ${LIB_SEARCH_PATHES}
)
FIND_LIBRARY(KDE3_DCOP_LIBRARY NAMES DCOP
PATHS
- ${KDE3_LIB_DIR}
- $ENV{KDEDIR}/lib
- /opt/kde/lib
- /opt/kde3/lib
- /usr/lib
- /usr/local/lib
+ ${LIB_SEARCH_PATHES}
)
FIND_PROGRAM(KDE3_KDECONFIG_EXECUTABLE NAME kde-config PATHS
@@ -81,38 +81,40 @@
SET(MSGFMT ":" CACHE STRING "Msgfmt program")
ENDIF(MSGFMT)
-# we require some defines
-IF (NOT KDE3_DATADIR)
- SET(KDE3_DATADIR share CACHE STRING
- "KDE3-datadir (relative to install-prefix when not starting with \"/\")" )
-ENDIF (NOT KDE3_DATADIR)
-IF (NOT KDE3_BINDIR)
- SET(KDE3_BINDIR bin CACHE STRING
- "KDE3-binarydir (relative to install-prefix when not starting with \"/\")" )
-ENDIF (NOT KDE3_BINDIR)
-IF (NOT KDE3_APPSDIR)
- SET(KDE3_APPSDIR ${KDE3_DATADIR}/apps CACHE STRING
- "KDE3-application dir (relative to install-prefix when not starting with \"/\")" )
-ENDIF (NOT KDE3_APPSDIR)
-IF (NOT KDE3_SERVICESDIR)
- SET(KDE3_SERVICESDIR ${KDE3_DATADIR}/services CACHE STRING
- "KDE3-services dir (relative to install-prefix when not starting with \"/\")" )
-ENDIF (NOT KDE3_SERVICESDIR)
-IF (NOT KDE3_LOCALEDIR)
- SET(KDE3_LOCALEDIR ${KDE3_DATADIR}/locale CACHE STRING
- "KDE3-locale dir (relative to install-prefix when not starting with \"/\")" )
-ENDIF (NOT KDE3_LOCALEDIR)
-IF (NOT KDE3_ICONDIR)
- SET(KDE3_ICONDIR ${KDE3_DATADIR}/icons CACHE STRING
- "KDE3-icons dir (relative to install-prefix when not starting with \"/\")" )
-ENDIF (NOT KDE3_ICONDIR)
+# 'cause my own defines were not good I take them from kde4 trunk
+#add some KDE specific stuff
+set(SHARE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/share CACHE PATH "Base directory for files which go to share/" FORCE)
+set(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Base directory for executables and libraries" FORCE)
+#
+## the following are directories where stuff will be installed to
+set(BIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/bin" CACHE PATH "The kde bin install dir (default prefix/bin)" FORCE)
+set(SBIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/sbin" CACHE PATH "The kde sbin install dir (default prefix/sbin)" FORCE)
+set(LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE)
+set(LIBEXEC_INSTALL_DIR "${LIB_INSTALL_DIR}/kde3/libexec" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib/kde3/libexec)" FORCE)
+set(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/kde3" CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/kde3)" FORCE)
+set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The subdirectory to the header prefix" FORCE)
+set(CONFIG_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/config" CACHE PATH "The config file install dir" FORCE)
+set(DATA_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/apps" CACHE PATH "The parent directory where applications can install their data" FORCE)
+set(HTML_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/doc/HTML" CACHE PATH "The HTML install dir for documentation" FORCE)
+set(ICON_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/icons" CACHE PATH "The icon install dir (default prefix/share/icons/)" FORCE)
+set(KCFG_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/config.kcfg" CACHE PATH "The install dir for kconfig files" FORCE)
+set(LOCALE_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/locale" CACHE PATH "The install dir for translations" FORCE)
+set(MIME_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/mimelnk" CACHE PATH "The install dir for the mimetype desktop files" FORCE)
+set(SERVICES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/services" CACHE PATH "The install dir for service (desktop, protocol, ...) files" FORCE)
+set(SERVICETYPES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/servicetypes" CACHE PATH "The install dir for servicestypes desktop files" FORCE)
+set(SOUND_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/sounds" CACHE PATH "The install dir for sound files" FORCE)
+set(TEMPLATES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/templates" CACHE PATH "The install dir for templates (Create new file...)" FORCE)
+set(WALLPAPER_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/wallpapers" CACHE PATH "The install dir for wallpapers" FORCE)
+set(KCONF_UPDATE_INSTALL_DIR "${DATA_INSTALL_DIR}/kconf_update" CACHE PATH "The kconf_update install dir" FORCE)
+# this one shouldn't be used anymore
+set(APPLNK_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/applnk" CACHE PATH "Is this still used ?" FORCE)
+set(AUTOSTART_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/autostart" CACHE PATH "The install dir for autostart files" FORCE)
+set(XDG_APPS_DIR "${SHARE_INSTALL_PREFIX}/applications/kde" CACHE PATH "The XDG apps dir" FORCE)
+set(XDG_DIRECTORY_DIR "${SHARE_INSTALL_PREFIX}/desktop-directories" CACHE PATH "The XDG directory" FORCE)
+set(SYSCONF_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/etc" CACHE PATH "The kde sysconfig install dir (default/etc)" FORCE)
+set(MAN_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/man" CACHE PATH "The kde man install dir (default prefix/share/man/)" FORCE)
+set(INFO_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/info" CACHE PATH "The kde info install dir (default prefix/info)" FORCE)
-# applicationsdir for kde has an own subdir! (where the desktop-files goes)
-IF (NOT KDE3_APPLICATIONSDIR)
- SET(KDE3_APPLICATIONSDIR ${KDE3_DATADIR}/applications/kde CACHE STRING
- "KDE3-applications dir (relative to install-prefix when not starting with \"/\")" )
-ENDIF (NOT KDE3_APPLICATIONSDIR)
-
# linker flags - must get checked
SET(LINK_NO_UNDEFINED "")
SET(lundef "-Wl,--no-undefined")
@@ -173,7 +175,7 @@
ENDIF(${_group} STREQUAL "action")
#message(STATUS "icon: ${_current_ICON} size: ${_sizestring} group: ${_group} name: ${_name}" )
- SET(_ICON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/icons/${_theme}/${_sizestring}/${_icon_GROUP})
+ SET(_ICON_INSTALL_DIR ${ICON_INSTALL_DIR}/${_theme}/${_sizestring}/${_icon_GROUP})
INSTALL(FILES ${_current_ICON} DESTINATION ${_ICON_INSTALL_DIR} RENAME ${_name})
@@ -195,7 +197,7 @@
)
SET(_gmofiles ${_gmofiles} ${_gmofile})
INSTALL(FILES ${_gmofile}
- DESTINATION ${KDE3_LOCALEDIR}/${_lang}/LC_MESSAGES
+ DESTINATION ${LOCALE_INSTALL_DIR}/${_lang}/LC_MESSAGES
RENAME ${packagename}.mo)
ENDFOREACH(_current_po ${_pofiles})
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt (.../tags/rel_0_9_2) (Revision 962)
+++ CMakeLists.txt (.../branches/rel_0_9) (Revision 962)
@@ -8,9 +8,10 @@
CHECK_CXX_ACCEPTS_FLAG("-fexceptions" CXX_EXCEPTION)
CHECK_CXX_ACCEPTS_FLAG("-fstack-protector" CXX_PROTECTOR)
-INCLUDE(${kdesvn_SOURCE_DIR}/cmakemodules/FindKdeLibs.cmake)
-INCLUDE(${kdesvn_SOURCE_DIR}/cmakemodules/MacroEnsureVersion.cmake)
-INCLUDE(${kdesvn_SOURCE_DIR}/src/svnqt/cmakemodules/FindSubversion.cmake)
+SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmakemodules ${CMAKE_SOURCE_DIR}/src/svnqt/cmakemodules)
+INCLUDE(FindKdeLibs)
+INCLUDE(MacroEnsureVersion)
+INCLUDE(FindSubversion)
INCLUDE_DIRECTORIES(${KDE3_INCLUDE_DIR}
${QT_INCLUDE_DIR}
@@ -81,4 +82,4 @@
IMMEDIATE
@ONLY)
ADD_CUSTOM_TARGET(package-messages
- "${CMAKE_CURRENT_BINARY_DIR}/package_messages.sh")
\ Kein Zeilenvorschub am Ende der Datei
+ "${CMAKE_CURRENT_BINARY_DIR}/package_messages.sh")
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 27 Jul 2006 17:31:16 -0000 1.9
+++ .cvsignore 1 Sep 2006 15:41:14 -0000 1.10
@@ -1 +1 @@
-kdesvn-0.9.1.tar.gz
+kdesvn-0.9.2.tar.bz2
Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/FC-5/kdesvn.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kdesvn.spec 27 Jul 2006 17:31:16 -0000 1.15
+++ kdesvn.spec 1 Sep 2006 15:41:14 -0000 1.16
@@ -1,16 +1,16 @@
Name: kdesvn
-Version: 0.9.1
+Version: 0.9.2
Release: 1%{?dist}
Summary: A subversion client for KDE with KIO integration
Group: Development/Tools
License: GPL
URL: http://www.alwins-world.de/programs/kdesvn/
-Source0: http://www.alwins-world.de/programs/download/kdesvn/kdesvn-%{version}.tar.gz
-Patch0: kdesvn-0.7.1-x.patch
+Source0: http://www.alwins-world.de/programs/download/kdesvn/kdesvn-%{version}.tar.bz2
+Patch0: kdesvn-0.9.2-lib64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: subversion-devel, kdelibs-devel, neon-devel
+BuildRequires: subversion-devel, kdelibs-devel, neon-devel, cmake, gettext
BuildRequires: desktop-file-utils
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
@@ -39,19 +39,32 @@
%prep
%setup -q
-%patch -p1 -b .x11
+%patch -p0 -b .lib64
%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
-%configure --disable-rpath --with-svn-lib=%{_libdir}
-make %{?_smp_mflags}
+mkdir kdesvn-build
+cd kdesvn-build
+export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS"
+%ifarch x86_64
+%define lib_suffix "-DLIB_SUFFIX=64"
+%else
+%define lib_suffix ""
+%endif
+cmake .. %{lib_suffix} \
+ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
+ -DBUILD_SHARED_LIBS:BOOL=ON \
+ -DCMAKE_SKIP_RPATH:BOOL=ON \
+ -DCMAKE_BUILD_TYPE=Release
+make VERBOSE=1 %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
+cd kdesvn-build
make install DESTDIR=$RPM_BUILD_ROOT
+cd ..
desktop-file-install --vendor=fedora \
--add-category=Qt \
--add-category=KDE \
@@ -109,6 +122,7 @@
%{_datadir}/icons/hicolor/*/*/*.svgz
%{_datadir}/services/kded/kdesvnd.desktop
%{_datadir}/services/ksvn*.protocol
+%{_mandir}/man1/kdesvn*.1*
%files devel
@@ -118,6 +132,10 @@
%changelog
+* Fri Sep 1 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.9.2-1
+- Update to 0.9.2, uses cmake
+- Add patch from Rajko Albrecht to fix lib64 installs
+
* Thu Jul 27 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.9.1-1
- Update to 0.9.1, should fix bug #185165
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 27 Jul 2006 17:31:16 -0000 1.9
+++ sources 1 Sep 2006 15:41:14 -0000 1.10
@@ -1 +1 @@
-5ae31df56b853976db56400b1fd1b4fa kdesvn-0.9.1.tar.gz
+d21c5c6ddc00d1948014149ecffeb5d0 kdesvn-0.9.2.tar.bz2
--- kdesvn-0.7.1-x.patch DELETED ---
More information about the fedora-extras-commits
mailing list