[kpackagekit] New 0.6.1 release
Steven M. Parrish
tuxbrewr at fedoraproject.org
Tue Sep 7 13:18:02 UTC 2010
commit 30d60917395507f542cc69d54b35207c9be6e363
Author: Stephen Parrish <smparrish at maltose.sugarlabs.org>
Date: Tue Sep 7 09:18:04 2010 -0400
New 0.6.1 release
.gitignore | 1 +
...> kpackagekit-0.6.1-InstallPrinterDrivers.patch | 192 ++++++++++----------
...patch => kpackagekit-0.6.1-defaults_hacks.patch | 70 ++++----
kpackagekit.spec | 20 +-
sources | 2 +-
5 files changed, 146 insertions(+), 139 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 025cbc4..ad03e3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
kpackagekit-0.6.0.tar.gz
+/kpackagekit-0.6.1.tar.bz2
diff --git a/kpackagekit-0.6.0-InstallPrinterDrivers.patch b/kpackagekit-0.6.1-InstallPrinterDrivers.patch
similarity index 52%
rename from kpackagekit-0.6.0-InstallPrinterDrivers.patch
rename to kpackagekit-0.6.1-InstallPrinterDrivers.patch
index e447e93..e410385 100644
--- a/kpackagekit-0.6.0-InstallPrinterDrivers.patch
+++ b/kpackagekit-0.6.1-InstallPrinterDrivers.patch
@@ -1,24 +1,25 @@
-diff -Nur KPackageKit-0.6.0/SmartIcon/CMakeLists.txt KPackageKit-0.6.0-InstallPrinterDrivers/SmartIcon/CMakeLists.txt
---- KPackageKit-0.6.0/SmartIcon/CMakeLists.txt 2009-12-07 19:31:35.000000000 +0100
-+++ KPackageKit-0.6.0-InstallPrinterDrivers/SmartIcon/CMakeLists.txt 2010-03-26 21:38:24.000000000 +0100
-@@ -20,6 +20,7 @@
+diff -Nur kpackagekit-0.6.1/SmartIcon/CMakeLists.txt kpackagekit-0.6.1-fedora/SmartIcon/CMakeLists.txt
+--- kpackagekit-0.6.1/SmartIcon/CMakeLists.txt 2010-09-01 15:01:53.722408360 -0400
++++ kpackagekit-0.6.1-fedora/SmartIcon/CMakeLists.txt 2010-09-07 07:23:56.232370743 -0400
+@@ -18,6 +18,7 @@
PkInstallProvideFiles.cpp
PkInstallCatalogs.cpp
PkRemovePackageByFiles.cpp
+ PkInstallPrinterDrivers.cpp
+ KPackageKitSmartIcon.cpp
+ main.cpp
)
-
- qt4_add_dbus_adaptor(kpackagekit_smart_dbus_SRCS
-@@ -53,4 +54,4 @@
+@@ -54,4 +55,5 @@
include(PkgConfigGetVar)
dbus_add_activation_service(org.kde.KPackageKitSmartIcon.service.in)
-dbus_add_activation_service(org.freedesktop.PackageKit.service.in)
\ No newline at end of file
+dbus_add_activation_service(org.freedesktop.PackageKit.service.in)
-diff -Nur KPackageKit-0.6.0/SmartIcon/org.freedesktop.PackageKit.xml KPackageKit-0.6.0-InstallPrinterDrivers/SmartIcon/org.freedesktop.PackageKit.xml
---- KPackageKit-0.6.0/SmartIcon/org.freedesktop.PackageKit.xml 2009-12-07 19:31:35.000000000 +0100
-+++ KPackageKit-0.6.0-InstallPrinterDrivers/SmartIcon/org.freedesktop.PackageKit.xml 2010-03-26 21:38:24.000000000 +0100
++
+diff -Nur kpackagekit-0.6.1/SmartIcon/org.freedesktop.PackageKit.xml kpackagekit-0.6.1-fedora/SmartIcon/org.freedesktop.PackageKit.xml
+--- kpackagekit-0.6.1/SmartIcon/org.freedesktop.PackageKit.xml 2010-09-01 15:01:53.735404410 -0400
++++ kpackagekit-0.6.1-fedora/SmartIcon/org.freedesktop.PackageKit.xml 2010-09-07 07:32:22.066363493 -0400
@@ -450,6 +450,48 @@
</doc:doc>
</arg>
@@ -33,12 +34,12 @@ diff -Nur KPackageKit-0.6.0/SmartIcon/org.freedesktop.PackageKit.xml KPackageKit
+ </doc:para>
+ </doc:description>
+ </doc:doc>
-+ <arg type="u" name="xid" direction="in">
-+ <doc:doc>
-+ <doc:summary>
-+ <doc:para>
-+ The X window handle ID, used for focus stealing prevention and setting modality.
-+ </doc:para>
++ <arg type="u" name="xid" direction="in">
++ <doc:doc>
++ <doc:summary>
++ <doc:para>
++ The X window handle ID, used for focus stealing prevention and setting modality.
++ </doc:para>
+ </doc:summary>
+ </doc:doc>
+ </arg>
@@ -68,29 +69,29 @@ diff -Nur KPackageKit-0.6.0/SmartIcon/org.freedesktop.PackageKit.xml KPackageKit
</interface>
</node>
-diff -Nur KPackageKit-0.6.0/SmartIcon/PkInstallPrinterDrivers.cpp KPackageKit-0.6.0-InstallPrinterDrivers/SmartIcon/PkInstallPrinterDrivers.cpp
---- KPackageKit-0.6.0/SmartIcon/PkInstallPrinterDrivers.cpp 1970-01-01 01:00:00.000000000 +0100
-+++ KPackageKit-0.6.0-InstallPrinterDrivers/SmartIcon/PkInstallPrinterDrivers.cpp 2010-03-26 21:39:26.000000000 +0100
-@@ -0,0 +1,128 @@
-+/***************************************************************************
-+ * Copyright (C) 2009-2010 by Daniel Nicoletti *
-+ * dantti85-pk at yahoo.com.br *
-+ * *
-+ * This program is free software; you can redistribute it and/or modify *
-+ * it under the terms of the GNU General Public License as published by *
-+ * the Free Software Foundation; either version 2 of the License, or *
-+ * (at your option) any later version. *
-+ * *
-+ * This program is distributed in the hope that it will be useful, *
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
-+ * GNU General Public License for more details. *
-+ * *
-+ * You should have received a copy of the GNU General Public License *
-+ * along with this program; see the file COPYING. If not, write to *
-+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, *
-+ * Boston, MA 02110-1301, USA. *
-+ ***************************************************************************/
+diff -Nur kpackagekit-0.6.1/SmartIcon/PkInstallPrinterDrivers.cpp kpackagekit-0.6.1-fedora/SmartIcon/PkInstallPrinterDrivers.cpp
+--- kpackagekit-0.6.1/SmartIcon/PkInstallPrinterDrivers.cpp 1969-12-31 19:00:00.000000000 -0500
++++ kpackagekit-0.6.1-fedora/SmartIcon/PkInstallPrinterDrivers.cpp 2010-09-07 07:43:41.611373511 -0400
+@@ -0,0 +1,129 @@
++/**************************************************************************
++* Copyright (C) 2009-2010 by Daniel Nicoletti *
++* dantti85-pk at yahoo.com.br *
++* *
++* This program is free software; you can redistribute it and/or modify *
++* it under the terms of the GNU General Public License as published by *
++* the Free Software Foundation; either version 2 of the License, or *
++* (at your option) any later version. *
++* *
++* This program is distributed in the hope that it will be useful, *
++* but WITHOUT ANY WARRANTY; without even the implied warranty of *
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
++* GNU General Public License for more details. *
++* *
++* You should have received a copy of the GNU General Public License *
++* along with this program; see the file COPYING. If not, write to *
++* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, *
++* Boston, MA 02110-1301, USA. *
++***************************************************************************/
+
+#include "PkInstallPrinterDrivers.h"
+
@@ -106,10 +107,10 @@ diff -Nur KPackageKit-0.6.0/SmartIcon/PkInstallPrinterDrivers.cpp KPackageKit-0.
+#include <QTextStream>
+
+PkInstallPrinterDrivers::PkInstallPrinterDrivers(uint xid,
-+ const QStringList &resources,
-+ const QString &interaction,
-+ const QDBusMessage &message,
-+ QWidget *parent)
++ const QStringList &resources,
++ const QString &interaction,
++ const QDBusMessage &message,
++ QWidget *parent)
+ : KpkAbstractTask(xid, interaction, message, parent),
+ m_resources(resources)
+{
@@ -123,46 +124,46 @@ diff -Nur KPackageKit-0.6.0/SmartIcon/PkInstallPrinterDrivers.cpp KPackageKit-0.
+{
+ QStringList search;
+ foreach (const QString &deviceid, m_resources) {
-+ QString mfg, mdl;
-+ QStringList fields = deviceid.split(';');
-+ foreach (const QString &field, fields) {
-+ QString keyvalue = field.trimmed();
-+ if (keyvalue.startsWith("MFG:"))
-+ mfg = keyvalue.mid(4);
-+ else if (keyvalue.startsWith("MDL:"))
-+ mdl = keyvalue.mid(4);
-+ }
++ QString mfg, mdl;
++ QStringList fields = deviceid.split(';');
++ foreach (const QString &field, fields) {
++ QString keyvalue = field.trimmed();
++ if (keyvalue.startsWith("MFG:"))
++ mfg = keyvalue.mid(4);
++ else if (keyvalue.startsWith("MDL:"))
++ mdl = keyvalue.mid(4);
++ }
+
-+ if (!mfg.isEmpty() && !mdl.isEmpty()) {
-+ QString prov;
-+ QTextStream out(&prov);
-+ out << mfg.toLower().replace(' ', '_') << ';'
-+ << mdl.toLower().replace(' ', '_') << ';';
-+ search << prov;
-+ }
++ if (!mfg.isEmpty() && !mdl.isEmpty()) {
++ QString prov;
++ QTextStream out(&prov);
++ out << mfg.toLower().replace(' ', '_') << ';'
++ << mdl.toLower().replace(' ', '_') << ';';
++ search << prov;
++ }
+ }
+
+ Transaction *t = Client::instance()->whatProvides(Enum::ProvidesPostscriptDriver,
-+ search,
-+ Enum::FilterNotInstalled |
-+ Enum::FilterArch |
-+ Enum::FilterNewest);
++ search,
++ Enum::FilterNotInstalled |
++ Enum::FilterArch |
++ Enum::FilterNewest);
+ if (t->error()) {
-+ QString msg(i18n("Failed to search for provides"));
-+ KMessageBox::sorry(0,
-+ KpkStrings::daemonError(t->error()),
-+ msg);
-+ sendErrorFinished(InternalError, msg);
++ QString msg(i18n("Failed to search for provides"));
++ KMessageBox::sorry(0,
++ KpkStrings::daemonError(t->error()),
++ msg);
++ sendErrorFinished(InternalError, msg);
+ } else {
-+ connect(t, SIGNAL(finished(PackageKit::Enum::Exit, uint)),
-+ this, SLOT(whatProvidesFinished(PackageKit::Enum::Exit, uint)));
-+ connect(t, SIGNAL(package(PackageKit::QSharedPointer<PackageKit::Package>)),
-+ this, SLOT(addPackage(PackageKit::QSharedPointer<PackageKit::Package>)));
-+ if (showProgress()) {
-+ KpkTransaction *trans;
-+ trans = new KpkTransaction(t, KpkTransaction::CloseOnFinish);
-+ trans->show();
-+ }
++ connect(t, SIGNAL(finished(PackageKit::Enum::Exit, uint)),
++ this, SLOT(whatProvidesFinished(PackageKit::Enum::Exit, uint)));
++ connect(t, SIGNAL(package(PackageKit::QSharedPointer<PackageKit::Package>)),
++ this, SLOT(addPackage(PackageKit::QSharedPointer<PackageKit::Package>)));
++ if (showProgress()) {
++ KpkTransaction *trans;
++ trans = new KpkTransaction(t, KpkTransaction::CloseOnFinish);
++ trans->show();
++ }
+ }
+}
+
@@ -173,8 +174,8 @@ diff -Nur KPackageKit-0.6.0/SmartIcon/PkInstallPrinterDrivers.cpp KPackageKit-0.
+ if (status == Enum::ExitSuccess) {
+ if (m_foundPackages.size()) {
+ KpkReviewChanges *frm = new KpkReviewChanges(m_foundPackages);
-+ frm->setTitle(i18np("Do you want to install this package now?",
-+ "Do you want to install these packages now?", m_foundPackages.size()));
++/* frm->setTitle(i18np("Do you want to install this package now?",
++ "Do you want to install these packages now?", m_foundPackages.size())); */
+ if (frm->exec(operationModes()) == 0) {
+ sendErrorFinished(Failed, "Transaction did not finish with success");
+ } else {
@@ -200,10 +201,11 @@ diff -Nur KPackageKit-0.6.0/SmartIcon/PkInstallPrinterDrivers.cpp KPackageKit-0.
+}
+
+#include "PkInstallPrinterDrivers.moc"
-diff -Nur KPackageKit-0.6.0/SmartIcon/PkInstallPrinterDrivers.h KPackageKit-0.6.0-InstallPrinterDrivers/SmartIcon/PkInstallPrinterDrivers.h
---- KPackageKit-0.6.0/SmartIcon/PkInstallPrinterDrivers.h 1970-01-01 01:00:00.000000000 +0100
-+++ KPackageKit-0.6.0-InstallPrinterDrivers/SmartIcon/PkInstallPrinterDrivers.h 2010-03-26 21:38:24.000000000 +0100
-@@ -0,0 +1,53 @@
++
+diff -Nur kpackagekit-0.6.1/SmartIcon/PkInstallPrinterDrivers.h kpackagekit-0.6.1-fedora/SmartIcon/PkInstallPrinterDrivers.h
+--- kpackagekit-0.6.1/SmartIcon/PkInstallPrinterDrivers.h 1969-12-31 19:00:00.000000000 -0500
++++ kpackagekit-0.6.1-fedora/SmartIcon/PkInstallPrinterDrivers.h 2010-09-07 07:47:40.768368673 -0400
+@@ -0,0 +1,54 @@
+/***************************************************************************
+ * Copyright (C) 2009-2010 by Daniel Nicoletti *
+ * dantti85-pk at yahoo.com.br *
@@ -238,10 +240,10 @@ diff -Nur KPackageKit-0.6.0/SmartIcon/PkInstallPrinterDrivers.h KPackageKit-0.6.
+Q_OBJECT
+public:
+ PkInstallPrinterDrivers(uint xid,
-+ const QStringList &resources,
-+ const QString &interaction,
-+ const QDBusMessage &message,
-+ QWidget *parent = 0);
++ const QStringList &resources,
++ const QString &interaction,
++ const QDBusMessage &message,
++ QWidget *parent = 0);
+ ~PkInstallPrinterDrivers();
+
+public slots:
@@ -257,9 +259,10 @@ diff -Nur KPackageKit-0.6.0/SmartIcon/PkInstallPrinterDrivers.h KPackageKit-0.6.
+};
+
+#endif
-diff -Nur KPackageKit-0.6.0/SmartIcon/PkInterface.cpp KPackageKit-0.6.0-InstallPrinterDrivers/SmartIcon/PkInterface.cpp
---- KPackageKit-0.6.0/SmartIcon/PkInterface.cpp 2010-03-19 22:14:58.000000000 +0100
-+++ KPackageKit-0.6.0-InstallPrinterDrivers/SmartIcon/PkInterface.cpp 2010-03-26 21:38:24.000000000 +0100
++
+diff -Nur kpackagekit-0.6.1/SmartIcon/PkInterface.cpp kpackagekit-0.6.1-fedora/SmartIcon/PkInterface.cpp
+--- kpackagekit-0.6.1/SmartIcon/PkInterface.cpp 2010-09-01 15:01:53.721406532 -0400
++++ kpackagekit-0.6.1-fedora/SmartIcon/PkInterface.cpp 2010-09-07 07:50:13.967356696 -0400
@@ -35,6 +35,7 @@
#include "PkInstallProvideFiles.h"
#include "PkInstallCatalogs.h"
@@ -268,7 +271,7 @@ diff -Nur KPackageKit-0.6.0/SmartIcon/PkInterface.cpp KPackageKit-0.6.0-InstallP
#include "PkIsInstalled.h"
#include "PkSearchFile.h"
-@@ -148,6 +149,18 @@
+@@ -148,6 +149,17 @@
task->run();
}
@@ -283,13 +286,12 @@ diff -Nur KPackageKit-0.6.0/SmartIcon/PkInterface.cpp KPackageKit-0.6.0-InstallP
+ task->run();
+}
+
-+
//Query
bool PkInterface::IsInstalled(const QString &package_name, const QString &interaction)
{
-diff -Nur KPackageKit-0.6.0/SmartIcon/PkInterface.h KPackageKit-0.6.0-InstallPrinterDrivers/SmartIcon/PkInterface.h
---- KPackageKit-0.6.0/SmartIcon/PkInterface.h 2009-12-07 19:31:35.000000000 +0100
-+++ KPackageKit-0.6.0-InstallPrinterDrivers/SmartIcon/PkInterface.h 2010-03-26 21:38:24.000000000 +0100
+diff -Nur kpackagekit-0.6.1/SmartIcon/PkInterface.h kpackagekit-0.6.1-fedora/SmartIcon/PkInterface.h
+--- kpackagekit-0.6.1/SmartIcon/PkInterface.h 2010-09-01 15:01:53.701408882 -0400
++++ kpackagekit-0.6.1-fedora/SmartIcon/PkInterface.h 2010-09-07 07:51:40.092368087 -0400
@@ -41,6 +41,7 @@
void InstallPackageNames(uint xid, const QStringList &packages, const QString &interaction);
void InstallProvideFiles(uint xid, const QStringList &files, const QString &interaction);
diff --git a/kpackagekit-0.6.0-defaults_hacks.patch b/kpackagekit-0.6.1-defaults_hacks.patch
similarity index 68%
rename from kpackagekit-0.6.0-defaults_hacks.patch
rename to kpackagekit-0.6.1-defaults_hacks.patch
index dcb3961..6167024 100644
--- a/kpackagekit-0.6.0-defaults_hacks.patch
+++ b/kpackagekit-0.6.1-defaults_hacks.patch
@@ -1,6 +1,6 @@
-diff -crB KPackageKit-0.6.0/KPackageKitD/kpackagekitd.cpp KPackageKit-0.6.0-fedora/KPackageKitD/kpackagekitd.cpp
-*** KPackageKit-0.6.0/KPackageKitD/kpackagekitd.cpp 2010-03-19 17:14:58.000000000 -0400
---- KPackageKit-0.6.0-fedora/KPackageKitD/kpackagekitd.cpp 2010-03-26 13:20:11.435888242 -0400
+diff -crB kpackagekit-0.6.1/KPackageKitD/kpackagekitd.cpp kpackagekit-0.6.1-fedora2/KPackageKitD/kpackagekitd.cpp
+*** kpackagekit-0.6.1/KPackageKitD/kpackagekitd.cpp 2010-09-01 15:01:53.859380113 -0400
+--- kpackagekit-0.6.1-fedora2/KPackageKitD/kpackagekitd.cpp 2010-09-07 08:34:39.263358911 -0400
***************
*** 82,88 ****
KConfig config("KPackageKit");
@@ -14,7 +14,7 @@ diff -crB KPackageKit-0.6.0/KPackageKitD/kpackagekitd.cpp KPackageKit-0.6.0-fedo
KConfig config("KPackageKit");
KConfigGroup checkUpdateGroup(&config, "CheckUpdate");
// default to one day, 86400 sec
-! const int interval = checkUpdateGroup.readEntry("interval", KpkEnum::TimeIntervalDefault);
+! const uint interval = checkUpdateGroup.readEntry("interval", KpkEnum::TimeIntervalDefault);
if (!canRefreshCache()) {
//if the backend does not suport refreshing cache let's don't do nothing
@@ -35,11 +35,11 @@ diff -crB KPackageKit-0.6.0/KPackageKitD/kpackagekitd.cpp KPackageKit-0.6.0-fedo
int actRefreshCache = getTimeSinceRefreshCache();
if (interval == KpkEnum::Never) {
return;
-diff -crB KPackageKit-0.6.0/libkpackagekit/KpkEnum.h KPackageKit-0.6.0-fedora/libkpackagekit/KpkEnum.h
-*** KPackageKit-0.6.0/libkpackagekit/KpkEnum.h 2009-11-17 07:32:14.000000000 -0500
---- KPackageKit-0.6.0-fedora/libkpackagekit/KpkEnum.h 2010-03-26 13:21:38.627899382 -0400
+diff -crB kpackagekit-0.6.1/libkpackagekit/KpkEnum.h kpackagekit-0.6.1-fedora2/libkpackagekit/KpkEnum.h
+*** kpackagekit-0.6.1/libkpackagekit/KpkEnum.h 2010-09-01 15:01:54.197372754 -0400
+--- kpackagekit-0.6.1-fedora2/libkpackagekit/KpkEnum.h 2010-09-07 08:36:04.199370892 -0400
***************
-*** 28,34 ****
+*** 36,42 ****
Security,
All
} AutoUpdate;
@@ -47,7 +47,7 @@ diff -crB KPackageKit-0.6.0/libkpackagekit/KpkEnum.h KPackageKit-0.6.0-fedora/li
typedef enum {
Never = 0,
---- 28,34 ----
+--- 36,42 ----
Security,
All
} AutoUpdate;
@@ -56,7 +56,7 @@ diff -crB KPackageKit-0.6.0/libkpackagekit/KpkEnum.h KPackageKit-0.6.0-fedora/li
typedef enum {
Never = 0,
***************
-*** 37,43 ****
+*** 45,51 ****
Weekly = 604800,
Monthly = 2628000
} TimeInterval;
@@ -64,19 +64,19 @@ diff -crB KPackageKit-0.6.0/libkpackagekit/KpkEnum.h KPackageKit-0.6.0-fedora/li
}
---- 37,43 ----
+--- 45,51 ----
Weekly = 604800,
Monthly = 2628000
} TimeInterval;
-! const uint TimeIntervalDefault = Daily;
+! const int TimeIntervalDefault = Daily;
}
-diff -crB KPackageKit-0.6.0/Settings/KpkSettings.cpp KPackageKit-0.6.0-fedora/Settings/KpkSettings.cpp
-*** KPackageKit-0.6.0/Settings/KpkSettings.cpp 2010-03-19 17:14:58.000000000 -0400
---- KPackageKit-0.6.0-fedora/Settings/KpkSettings.cpp 2010-03-26 13:25:01.541886572 -0400
+diff -crB kpackagekit-0.6.1/Settings/SettingsKCM.cpp kpackagekit-0.6.1-fedora2/Settings/SettingsKCM.cpp
+*** kpackagekit-0.6.1/Settings/SettingsKCM.cpp 2010-09-01 15:01:53.808371838 -0400
+--- kpackagekit-0.6.1-fedora2/Settings/SettingsKCM.cpp 2010-09-07 08:42:55.378373501 -0400
***************
-*** 61,75 ****
+*** 76,91 ****
originGB->setEnabled(false);
}
@@ -88,11 +88,12 @@ diff -crB KPackageKit-0.6.0/Settings/KpkSettings.cpp KPackageKit-0.6.0-fedora/Se
autoCB->addItem(i18n("Security only"), KpkEnum::Security);
autoCB->addItem(i18n("All updates"), KpkEnum::All);
-- autoCB->addItem(i18nc("None updates will be automatically installed", "None"), KpkEnum::None);
-
+! autoCB->addItem(i18nc("None updates will be automatically installed", "None"), KpkEnum::None);
+!
+ connect(autoConfirmCB, SIGNAL(stateChanged(int)), this, SLOT(checkChanges()));
connect(notifyUpdatesCB, SIGNAL(stateChanged(int)), this, SLOT(checkChanges()));
connect(intervalCB, SIGNAL(currentIndexChanged(int)), this, SLOT(checkChanges()));
---- 61,75 ----
+--- 76,91 ----
originGB->setEnabled(false);
}
@@ -102,29 +103,30 @@ diff -crB KPackageKit-0.6.0/Settings/KpkSettings.cpp KPackageKit-0.6.0-fedora/Se
intervalCB->addItem(i18nc("Monthly refresh the package cache", "Monthly"), KpkEnum::Monthly);
intervalCB->addItem(i18nc("Never refresh package cache", "Never"), KpkEnum::Never);
-+ autoCB->addItem(i18n("No updates will be automatically installed", "None"), KpkEnum::None);
++ autoCB->addItem(i18n("No updates will be automatically installed", "None"), KpkEnum::None);
autoCB->addItem(i18n("Security only"), KpkEnum::Security);
autoCB->addItem(i18n("All updates"), KpkEnum::All);
-
+!
+ connect(autoConfirmCB, SIGNAL(stateChanged(int)), this, SLOT(checkChanges()));
connect(notifyUpdatesCB, SIGNAL(stateChanged(int)), this, SLOT(checkChanges()));
connect(intervalCB, SIGNAL(currentIndexChanged(int)), this, SLOT(checkChanges()));
-diff -crB KPackageKit-0.6.0/SmartIcon/KpkUpdateIcon.cpp KPackageKit-0.6.0-fedora/SmartIcon/KpkUpdateIcon.cpp
-*** KPackageKit-0.6.0/SmartIcon/KpkUpdateIcon.cpp 2010-03-19 17:14:58.000000000 -0400
---- KPackageKit-0.6.0-fedora/SmartIcon/KpkUpdateIcon.cpp 2010-03-26 13:26:16.601138308 -0400
+diff -crB kpackagekit-0.6.1/SmartIcon/KpkUpdateIcon.cpp kpackagekit-0.6.1-fedora2/SmartIcon/KpkUpdateIcon.cpp
+*** kpackagekit-0.6.1/SmartIcon/KpkUpdateIcon.cpp 2010-09-01 15:01:53.726409185 -0400
+--- kpackagekit-0.6.1-fedora2/SmartIcon/KpkUpdateIcon.cpp 2010-09-07 08:44:25.758371912 -0400
***************
-*** 240,246 ****
- // m_icon->show();
+*** 173,179 ****
+
KConfig config("KPackageKit");
KConfigGroup checkUpdateGroup(&config, "CheckUpdate");
! uint updateType = static_cast<uint>(checkUpdateGroup.readEntry("autoUpdate", KpkEnum::AutoUpdateDefault));
- if (updateType == KpkEnum::None) {
- // update none
- notifyUpdates();
---- 240,246 ----
- // m_icon->show();
+ if (updateType == KpkEnum::All) {
+ // update all
+ SET_PROXY
+--- 173,179 ----
+
KConfig config("KPackageKit");
KConfigGroup checkUpdateGroup(&config, "CheckUpdate");
! const uint updateType = static_cast<uint>(checkUpdateGroup.readEntry("autoUpdate", KpkEnum::AutoUpdateDefault));
- if (updateType == KpkEnum::None) {
- // update none
- notifyUpdates();
+ if (updateType == KpkEnum::All) {
+ // update all
+ SET_PROXY
diff --git a/kpackagekit.spec b/kpackagekit.spec
index 292026d..9373de0 100644
--- a/kpackagekit.spec
+++ b/kpackagekit.spec
@@ -1,16 +1,15 @@
-
%define pk_min_version 0.6.2
-%define snap 20100301svn
+%define snap 20100827
Name: kpackagekit
-Version: 0.6.0
-Release: 2%{?dist}
+Version: 0.6.1
+Release: 1%{?dist}
Summary: KDE interface for PackageKit
License: GPLv2+
Group: Applications/System
-Source0: kpackagekit-%{version}.tar.gz
+Source0: kpackagekit-%{version}.tar.bz2
# Use this config for the create_tarball.rb script:
# [kpackagekit]
# mainmodule = playground
@@ -19,15 +18,15 @@ Source0: kpackagekit-%{version}.tar.gz
# version = 20100301svn
# docs = no
# translations = yes
-#Source0: kpackagekit-%{snap}.tar.bz2
+#Source0: kpackagekit-0.6.1-%{snap}.tar.bz2
URL: http://www.kde-apps.org/content/show.php/KPackageKit?content=84745
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# add support for automatic printer driver installation (Tim Waugh, #576615)
-Patch0: kpackagekit-0.6.0-InstallPrinterDrivers.patch
+Patch0: kpackagekit-0.6.1-InstallPrinterDrivers.patch
#Hacks to smash kpackagekit: daily/none default (#469375)
-Patch50: kpackagekit-0.6.0-defaults_hacks.patch
+Patch50: kpackagekit-0.6.1-defaults_hacks.patch
# required because gnome-packagekit provides exactly the same interface
Provides: PackageKit-session-service
@@ -50,7 +49,7 @@ KDE interface for PackageKit.
%prep
-%setup -q -n KPackageKit-%{version}
+%setup -q -n kpackagekit-%{version}
%patch0 -p1 -b .InstallPrinterDrivers
%patch50 -p1 -b .defaults_hacks
@@ -100,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Sep 07 2010 Steven M. Parrish <smparrish at gmail.com> - 0.6.1-1
+- New upstream release
+
* Fri Mar 26 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.6.0-2
- rebase InstallPrinterDrivers patch
- readd disttag
diff --git a/sources b/sources
index d643869..459f873 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f28c2b12aeed808a6823005fe1521e32 kpackagekit-0.6.0.tar.gz
+f2328020d40245af2b9b0b42c32a9cca kpackagekit-0.6.1.tar.bz2
More information about the scm-commits
mailing list