Hello community, here is the log from the commit of package kpackagekit for openSUSE:Factory checked in at Mon Mar 21 15:30:33 CET 2011.
-------- --- KDE/kpackagekit/kpackagekit.changes 2011-02-21 09:12:34.000000000 +0100 +++ /mounts/work_src_done/STABLE/kpackagekit/kpackagekit.changes 2011-03-21 10:21:00.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 21 09:18:22 UTC 2011 - [email protected] + +- fix the smolt diff and obsolete ksmolt, also run it on factory + with its test updates installed + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpackagekit.spec ++++++ --- /var/tmp/diff_new_pack.aOjEtv/_old 2011-03-21 15:29:35.000000000 +0100 +++ /var/tmp/diff_new_pack.aOjEtv/_new 2011-03-21 15:29:35.000000000 +0100 @@ -20,7 +20,7 @@ Name: kpackagekit Version: 0.6.3.3 -Release: 9 +Release: 10 License: GPLv3 Group: System/Packages #http://websvn.kde.org/trunk/playground/sysadmin/kpackagekit/ @@ -40,6 +40,7 @@ Obsoletes: kde4-opensuse-updater < 0.8 Obsoletes: kupjk +Obsoletes: ksmolt = 0.2.3 %kde4_runtime_requires %description ++++++ smolt.diff ++++++ --- /var/tmp/diff_new_pack.aOjEtv/_old 2011-03-21 15:29:35.000000000 +0100 +++ /var/tmp/diff_new_pack.aOjEtv/_new 2011-03-21 15:29:35.000000000 +0100 @@ -1,6 +1,8 @@ iff -rupN kpackagekit-0.6.2/Updater/CMakeLists.txt kpackagekit-0.6.2/Updater/CMakeLists.txt ---- kpackagekit-0.6.2/Updater/CMakeLists.txt 2010-10-06 01:39:37.000000000 +0200 -+++ kpackagekit-0.6.2/Updater/CMakeLists.txt 2010-12-07 14:08:32.392749646 +0100 +Index: kpackagekit-0.6.3.3/Updater/CMakeLists.txt +=================================================================== +--- kpackagekit-0.6.3.3.orig/Updater/CMakeLists.txt 2011-01-03 18:58:18.000000000 +0100 ++++ kpackagekit-0.6.3.3/Updater/CMakeLists.txt 2011-03-21 10:09:04.241991433 +0100 @@ -1,6 +1,7 @@ set(kpk_update_SRCS KpkUpdateDetails.cpp @@ -9,9 +11,10 @@ KpkCheckableHeader.cpp UpdateKCM.cpp ) -diff -rupN kpackagekit-0.6.2/Updater/KpkSmolt.cpp kpackagekit-0.6.2/Updater/KpkSmolt.cpp ---- kpackagekit-0.6.2/Updater/KpkSmolt.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ kpackagekit-0.6.2/Updater/KpkSmolt.cpp 2010-12-07 17:17:58.220827849 +0100 +Index: kpackagekit-0.6.3.3/Updater/KpkSmolt.cpp +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ kpackagekit-0.6.3.3/Updater/KpkSmolt.cpp 2011-03-21 10:09:04.241991433 +0100 @@ -0,0 +1,91 @@ +#include "KpkSmolt.h" + @@ -104,9 +107,10 @@ +} + +#include "KpkSmolt.moc" -diff -rupN kpackagekit-0.6.2/Updater/KpkSmolt.h kpackagekit-0.6.2/Updater/KpkSmolt.h ---- kpackagekit-0.6.2/Updater/KpkSmolt.h 1970-01-01 01:00:00.000000000 +0100 -+++ kpackagekit-0.6.2/Updater/KpkSmolt.h 2010-12-07 17:32:58.951283331 +0100 +Index: kpackagekit-0.6.3.3/Updater/KpkSmolt.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ kpackagekit-0.6.3.3/Updater/KpkSmolt.h 2011-03-21 10:09:04.242991563 +0100 @@ -0,0 +1,30 @@ +#ifndef KPK_SMOLT_H +#define KPK_SMOLT_H @@ -138,9 +142,10 @@ +}; + +#endif -diff -rupN kpackagekit-0.6.2/Updater/UpdateKCM.cpp kpackagekit-0.6.2/Updater/UpdateKCM.cpp ---- kpackagekit-0.6.2/Updater/UpdateKCM.cpp 2010-10-06 01:39:37.000000000 +0200 -+++ kpackagekit-0.6.2/Updater/UpdateKCM.cpp 2010-12-07 17:28:15.190025226 +0100 +Index: kpackagekit-0.6.3.3/Updater/UpdateKCM.cpp +=================================================================== +--- kpackagekit-0.6.3.3.orig/Updater/UpdateKCM.cpp 2011-01-03 18:58:18.000000000 +0100 ++++ kpackagekit-0.6.3.3/Updater/UpdateKCM.cpp 2011-03-21 10:18:07.231681034 +0100 @@ -22,6 +22,7 @@ #include "KpkUpdateDetails.h" @@ -149,7 +154,7 @@ #include "KpkMacros.h" #include "KpkCheckableHeader.h" -@@ -130,6 +131,7 @@ UpdateKCM::UpdateKCM(QWidget *&parent, c +@@ -139,6 +140,7 @@ UpdateKCM::UpdateKCM(QWidget *&parent, c checkUpdatesPB->setIcon(KIcon("view-refresh")); connect(checkUpdatesPB, SIGNAL(clicked(bool)), this, SLOT(refreshCache())); @@ -157,7 +162,7 @@ } UpdateKCM::~UpdateKCM() -@@ -169,6 +171,50 @@ void UpdateKCM::distroUpgrade(PackageKit +@@ -184,6 +186,44 @@ void UpdateKCM::distroUpgrade(PackageKit line->show(); } @@ -172,19 +177,13 @@ + if (! smoltGroup.readEntry("ShowSmoltNotification", true) ) + return; + -+ // run on opensuse only (not on sled) -+ QFile file( "/usr/share/applications/YaST2/suse_register.desktop" ); -+ if (! file.exists() ) -+ return; -+ + // check if smolt is installed -+ QFile execfile( "/usr/bin/smoltGui" ); -+ if (! execfile.exists() ) ++ if (! QFile::exists( "/usr/bin/smoltGui" )) + return; + + // run only if needed dummy file exists -+ QFile smoltdummyfile( "/var/run/smolt_do_opensuse_run" ); -+ if (! smoltdummyfile.exists() ) ++ if (! QFile::exists( "/var/run/smolt_do_opensuse_run") && ++ ! QFile::exists( "/usr/share/doc/packages/update-test-feature/README.update-test-feature") ) + return; + + smolt(); @@ -208,7 +207,7 @@ void UpdateKCM::checkEnableUpdateButton() { emit changed(m_updatesModel->hasChanges()); -@@ -206,6 +252,8 @@ void UpdateKCM::getUpdatesFinished(Enum: +@@ -221,6 +261,8 @@ void UpdateKCM::getUpdatesFinished(Enum: m_updatesT = 0; m_updatesModel->clearSelectedNotPresent(); checkEnableUpdateButton(); @@ -217,10 +216,11 @@ } void UpdateKCM::save() -diff -rupN kpackagekit-0.6.2/Updater/UpdateKCM.h kpackagekit-0.6.2/Updater/UpdateKCM.h ---- kpackagekit-0.6.2/Updater/UpdateKCM.h 2010-10-06 01:39:37.000000000 +0200 -+++ kpackagekit-0.6.2/Updater/UpdateKCM.h 2010-12-07 16:49:46.854025164 +0100 -@@ -52,6 +52,9 @@ private slots: +Index: kpackagekit-0.6.3.3/Updater/UpdateKCM.h +=================================================================== +--- kpackagekit-0.6.3.3.orig/Updater/UpdateKCM.h 2011-01-03 18:58:18.000000000 +0100 ++++ kpackagekit-0.6.3.3/Updater/UpdateKCM.h 2011-03-21 10:09:04.263994227 +0100 +@@ -51,6 +51,9 @@ private slots: void on_packageView_customContextMenuRequested(const QPoint &pos); void distroUpgrade(PackageKit::Enum::DistroUpgrade type, const QString &name, const QString &description); @@ -230,4 +230,3 @@ void getUpdates(); void getUpdatesFinished(PackageKit::Enum::Exit status); - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
