Hello community, here is the log from the commit of package kcall for openSUSE:Factory checked in at Wed Nov 4 12:10:18 CET 2009. -------- --- KDE/kcall/kcall.changes 2009-08-18 14:56:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/kcall/kcall.changes 2009-11-03 20:19:04.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 3 19:09:23 UTC 2009 - coolo@novell.com + +- updated patches to apply with fuzz=0 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcall.spec ++++++ --- /var/tmp/diff_new_pack.mG0KTq/_old 2009-11-04 12:09:33.000000000 +0100 +++ /var/tmp/diff_new_pack.mG0KTq/_new 2009-11-04 12:09:33.000000000 +0100 @@ -25,7 +25,7 @@ Group: Productivity/Telephony/SIP/Clients Summary: SIP (Voice over IP) Solution for KDE and Kontact Version: 0.7.0 -Release: 177 +Release: 178 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libkde4 >= %( echo `rpm -q --queryformat '%{VERSION}' libkde4`) Source0: %name-%version.tar.bz2 ++++++ kcall-fixes-from-svn.diff ++++++ --- /var/tmp/diff_new_pack.mG0KTq/_old 2009-11-04 12:09:33.000000000 +0100 +++ /var/tmp/diff_new_pack.mG0KTq/_new 2009-11-04 12:09:33.000000000 +0100 @@ -1,4 +1,6 @@ ---- kcall/kontactplugin/kcall_plugin.cpp +Index: kcall/kontactplugin/kcall_plugin.cpp +=================================================================== +--- kcall/kontactplugin/kcall_plugin.cpp.orig +++ kcall/kontactplugin/kcall_plugin.cpp @@ -168,7 +168,7 @@ void KCallUniqueAppHandler::loadCommandL @@ -18,7 +20,9 @@ if ( !handled ) // no args -> simply bring kcall plugin to front return Kontact::UniqueAppHandler::newInstance(); } ---- kcall/dtmfinput.ui +Index: kcall/dtmfinput.ui +=================================================================== +--- kcall/dtmfinput.ui.orig +++ kcall/dtmfinput.ui @@ -9,9 +9,6 @@ <height>161</height> @@ -30,29 +34,53 @@ <layout class="QGridLayout" > <item row="0" column="0" > <widget class="QPushButton" name="button1" > ---- kcall/CMakeLists.txt +Index: kcall/CMakeLists.txt +=================================================================== +--- kcall/CMakeLists.txt.orig +++ kcall/CMakeLists.txt -@@ -71,6 +71,8 @@ SET_TARGET_PROPERTIES(kcall PROPERTIES V - ) - INSTALl(TARGETS kcall DESTINATION ${LIB_INSTALL_DIR}) +@@ -92,7 +92,7 @@ TARGET_LINK_LIBRARIES(kcall_bin + ${KDE4_KHTML_LIBS} + ${DECIBEL_LDFLAGS}) + +-INSTALL(TARGETS kcall_bin DESTINATION ${BIN_INSTALL_DIR} ) ++INSTALL(TARGETS kcall_bin ${INSTALL_TARGETS_DEFAULT_ARGS} ) -+ADD_SUBDIRECTORY (icons) -+ ########### next target ############### - SET(kcall_bin_SRCS ---- kcall/kcallcore.cpp +@@ -104,7 +104,7 @@ QT4_ADD_DBUS_ADAPTOR(kcallpart_PART_SRCS + + KDE4_ADD_PLUGIN(kcallpart WITH_PREFIX ${kcallpart_PART_SRCS}) + +-TARGET_LINK_LIBRARIES(kcallpart ${KDE4_KDECORE_LIBS} kcall ) ++TARGET_LINK_LIBRARIES(kcallpart ${KDE4_KPARTS_LIBS} kcall ) + + INSTALL(TARGETS kcallpart DESTINATION ${PLUGIN_INSTALL_DIR}) + +Index: kcall/kcallcore.cpp +=================================================================== +--- kcall/kcallcore.cpp.orig +++ kcall/kcallcore.cpp +@@ -273,7 +273,7 @@ void KCallCore::initActions() + */ + + /* mActionEditAddressee = coll->addAction( "file_properties" ); +- mActionEditAddressee->setIcon( KIcon("edit") ); ++ mActionEditAddressee->setIcon( KIcon("document-properties") ); + mActionEditAddressee->setText( i18n( "&Edit Contact..." ) ); + connect(mActionEditAddressee, SIGNAL(triggered(bool) ), SLOT( editContact() )); + mActionEditAddressee->setWhatsThis( i18n( "Edit a contact<p>You will be presented with a dialog where you can change all data about a person, including addresses and phone numbers." ) ); @@ -294,7 +294,7 @@ void KCallCore::initActions() // misc /* QAction *clearLocation = coll->addAction( "clear_search" ); - clearLocation->setIcon( KIcon(QApplication::isRightToLeft() ? "clear-left" : "locationbar-erase") ); -+ clearLocation->setIcon( KIcon(QApplication::isRightToLeft() ? "edit-clear-locationbar-rtl" : "edit-clear-locationbar") ); ++ clearLocation->setIcon( KIcon(QApplication::isRightToLeft() ? "edit-clear-locationbar-rtl" : "edit-clear-locationbar-ltr") ); clearLocation->setText( i18n( "Clear Search Bar" ) ); connect(clearLocation, SIGNAL(triggered(bool) ), SLOT( slotClearSearchBar() )); clearLocation->setShortcut(QKeySequence(Qt::CTRL+Qt::Key_L)); ---- kcall/vcardview.cpp +Index: kcall/vcardview.cpp +=================================================================== +--- kcall/vcardview.cpp.orig +++ kcall/vcardview.cpp @@ -63,7 +63,7 @@ VCardView::VCardView(HistoryModel * cons ui.vcText->hide(); @@ -72,7 +100,9 @@ ui.vcPicture->setPixmap( photo ); kDebug() << ui.vcPicture->size()<< endl; } ---- CMakeLists.txt +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt.orig +++ CMakeLists.txt @@ -1,20 +1,18 @@ PROJECT(kcall) @@ -97,9 +127,11 @@ OPTION(KCALL_ENABLE_KONTACT_PLUGIN "enable building of kontact plugin (unstable)" ---- applet/kcall/kcallapplet.desktop +Index: applet/kcall/kcallapplet.desktop +=================================================================== +--- applet/kcall/kcallapplet.desktop.orig +++ applet/kcall/kcallapplet.desktop -@@ -6,7 +6,7 @@ +@@ -6,7 +6,7 @@ Name[sv]=Kcall Name[tr]=K Çağrı Name[xx]=xxKCallxx Exec=kcallapplet @@ -108,9 +140,11 @@ Type=Application NoDisplay=true Terminal=false ---- applet/kcall/CMakeLists.txt +Index: applet/kcall/CMakeLists.txt +=================================================================== +--- applet/kcall/CMakeLists.txt.orig +++ applet/kcall/CMakeLists.txt -@@ -38,7 +38,7 @@ +@@ -38,7 +38,7 @@ TARGET_LINK_LIBRARIES(kcallapplet ${KDE4_KDEUI_LIBS} ) @@ -119,7 +153,9 @@ ########### install files ############### ---- kcall/kontactplugin/kcallplugin.desktop +Index: kcall/kontactplugin/kcallplugin.desktop +=================================================================== +--- kcall/kontactplugin/kcallplugin.desktop.orig +++ kcall/kontactplugin/kcallplugin.desktop @@ -1,7 +1,7 @@ [Desktop Entry] @@ -130,9 +166,11 @@ ServiceTypes=Kontact/Plugin,KPluginInfo X-KDE-Library=libkontact_kcallplugin ---- kcall/main.cpp +Index: kcall/main.cpp +=================================================================== +--- kcall/main.cpp.orig +++ kcall/main.cpp -@@ -129,6 +129,7 @@ +@@ -129,6 +129,7 @@ int main( int argc, char *argv[] ) return 0; KCallApp app; @@ -140,40 +178,11 @@ KGlobal::locale()->insertCatalog( "libkdepim" ); bool ret = app.exec(); ---- kcall/CMakeLists.txt -+++ kcall/CMakeLists.txt -@@ -92,7 +92,7 @@ - ${KDE4_KHTML_LIBS} - ${DECIBEL_LDFLAGS}) - --INSTALL(TARGETS kcall_bin DESTINATION ${BIN_INSTALL_DIR} ) -+INSTALL(TARGETS kcall_bin ${INSTALL_TARGETS_DEFAULT_ARGS} ) - - ########### next target ############### - ---- kcall/kcallcore.cpp -+++ kcall/kcallcore.cpp -@@ -273,7 +273,7 @@ - */ - - /* mActionEditAddressee = coll->addAction( "file_properties" ); -- mActionEditAddressee->setIcon( KIcon("edit") ); -+ mActionEditAddressee->setIcon( KIcon("document-properties") ); - mActionEditAddressee->setText( i18n( "&Edit Contact..." ) ); - connect(mActionEditAddressee, SIGNAL(triggered(bool) ), SLOT( editContact() )); - mActionEditAddressee->setWhatsThis( i18n( "Edit a contact<p>You will be presented with a dialog where you can change all data about a person, including addresses and phone numbers." ) ); -@@ -294,7 +294,7 @@ - - // misc - /* QAction *clearLocation = coll->addAction( "clear_search" ); -- clearLocation->setIcon( KIcon(QApplication::isRightToLeft() ? "edit-clear-locationbar-rtl" : "edit-clear-locationbar") ); -+ clearLocation->setIcon( KIcon(QApplication::isRightToLeft() ? "edit-clear-locationbar-rtl" : "edit-clear-locationbar-ltr") ); - clearLocation->setText( i18n( "Clear Search Bar" ) ); - connect(clearLocation, SIGNAL(triggered(bool) ), SLOT( slotClearSearchBar() )); - clearLocation->setShortcut(QKeySequence(Qt::CTRL+Qt::Key_L)); ---- kcall/kcall.desktop +Index: kcall/kcall.desktop +=================================================================== +--- kcall/kcall.desktop.orig +++ kcall/kcall.desktop -@@ -6,7 +6,7 @@ +@@ -6,7 +6,7 @@ Name[pa]=ਕੇ-ਕਾਲ Name[tr]=kçağrı Name[xx]=xxkcallxx Exec=kcall %i %m -caption "%c" @@ -182,25 +191,3 @@ Categories=Network;Telephony; Type=Application DocPath=kcall/kcall.html ---- kcall/CMakeLists.txt -+++ kcall/CMakeLists.txt -@@ -104,7 +104,7 @@ - - KDE4_ADD_PLUGIN(kcallpart WITH_PREFIX ${kcallpart_PART_SRCS}) - --TARGET_LINK_LIBRARIES(kcallpart ${KDE4_KDECORE_LIBS} kcall ) -+TARGET_LINK_LIBRARIES(kcallpart ${KDE4_KPARTS_LIBS} kcall ) - - 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