Hello community, here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at 2014-11-19 20:24:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-apidocs.changes 2014-10-16 18:11:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4-apidocs.changes 2014-11-19 20:27:18.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Nov 9 20:23:05 UTC 2014 - tittiatc...@gmail.com + +- Update to 4.14.3 + * KDE 4.14.3 SC Bugfix Release + * See http://www.kde.org/announcements/announce-4.14.3.php + +- Drop patch utilize_xdg_runtime_dir.patch due to upstream inclusion +------------------------------------------------------------------- @@ -6,0 +15,3 @@ +- Add upstream patch utilize_xdg_runtime_dir.patch to create + temporary sockets in the XDG_RUNTIME_DIR. This should make + the system more responsive during high IO load --- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4.changes 2014-10-16 18:11:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4.changes 2014-11-19 20:27:19.000000000 +0100 @@ -1,0 +2,28 @@ +Tue Nov 18 10:23:11 UTC 2014 - wba...@tmo.at + +- ksuseinstall.diff: use zypper instead of yast to install packages. + "yast -i" is deprecated, and just calls "zypper --non-interactive install" + on 13.2. But this fails to install the packages when there are + conflicts (e.g. a vendor change is needed), so added the + "--force-resolution" option as well. (boo#858018) + +------------------------------------------------------------------- +Sat Nov 15 15:20:56 UTC 2014 - wba...@tmo.at + +- adapt ksuseinstall to changes in zypper's output in openSUSE 13.1. + This fixes the installation of packages. (boo#858018) + +------------------------------------------------------------------- +Mon Nov 10 02:20:00 UTC 2014 - Led <led...@gmail.com> + +- fix bashisms in post/postun scripts + +------------------------------------------------------------------- +Sun Nov 9 20:23:05 UTC 2014 - tittiatc...@gmail.com + +- Update to 4.14.3 + * KDE 4.14.3 SC Bugfix Release + * See http://www.kde.org/announcements/announce-4.14.3.php + +- Drop patch utilize_xdg_runtime_dir.patch due to upstream inclusion +------------------------------------------------------------------- Old: ---- kdelibs-4.14.2.tar.xz utilize_xdg_runtime_dir.patch New: ---- kdelibs-4.14.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4-apidocs.spec ++++++ --- /var/tmp/diff_new_pack.UEU3Td/_old 2014-11-19 20:27:20.000000000 +0100 +++ /var/tmp/diff_new_pack.UEU3Td/_new 2014-11-19 20:27:20.000000000 +0100 @@ -17,7 +17,7 @@ Name: kdelibs4-apidocs -Version: 4.14.2 +Version: 4.14.3 Release: 0 Summary: KDE 4 API documentation License: LGPL-2.1+ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.UEU3Td/_old 2014-11-19 20:27:20.000000000 +0100 +++ /var/tmp/diff_new_pack.UEU3Td/_new 2014-11-19 20:27:20.000000000 +0100 @@ -20,7 +20,7 @@ %bcond_with gendoxygen Name: kdelibs4 -Version: 4.14.2 +Version: 4.14.3 Release: 0 BuildRequires: OpenEXR-devel BuildRequires: automoc4 @@ -90,8 +90,6 @@ # PATCH-FIX-OPENSUSE 0001-Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES.patch -- Nepomuk is only used in a private header, browserrun_p.h, # thus it is not needed as KParts public dependancy, makes it possible to drop libsoprano-devel from libkde4-devel Requires Patch15: 0001-Drop-Nepomuk-from-KParts-LINK_INTERFACE_LIBRARIES.patch -# PATCH-FIX-UPSTREAM Utilize the XDG_RUNTIME_DIR for temporary sockets -Patch16: utilize_xdg_runtime_dir.patch PreReq: permissions Requires: libattica0_4 >= %( echo `rpm -q --queryformat '%{VERSION}' libattica-devel`) Recommends: media-player-info @@ -151,7 +149,6 @@ %patch11 -p1 %patch12 -p1 %patch15 -p1 -%patch16 -p1 %build EXTRA_FLAGS="-DLIB_INSTALL_DIR=%{_kde4_libdir} \ @@ -208,13 +205,13 @@ %post /sbin/ldconfig -%{_kde4_bindir}/update-mime-database %{_datadir}/mime &> /dev/null || : +%{_kde4_bindir}/update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : %set_permissions %{_kde4_libexecdir}/start_kdeinit %postun /sbin/ldconfig -%{_kde4_bindir}/update-mime-database %{_datadir}/mime &> /dev/null || : +%{_kde4_bindir}/update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : %verifyscript %verify_permissions -e %{_kde4_libexecdir}/start_kdeinit ++++++ kdelibs-4.14.2.tar.xz -> kdelibs-4.14.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/kdelibs4/kdelibs-4.14.2.tar.xz /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs-4.14.3.tar.xz differ: char 27, line 1 ++++++ ksuseinstall.diff ++++++ --- /var/tmp/diff_new_pack.UEU3Td/_old 2014-11-19 20:27:20.000000000 +0100 +++ /var/tmp/diff_new_pack.UEU3Td/_new 2014-11-19 20:27:20.000000000 +0100 @@ -267,7 +267,7 @@ =================================================================== --- /dev/null +++ suseinstall/ksuseinstall.cpp -@@ -0,0 +1,579 @@ +@@ -0,0 +1,583 @@ +/***************************************************************************** + +Copyright (C) 2010 Lubos Lunak <l.lu...@suse.cz> @@ -559,7 +559,7 @@ + proc << kdesu << "--noignorebutton"; + if( parent != NULL ) + proc << "--attach" << QString::number( parent->window()->winId()); -+ proc << "--" << "yast2" << "-i" << packages; ++ proc << "--" << "zypper" << "--non-interactive" << "install" << "--force-resolution" << packages; + return run( proc ); + } + @@ -622,13 +622,17 @@ + // "S | Name | Type | Version | Arch | Repository" + QStringList tmp = line.split( '|' ); + if( tmp.count() < 3 || tmp[ 0 ].trimmed() != "S" || tmp[ 1 ].trimmed() != "Name" || tmp[ 2 ].trimmed() != "Type" ) -+ return QList< PackageInstallData >(); // TODO ++ // new format since 13.1: "S | Name | Summary | Type" ++ if( tmp.count() < 4 || tmp[ 0 ].trimmed() != "S" || tmp[ 1 ].trimmed() != "Name" || tmp[ 3 ].trimmed() != "Type" ) ++ return QList< PackageInstallData >(); // TODO + lines.removeFirst(); // header separator line + QList< PackageInstallData > possibilities; + QString previous; + foreach( const QString& line, lines ) + { + QStringList tmp = line.split( '|' ); ++ if( tmp.count() == 4) // new format ++ tmp.removeAt(2); // remove "Summary" column to bring it in line with older format + if( tmp.count() < 3 ) + continue; // huh? + if( tmp[ 2 ].trimmed() != "package" ) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
