Hello community, here is the log from the commit of package kcall for openSUSE:Factory checked in at Fri May 8 14:50:01 CEST 2009. -------- --- KDE/kcall/kcall.changes 2009-01-21 12:09:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/kcall/kcall.changes 2009-05-08 11:49:49.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 8 11:49:39 CEST 2009 - dmueller@suse.de + +- fix build with cmake 2.6.4 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcall.spec ++++++ --- /var/tmp/diff_new_pack.K10432/_old 2009-05-08 14:49:10.000000000 +0200 +++ /var/tmp/diff_new_pack.K10432/_new 2009-05-08 14:49:10.000000000 +0200 @@ -25,7 +25,7 @@ Group: Productivity/Telephony/SIP/Clients Summary: SIP (Voice over IP) Solution for KDE and Kontact Version: 0.7.0 -Release: 175 +Release: 176 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libkde4 >= %( echo `rpm -q --queryformat '%{VERSION}' libkde4`) Source0: %name-%version.tar.bz2 @@ -85,6 +85,8 @@ /usr/share/icons/crystalsvg/16x16/actions/* %changelog +* Fri May 08 2009 dmueller@suse.de +- fix build with cmake 2.6.4 * Wed Jan 21 2009 coolo@suse.de - fix build with kde 4.2 * Tue May 13 2008 dmueller@suse.de ++++++ kcall-fixes-from-svn.diff ++++++ --- /var/tmp/diff_new_pack.K10432/_old 2009-05-08 14:49:10.000000000 +0200 +++ /var/tmp/diff_new_pack.K10432/_new 2009-05-08 14:49:10.000000000 +0200 @@ -1,5 +1,5 @@ ---- kcall/kontactplugin/kcall_plugin.cpp (revision 728420) -+++ kcall/kontactplugin/kcall_plugin.cpp (revision 728420) +--- kcall/kontactplugin/kcall_plugin.cpp ++++ kcall/kontactplugin/kcall_plugin.cpp @@ -168,7 +168,7 @@ void KCallUniqueAppHandler::loadCommandL int KCallUniqueAppHandler::newInstance() @@ -18,8 +18,8 @@ if ( !handled ) // no args -> simply bring kcall plugin to front return Kontact::UniqueAppHandler::newInstance(); } ---- kcall/dtmfinput.ui (revision 728420) -+++ kcall/dtmfinput.ui (revision 728420) +--- kcall/dtmfinput.ui ++++ kcall/dtmfinput.ui @@ -9,9 +9,6 @@ <height>161</height> </rect> @@ -30,8 +30,8 @@ <layout class="QGridLayout" > <item row="0" column="0" > <widget class="QPushButton" name="button1" > ---- kcall/CMakeLists.txt (revision 728420) -+++ kcall/CMakeLists.txt (revision 728420) +--- kcall/CMakeLists.txt ++++ kcall/CMakeLists.txt @@ -71,6 +71,8 @@ SET_TARGET_PROPERTIES(kcall PROPERTIES V ) INSTALl(TARGETS kcall DESTINATION ${LIB_INSTALL_DIR}) @@ -41,8 +41,8 @@ ########### next target ############### SET(kcall_bin_SRCS ---- kcall/kcallcore.cpp (revision 728420) -+++ kcall/kcallcore.cpp (revision 728420) +--- kcall/kcallcore.cpp ++++ kcall/kcallcore.cpp @@ -294,7 +294,7 @@ void KCallCore::initActions() // misc @@ -52,8 +52,8 @@ clearLocation->setText( i18n( "Clear Search Bar" ) ); connect(clearLocation, SIGNAL(triggered(bool) ), SLOT( slotClearSearchBar() )); clearLocation->setShortcut(QKeySequence(Qt::CTRL+Qt::Key_L)); ---- kcall/vcardview.cpp (revision 728420) -+++ kcall/vcardview.cpp (revision 728420) +--- kcall/vcardview.cpp ++++ kcall/vcardview.cpp @@ -63,7 +63,7 @@ VCardView::VCardView(HistoryModel * cons ui.vcText->hide(); @@ -72,8 +72,8 @@ ui.vcPicture->setPixmap( photo ); kDebug() << ui.vcPicture->size()<< endl; } ---- CMakeLists.txt (revision 728420) -+++ CMakeLists.txt (revision 728420) +--- CMakeLists.txt ++++ CMakeLists.txt @@ -1,20 +1,18 @@ PROJECT(kcall) CMAKE_MINIMUM_REQUIRED(VERSION 2.4.3) @@ -97,10 +97,8 @@ OPTION(KCALL_ENABLE_KONTACT_PLUGIN "enable building of kontact plugin (unstable)" -Index: applet/kcall/kcallapplet.desktop -=================================================================== ---- applet/kcall/kcallapplet.desktop (Revision 728420) -+++ applet/kcall/kcallapplet.desktop (Revision 813349) +--- applet/kcall/kcallapplet.desktop ++++ applet/kcall/kcallapplet.desktop @@ -6,7 +6,7 @@ Name[tr]=K Çağrı Name[xx]=xxKCallxx @@ -110,10 +108,8 @@ Type=Application NoDisplay=true Terminal=false -Index: applet/kcall/CMakeLists.txt -=================================================================== ---- applet/kcall/CMakeLists.txt (Revision 728420) -+++ applet/kcall/CMakeLists.txt (Revision 813349) +--- applet/kcall/CMakeLists.txt ++++ applet/kcall/CMakeLists.txt @@ -38,7 +38,7 @@ ${KDE4_KDEUI_LIBS} ) @@ -123,10 +119,8 @@ ########### install files ############### -Index: kcall/kontactplugin/kcallplugin.desktop -=================================================================== ---- kcall/kontactplugin/kcallplugin.desktop (Revision 728420) -+++ kcall/kontactplugin/kcallplugin.desktop (Revision 813349) +--- kcall/kontactplugin/kcallplugin.desktop ++++ kcall/kontactplugin/kcallplugin.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 @@ -136,10 +130,8 @@ ServiceTypes=Kontact/Plugin,KPluginInfo X-KDE-Library=libkontact_kcallplugin -Index: kcall/main.cpp -=================================================================== ---- kcall/main.cpp (Revision 728420) -+++ kcall/main.cpp (Revision 813349) +--- kcall/main.cpp ++++ kcall/main.cpp @@ -129,6 +129,7 @@ return 0; @@ -148,10 +140,8 @@ KGlobal::locale()->insertCatalog( "libkdepim" ); bool ret = app.exec(); -Index: kcall/CMakeLists.txt -=================================================================== ---- kcall/CMakeLists.txt (Revision 728420) -+++ kcall/CMakeLists.txt (Revision 813349) +--- kcall/CMakeLists.txt ++++ kcall/CMakeLists.txt @@ -92,7 +92,7 @@ ${KDE4_KHTML_LIBS} ${DECIBEL_LDFLAGS}) @@ -161,10 +151,8 @@ ########### next target ############### -Index: kcall/kcallcore.cpp -=================================================================== ---- kcall/kcallcore.cpp (Revision 728420) -+++ kcall/kcallcore.cpp (Revision 813349) +--- kcall/kcallcore.cpp ++++ kcall/kcallcore.cpp @@ -273,7 +273,7 @@ */ @@ -183,10 +171,8 @@ clearLocation->setText( i18n( "Clear Search Bar" ) ); connect(clearLocation, SIGNAL(triggered(bool) ), SLOT( slotClearSearchBar() )); clearLocation->setShortcut(QKeySequence(Qt::CTRL+Qt::Key_L)); -Index: kcall/kcall.desktop -=================================================================== ---- kcall/kcall.desktop (Revision 728420) -+++ kcall/kcall.desktop (Revision 813349) +--- kcall/kcall.desktop ++++ kcall/kcall.desktop @@ -6,7 +6,7 @@ Name[tr]=kçağrı Name[xx]=xxkcallxx @@ -196,8 +182,8 @@ Categories=Network;Telephony; Type=Application DocPath=kcall/kcall.html ---- kcall/CMakeLists.txt (Revision 914524) -+++ kcall/CMakeLists.txt (Revision 914525) +--- kcall/CMakeLists.txt ++++ kcall/CMakeLists.txt @@ -104,7 +104,7 @@ KDE4_ADD_PLUGIN(kcallpart WITH_PREFIX ${kcallpart_PART_SRCS}) @@ -207,3 +193,14 @@ INSTALL(TARGETS kcallpart DESTINATION ${PLUGIN_INSTALL_DIR}) +--- kcall/CMakeLists.txt ++++ kcall/CMakeLists.txt +@@ -73,8 +73,6 @@ INSTALl(TARGETS kcall DESTINATION ${LIB_INSTALL_DIR}) + + ADD_SUBDIRECTORY(icons) + +-ADD_SUBDIRECTORY (icons) +- + ########### next target ############### + + SET(kcall_bin_SRCS ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org