Hello community,
here is the log from the commit of package kdelibs4 for openSUSE:Factory
checked in at 2015-12-17 15:53:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdelibs4 (Old)
and /work/SRC/openSUSE:Factory/.kdelibs4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdelibs4"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4.changes 2015-11-24
22:21:31.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4.changes 2015-12-17
15:53:09.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Dec 9 12:27:46 UTC 2015 - tchva...@suse.com
+
+- Use yast2 sw_single package instead of invoking zypper in
+ interactive mode. bnc#858018
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
kdelibs4.spec: same change
++++++ ksuseinstall.diff ++++++
--- /var/tmp/diff_new_pack.4BiE1e/_old 2015-12-17 15:53:11.000000000 +0100
+++ /var/tmp/diff_new_pack.4BiE1e/_new 2015-12-17 15:53:11.000000000 +0100
@@ -1,7 +1,8 @@
-diff -urNB kdelibs-4.14.11/CMakeLists.txt b/CMakeLists.txt
---- CMakeLists.txt 2015-08-19 00:10:55.000000000 +0200
-+++ CMakeLists.txt 2015-08-24 19:13:06.490904619 +0200
-@@ -317,6 +317,7 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -317,6 +317,7 @@ check_library_exists(socket connect "" H
add_subdirectory( cmake )
add_subdirectory( kdecore )
add_subdirectory( kdeui )
@@ -9,10 +10,11 @@
if (UNIX)
add_subdirectory( kpty )
add_subdirectory( kdesu )
-diff -urNB kdelibs-4.14.11/kio/CMakeLists.txt b/kio/CMakeLists.txt
---- kio/CMakeLists.txt 2015-08-19 00:10:55.000000000 +0200
-+++ kio/CMakeLists.txt 2015-08-24 19:13:06.491904624 +0200
-@@ -44,6 +44,7 @@
+Index: kio/CMakeLists.txt
+===================================================================
+--- kio/CMakeLists.txt.orig
++++ kio/CMakeLists.txt
+@@ -44,6 +44,7 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}/kssl
${CMAKE_CURRENT_BINARY_DIR} # e.g. for observer_stub.h
${KDE4_KDEUI_INCLUDES}
@@ -20,7 +22,7 @@
${KDE4_KDECORE_INCLUDES}/
${ZLIB_INCLUDE_DIR}
-@@ -333,6 +334,7 @@
+@@ -333,6 +334,7 @@ if(NOT KIO_NO_NEPOMUK)
endif(NOT KIO_NO_NEPOMUK)
target_link_libraries(kio LINK_PRIVATE ${KDE4_KDEUI_LIBS} ${ZLIB_LIBRARY}
${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY}
${X11_LIBRARIES} ${KIO_EXTRA_LIBS})
target_link_libraries(kio LINK_PUBLIC kdeui kdecore ${QT_QTNETWORK_LIBRARY}
${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY} )
@@ -28,9 +30,10 @@
if(ACL_FOUND)
target_link_libraries(kio LINK_PRIVATE ${ACL_LIBS})
-diff -urNB kdelibs-4.14.11/kio/kio/krun.cpp b/kio/kio/krun.cpp
---- kio/kio/krun.cpp 2015-08-19 00:10:55.000000000 +0200
-+++ kio/kio/krun.cpp 2015-08-24 19:13:06.491904624 +0200
+Index: kio/kio/krun.cpp
+===================================================================
+--- kio/kio/krun.cpp.orig
++++ kio/kio/krun.cpp
@@ -84,6 +84,8 @@
#include <QDesktopServices>
#endif
@@ -40,7 +43,7 @@
KRun::KRunPrivate::KRunPrivate(KRun *parent)
: q(parent),
m_showingDialog(false)
-@@ -172,6 +174,7 @@
+@@ -172,6 +174,7 @@ bool KRun::runUrl(const KUrl& u, const Q
KUrl::List lst;
lst.append(u);
@@ -48,9 +51,10 @@
KService::Ptr offer =
KMimeTypeTrader::self()->preferredService(_mimetype);
if (!offer) {
-diff -urNB kdelibs-4.14.11/suseinstall/CMakeLists.txt
b/suseinstall/CMakeLists.txt
---- suseinstall/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
-+++ suseinstall/CMakeLists.txt 2015-08-24 19:13:06.492904628 +0200
+Index: suseinstall/CMakeLists.txt
+===================================================================
+--- /dev/null
++++ suseinstall/CMakeLists.txt
@@ -0,0 +1,27 @@
+#cmake_minimum_required( VERSION 2.6 )
+
@@ -79,9 +83,10 @@
+ DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
+ )
+
-diff -urNB kdelibs-4.14.11/suseinstall/kbuildsycocaprogressdialog.cpp
b/suseinstall/kbuildsycocaprogressdialog.cpp
---- suseinstall/kbuildsycocaprogressdialog.cpp 1970-01-01 01:00:00.000000000
+0100
-+++ suseinstall/kbuildsycocaprogressdialog.cpp 2015-08-24 19:13:06.492904628
+0200
+Index: suseinstall/kbuildsycocaprogressdialog.cpp
+===================================================================
+--- /dev/null
++++ suseinstall/kbuildsycocaprogressdialog.cpp
@@ -0,0 +1,110 @@
+/* This file is part of the KDE project
+ Copyright (C) 2003 Waldo Bastian <bast...@kde.org>
@@ -193,9 +198,10 @@
+}
+
+#include "kbuildsycocaprogressdialog.moc"
-diff -urNB kdelibs-4.14.11/suseinstall/kbuildsycocaprogressdialog.h
b/suseinstall/kbuildsycocaprogressdialog.h
---- suseinstall/kbuildsycocaprogressdialog.h 1970-01-01 01:00:00.000000000
+0100
-+++ suseinstall/kbuildsycocaprogressdialog.h 2015-08-24 19:13:06.492904628
+0200
+Index: suseinstall/kbuildsycocaprogressdialog.h
+===================================================================
+--- /dev/null
++++ suseinstall/kbuildsycocaprogressdialog.h
@@ -0,0 +1,60 @@
+/* This file is part of the KDE project
+ Copyright (C) 2003 Waldo Bastian <bast...@kde.org>
@@ -257,9 +263,10 @@
+}
+
+#endif
-diff -urNB kdelibs-4.14.11/suseinstall/ksuseinstall.cpp
b/suseinstall/ksuseinstall.cpp
---- suseinstall/ksuseinstall.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ suseinstall/ksuseinstall.cpp 2015-08-24 19:13:06.493904632 +0200
+Index: suseinstall/ksuseinstall.cpp
+===================================================================
+--- /dev/null
++++ suseinstall/ksuseinstall.cpp
@@ -0,0 +1,583 @@
+/*****************************************************************************
+
@@ -545,14 +552,14 @@
+
+bool KSUSEInstall::installPackages( const QStringList& packages, QWidget*
parent )
+ {
-+ KProcess proc;
++ KProcess proc;
+ QString kdesu = KStandardDirs::findExe( "kdesu" );
+ if( kdesu.isEmpty())
+ return false;
+ proc << kdesu << "--noignorebutton";
+ if( parent != NULL )
+ proc << "--attach" << QString::number( parent->window()->winId());
-+ proc << "--" << "zypper" << "--non-interactive" << "install" <<
"--force-resolution" << packages;
++ proc << "--" << "yast2" << "sw_single" << packages;
+ return run( proc );
+ }
+
@@ -844,9 +851,10 @@
+ {
+ description->setText( descriptions[ list->indexOfTopLevelItem(
list->currentItem()) ] );
+ }
-diff -urNB kdelibs-4.14.11/suseinstall/ksuseinstall_export.h
b/suseinstall/ksuseinstall_export.h
---- suseinstall/ksuseinstall_export.h 1970-01-01 01:00:00.000000000 +0100
-+++ suseinstall/ksuseinstall_export.h 2015-08-24 19:13:06.494904636 +0200
+Index: suseinstall/ksuseinstall_export.h
+===================================================================
+--- /dev/null
++++ suseinstall/ksuseinstall_export.h
@@ -0,0 +1,40 @@
+/*****************************************************************************
+
@@ -888,9 +896,10 @@
+#endif
+
+#endif
-diff -urNB kdelibs-4.14.11/suseinstall/ksuseinstall.h
b/suseinstall/ksuseinstall.h
---- suseinstall/ksuseinstall.h 1970-01-01 01:00:00.000000000 +0100
-+++ suseinstall/ksuseinstall.h 2015-08-24 19:13:06.494904636 +0200
+Index: suseinstall/ksuseinstall.h
+===================================================================
+--- /dev/null
++++ suseinstall/ksuseinstall.h
@@ -0,0 +1,93 @@
+/*****************************************************************************
+
