rpms/kpackagekit/F-11 kpackagekit-0.4.2-defaults_hacks.patch, NONE, 1.1 kpackagekit.spec, 1.38, 1.39
Rex Dieter
rdieter at fedoraproject.org
Tue Oct 6 19:37:56 UTC 2009
- Previous message (by thread): rpms/kpackagekit/F-11 kpackagekit-InitialPreference.patch,1.2,1.3
- Next message (by thread): rpms/fapg/F-10 fapg.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/kpackagekit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28566
Modified Files:
kpackagekit.spec
Added Files:
kpackagekit-0.4.2-defaults_hacks.patch
Log Message:
* Tue Oct 06 2009 Rex Dieter <rdieter at fedoraproject.org> 0.4.2-1
- Patch to workaround kpackagekit: daily/none default (#469375)
kpackagekit-0.4.2-defaults_hacks.patch:
KPackageKitD/kpackagekitd.cpp | 4 ++--
Settings/KpkSettings.cpp | 4 ++--
SmartIcon/KpkUpdateIcon.cpp | 2 +-
libkpackagekit/KpkEnum.h | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
--- NEW FILE kpackagekit-0.4.2-defaults_hacks.patch ---
diff -up kpackagekit-0.4.2/KPackageKitD/kpackagekitd.cpp.rex kpackagekit-0.4.2/KPackageKitD/kpackagekitd.cpp
--- kpackagekit-0.4.2/KPackageKitD/kpackagekitd.cpp.rex 2009-08-12 13:04:35.000000000 -0500
+++ kpackagekit-0.4.2/KPackageKitD/kpackagekitd.cpp 2009-10-06 14:14:21.619436676 -0500
@@ -73,7 +73,7 @@ void KPackageKitD::init()
KConfig config("KPackageKit");
KConfigGroup checkUpdateGroup(&config, "CheckUpdate");
// default to one day, 86400 sec
- uint interval = checkUpdateGroup.readEntry("interval", KpkEnum::TimeIntervalDefault);
+ const uint interval = checkUpdateGroup.readEntry("interval", KpkEnum::TimeIntervalDefault);
// 1160 -> 15 minutes
if (((m_client->getTimeSinceAction(Client::ActionRefreshCache) - interval > 1160) && interval != 0 )
@@ -105,7 +105,7 @@ void KPackageKitD::read()
KConfig config("KPackageKit");
KConfigGroup checkUpdateGroup( &config, "CheckUpdate" );
// default to one day, 86400 sec
- int interval = checkUpdateGroup.readEntry("interval", KpkEnum::TimeIntervalDefault);
+ const uint interval = checkUpdateGroup.readEntry("interval", KpkEnum::TimeIntervalDefault);
int actRefreshCache = m_client->getTimeSinceAction(Client::ActionRefreshCache);
if (interval == KpkEnum::Never) {
return;
diff -up kpackagekit-0.4.2/libkpackagekit/KpkEnum.h.rex kpackagekit-0.4.2/libkpackagekit/KpkEnum.h
--- kpackagekit-0.4.2/libkpackagekit/KpkEnum.h.rex 2009-08-12 13:04:37.000000000 -0500
+++ kpackagekit-0.4.2/libkpackagekit/KpkEnum.h 2009-10-06 14:14:21.619436676 -0500
@@ -28,7 +28,7 @@ namespace KpkEnum {
Security,
All
} AutoUpdate;
- const int AutoUpdateDefault = None;
+ const uint AutoUpdateDefault = None;
typedef enum {
Never = 0,
@@ -37,7 +37,7 @@ namespace KpkEnum {
Weekly = 604800,
Monthly = 2628000
} TimeInterval;
- const int TimeIntervalDefault = Weekly;
+ const uint TimeIntervalDefault = Daily;
}
diff -up kpackagekit-0.4.2/Settings/KpkSettings.cpp.rex kpackagekit-0.4.2/Settings/KpkSettings.cpp
--- kpackagekit-0.4.2/Settings/KpkSettings.cpp.rex 2009-08-12 13:04:35.000000000 -0500
+++ kpackagekit-0.4.2/Settings/KpkSettings.cpp 2009-10-06 14:14:21.619436676 -0500
@@ -57,15 +57,15 @@ KpkSettings::KpkSettings(QWidget *parent
originGB->setEnabled(false);
}
- intervalCB->addItem(i18nc("Hourly refresh the package cache", "Hourly"), KpkEnum::Hourly);
intervalCB->addItem(i18nc("Daily refresh the package cache", "Daily"), KpkEnum::Daily);
+ intervalCB->addItem(i18nc("Hourly refresh the package cache", "Hourly"), KpkEnum::Hourly);
intervalCB->addItem(i18nc("Weekly refresh the package cache", "Weekly"), KpkEnum::Weekly);
intervalCB->addItem(i18nc("Monthly refresh the package cache", "Monthly"), KpkEnum::Monthly);
intervalCB->addItem(i18nc("Never refresh package cache", "Never"), KpkEnum::Never);
+ autoCB->addItem(i18nc("None updates will be automatically installed", "None"), KpkEnum::None);
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);
connect(notifyUpdatesCB, SIGNAL(stateChanged(int)), this, SLOT(checkChanges()));
connect(notifyLongTasksCB, SIGNAL(stateChanged(int)), this, SLOT(checkChanges()));
diff -up kpackagekit-0.4.2/SmartIcon/KpkUpdateIcon.cpp.rex kpackagekit-0.4.2/SmartIcon/KpkUpdateIcon.cpp
--- kpackagekit-0.4.2/SmartIcon/KpkUpdateIcon.cpp.rex 2009-08-12 13:04:35.000000000 -0500
+++ kpackagekit-0.4.2/SmartIcon/KpkUpdateIcon.cpp 2009-10-06 14:14:21.620436594 -0500
@@ -216,7 +216,7 @@ void KpkUpdateIcon::updateCheckFinished(
// m_icon->show();
KConfig config("KPackageKit");
KConfigGroup checkUpdateGroup(&config, "CheckUpdate");
- uint updateType = (uint) checkUpdateGroup.readEntry("autoUpdate", KpkEnum::AutoUpdateDefault);
+ const uint updateType = (uint) checkUpdateGroup.readEntry("autoUpdate", KpkEnum::AutoUpdateDefault);
if (updateType == KpkEnum::None) {
// kDebug() << "None.";
notifyUpdates();
Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/F-11/kpackagekit.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- kpackagekit.spec 12 Aug 2009 22:44:56 -0000 1.38
+++ kpackagekit.spec 6 Oct 2009 19:37:56 -0000 1.39
@@ -3,7 +3,7 @@
Name: kpackagekit
Version: 0.4.2
-Release: 0%{?dist}
+Release: 1%{?dist}
Summary: KDE interface for PackageKit
License: GPLv2+
@@ -13,8 +13,12 @@ Source0: kpackagekit-0.4.2.tar.bz2
URL: http://www.kde-apps.org/content/show.php/KPackageKit?content=84745
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# upstream me, says the patch
+
+#Hacks to smash kpackagekit: daily/none default (#469375)
+Patch50: kpackagekit-0.4.2-defaults_hacks.patch
+
Patch100: kpackagekit-InitialPreference.patch
+# upstream me, says the patch
Patch102: kpackagekit-0.4.1-i18n.patch
BuildRequires: cmake
@@ -34,6 +38,7 @@ KDE interface for PackageKit.
%prep
%setup -q -n %{name}-%{version}
+%patch50 -p1 -b .defaults_hacks
%patch100 -p0 -b .InitialPreference
%patch102 -p1 -b .i18n
@@ -79,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Oct 06 2009 Rex Dieter <rdieter at fedoraproject.org> 0.4.2-1
+- Patch to workaround kpackagekit: daily/none default (#469375)
+
* Wed Aug 12 2009 Steven M. Parrish <smparrish at gmail.com> 0.4.2-0
- New upstream release
- Previous message (by thread): rpms/kpackagekit/F-11 kpackagekit-InitialPreference.patch,1.2,1.3
- Next message (by thread): rpms/fapg/F-10 fapg.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list