rpms/kpackagekit/devel kpackagekit-0.5.0-defaults_hacks.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 kpackagekit.spec, 1.45, 1.46 sources, 1.22, 1.23 kpackagekit-0.4.1-i18n.patch, 1.1, NONE
Steven M. Parrish
tuxbrewr at fedoraproject.org
Sat Oct 24 00:37:52 UTC 2009
- Previous message (by thread): rpms/sip/devel .cvsignore, 1.32, 1.33 sip.spec, 1.66, 1.67 sources, 1.33, 1.34
- Next message (by thread): rpms/PyQt4/devel .cvsignore, 1.14, 1.15 PyQt4.spec, 1.32, 1.33 sources, 1.14, 1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: tuxbrewr
Update of /cvs/pkgs/rpms/kpackagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv596
Modified Files:
.cvsignore kpackagekit.spec sources
Added Files:
kpackagekit-0.5.0-defaults_hacks.patch
Removed Files:
kpackagekit-0.4.1-i18n.patch
Log Message:
Official 0.5.0.1 release
kpackagekit-0.5.0-defaults_hacks.patch:
KPackageKitD/kpackagekitd.cpp | 4 !!!!
Settings/KpkSettings.cpp | 4 ++--
SmartIcon/KpkUpdateIcon.cpp | 2 !!
libkpackagekit/KpkEnum.h | 4 !!!!
4 files changed, 2 insertions(+), 2 deletions(-), 10 modifications(!)
--- NEW FILE kpackagekit-0.5.0-defaults_hacks.patch ---
diff -crB kpackagekit-0.5.0/KPackageKitD/kpackagekitd.cpp kpackagekit-0.5.0-fedora/KPackageKitD/kpackagekitd.cpp
*** kpackagekit-0.5.0/KPackageKitD/kpackagekitd.cpp 2009-10-20 10:10:15.000000000 -0400
--- kpackagekit-0.5.0-fedora/KPackageKitD/kpackagekitd.cpp 2009-10-20 11:56:54.000000000 -0400
***************
*** 80,86 ****
KConfig config("KPackageKit");
KConfigGroup checkUpdateGroup(&config, "CheckUpdate");
// default to one day, 86400 sec
! uint interval = checkUpdateGroup.readEntry("interval", KpkEnum::TimeIntervalDefault);
// 1160 -> 15 minutes
if (((m_client->getTimeSinceAction(Client::ActionRefreshCache) - interval > 1160) && interval != 0 )
--- 80,86 ----
KConfig config("KPackageKit");
KConfigGroup checkUpdateGroup(&config, "CheckUpdate");
// default to one day, 86400 sec
! const uint interval = checkUpdateGroup.readEntry("interval", KpkEnum::TimeIntervalDefault);
// 1160 -> 15 minutes
if (((m_client->getTimeSinceAction(Client::ActionRefreshCache) - interval > 1160) && interval != 0 )
***************
*** 112,118 ****
KConfig config("KPackageKit");
KConfigGroup checkUpdateGroup( &config, "CheckUpdate" );
// default to one day, 86400 sec
! int interval = checkUpdateGroup.readEntry("interval", KpkEnum::TimeIntervalDefault);
int actRefreshCache = m_client->getTimeSinceAction(Client::ActionRefreshCache);
if (interval == KpkEnum::Never) {
return;
--- 112,118 ----
KConfig config("KPackageKit");
KConfigGroup checkUpdateGroup( &config, "CheckUpdate" );
// default to one day, 86400 sec
! const uint interval = checkUpdateGroup.readEntry("interval", KpkEnum::TimeIntervalDefault);
int actRefreshCache = m_client->getTimeSinceAction(Client::ActionRefreshCache);
if (interval == KpkEnum::Never) {
return;
diff -crB kpackagekit-0.5.0/libkpackagekit/KpkEnum.h kpackagekit-0.5.0-fedora/libkpackagekit/KpkEnum.h
*** kpackagekit-0.5.0/libkpackagekit/KpkEnum.h 2009-10-20 10:10:16.000000000 -0400
--- kpackagekit-0.5.0-fedora/libkpackagekit/KpkEnum.h 2009-10-20 11:58:34.000000000 -0400
***************
*** 28,34 ****
Security,
All
} AutoUpdate;
! const int AutoUpdateDefault = None;
typedef enum {
Never = 0,
--- 28,34 ----
Security,
All
} AutoUpdate;
! const uint AutoUpdateDefault = None;
typedef enum {
Never = 0,
***************
*** 37,43 ****
Weekly = 604800,
Monthly = 2628000
} TimeInterval;
! const int TimeIntervalDefault = Weekly;
}
--- 37,43 ----
Weekly = 604800,
Monthly = 2628000
} TimeInterval;
! const uint TimeIntervalDefault = Daily;
}
diff -crB kpackagekit-0.5.0/Settings/KpkSettings.cpp kpackagekit-0.5.0-fedora/Settings/KpkSettings.cpp
*** kpackagekit-0.5.0/Settings/KpkSettings.cpp 2009-10-20 10:10:15.000000000 -0400
--- kpackagekit-0.5.0-fedora/Settings/KpkSettings.cpp 2009-10-20 12:01:21.000000000 -0400
***************
*** 57,71 ****
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("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(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()));
--- 57,71 ----
originGB->setEnabled(false);
}
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);
connect(notifyUpdatesCB, SIGNAL(stateChanged(int)), this, SLOT(checkChanges()));
connect(notifyLongTasksCB, SIGNAL(stateChanged(int)), this, SLOT(checkChanges()));
diff -crB kpackagekit-0.5.0/SmartIcon/KpkUpdateIcon.cpp kpackagekit-0.5.0-fedora/SmartIcon/KpkUpdateIcon.cpp
*** kpackagekit-0.5.0/SmartIcon/KpkUpdateIcon.cpp 2009-10-20 10:10:14.000000000 -0400
--- kpackagekit-0.5.0-fedora/SmartIcon/KpkUpdateIcon.cpp 2009-10-20 12:04:35.000000000 -0400
***************
*** 215,221 ****
// m_icon->show();
KConfig config("KPackageKit");
KConfigGroup checkUpdateGroup(&config, "CheckUpdate");
! uint updateType = (uint) checkUpdateGroup.readEntry("autoUpdate", KpkEnum::AutoUpdateDefault);
if (updateType == KpkEnum::None) {
// update none
notifyUpdates();
--- 215,221 ----
// m_icon->show();
KConfig config("KPackageKit");
KConfigGroup checkUpdateGroup(&config, "CheckUpdate");
! const uint updateType = (uint) checkUpdateGroup.readEntry("autoUpdate", KpkEnum::AutoUpdateDefault);
if (updateType == KpkEnum::None) {
// update none
notifyUpdates();
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore 19 Aug 2009 14:53:16 -0000 1.14
+++ .cvsignore 24 Oct 2009 00:37:51 -0000 1.15
@@ -1 +1 @@
-kpackagekit-0.5.0.tar.bz2
+kpackagekit-0.5.0.1.tar.bz2
Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/kpackagekit.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- kpackagekit.spec 15 Sep 2009 14:50:25 -0000 1.45
+++ kpackagekit.spec 24 Oct 2009 00:37:51 -0000 1.46
@@ -1,21 +1,20 @@
-%define pk_version 0.5.2
+%define pk_version 0.5.3
Name: kpackagekit
-Version: 0.5.0
-Release: 0.1.20090915svn%{?dist}
+Version: 0.5.0.1
+Release: 1%{?dist}
Summary: KDE interface for PackageKit
License: GPLv2+
Group: Applications/System
#Source0: http://www.kde-apps.org/CONTENT/content-files/84745-kpackagekit-%{version}.tar.bz2
-Source0: kpackagekit-0.5.0.tar.bz2
+Source0: kpackagekit-0.5.0.1.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
-#Patch100: kpackagekit-InitialPreference.patch
-Patch102: kpackagekit-0.4.1-i18n.patch
+#Hacks to smash kpackagekit: daily/none default (#469375)
+Patch50: kpackagekit-0.5.0-defaults_hacks.patch
BuildRequires: cmake
BuildRequires: desktop-file-utils
@@ -34,8 +33,7 @@ KDE interface for PackageKit.
%prep
%setup -q -n %{name}-%{version}
-#patch100 -p0 -b .InitialPreference
-%patch102 -p1 -b .i18n
+%patch50 -p1 -b .defaults_hacks
%build
@@ -79,6 +77,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Oct 20 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.0.1-1
+- Official 0.5.0.1 release
+- Includes patch to fix (#469375) default/none issue
+
* Tue Sep 15 2009 Steven M. Parrish <smparrish at gmail.com> - 0.5.0-0.1.20090915svn
- New git snapshot
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources 15 Sep 2009 14:50:25 -0000 1.22
+++ sources 24 Oct 2009 00:37:51 -0000 1.23
@@ -1 +1 @@
-6eb244d6297a980d85aa580748444d6a kpackagekit-0.5.0.tar.bz2
+5c4cd44083e6dcce59011bb83029eb3b kpackagekit-0.5.0.1.tar.bz2
--- kpackagekit-0.4.1-i18n.patch DELETED ---
- Previous message (by thread): rpms/sip/devel .cvsignore, 1.32, 1.33 sip.spec, 1.66, 1.67 sources, 1.33, 1.34
- Next message (by thread): rpms/PyQt4/devel .cvsignore, 1.14, 1.15 PyQt4.spec, 1.32, 1.33 sources, 1.14, 1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list