rpms/kpackagekit/F-10 kpackagekit-0.3.1-defaults.patch, NONE, 1.1 kpackagekit.spec, 1.14, 1.15

[Steven M. Parrish]

Author: tuxbrewr

Update of /cvs/pkgs/rpms/kpackagekit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18817

Modified Files:
	kpackagekit.spec 
Added Files:
	kpackagekit-0.3.1-defaults.patch 
Log Message:
Set defaults to NONE

kpackagekit-0.3.1-defaults.patch:

--- NEW FILE kpackagekit-0.3.1-defaults.patch ---
diff -crB KPackageKit/KPackageKit/KpkSmartUpdate.cpp KPackageKit-fedora/KPackageKit/KpkSmartUpdate.cpp
*** KPackageKit/KPackageKit/KpkSmartUpdate.cpp	2008-10-15 18:38:27.000000000 -0400
--- KPackageKit-fedora/KPackageKit/KpkSmartUpdate.cpp	2008-12-08 18:34:42.000000000 -0500
***************
*** 44,50 ****
  	m_running = true;
  	KConfig config("KPackageKit");
  	KConfigGroup checkUpdateGroup( &config, "CheckUpdate" );
! 	m_autoUpdateType = checkUpdateGroup.readEntry( "autoUpdate", SECURITY );
  	packages.clear();
  	if ( m_autoUpdateType == NONE ) {
  	    emit showUpdates();
--- 44,50 ----
  	m_running = true;
  	KConfig config("KPackageKit");
  	KConfigGroup checkUpdateGroup( &config, "CheckUpdate" );
! 	m_autoUpdateType = checkUpdateGroup.readEntry( "autoUpdate", NONE );
  	packages.clear();
  	if ( m_autoUpdateType == NONE ) {
  	    emit showUpdates();
Only in KPackageKit-fedora/KPackageKit: KpkSmartUpdate.cpp~
diff -crB KPackageKit/Settings/KpkSettings.cpp KPackageKit-fedora/Settings/KpkSettings.cpp
*** KPackageKit/Settings/KpkSettings.cpp	2008-10-15 18:38:27.000000000 -0400
--- KPackageKit-fedora/Settings/KpkSettings.cpp	2008-12-08 18:36:26.000000000 -0500
***************
*** 104,110 ****
  	 (uint) checkUpdateGroup.readEntry( "interval", DAILY )
  	||
  	 autoCB->itemData( autoCB->currentIndex() ).toUInt() !=
! 	 (uint) checkUpdateGroup.readEntry( "autoUpdate", SECURITY )
  	||
  	 ( m_actions.contains(Client::ActionGetRepoList) ? m_originModel->changed() : false ) )
          emit(changed(true));
--- 104,110 ----
  	 (uint) checkUpdateGroup.readEntry( "interval", DAILY )
  	||
  	 autoCB->itemData( autoCB->currentIndex() ).toUInt() !=
! 	 (uint) checkUpdateGroup.readEntry( "autoUpdate", NONE )
  	||
  	 ( m_actions.contains(Client::ActionGetRepoList) ? m_originModel->changed() : false ) )
          emit(changed(true));
***************
*** 132,142 ****
      else
          intervalCB->setCurrentIndex(ret);
  
!     uint autoUpdate = checkUpdateGroup.readEntry( "autoUpdate", SECURITY );
      ret = autoCB->findData(autoUpdate);
      if ( ret == -1 )
          // this is if someone change the file by hand...
!         autoCB->setCurrentIndex( autoCB->findData(SECURITY) );
      else
          autoCB->setCurrentIndex(ret);
  
--- 132,142 ----
      else
          intervalCB->setCurrentIndex(ret);
  
!     uint autoUpdate = checkUpdateGroup.readEntry( "autoUpdate", NONE );
      ret = autoCB->findData(autoUpdate);
      if ( ret == -1 )
          // this is if someone change the file by hand...
!         autoCB->setCurrentIndex( autoCB->findData(NONE) );
      else
          autoCB->setCurrentIndex(ret);
  
***************
*** 174,180 ****
      notifyUpdatesCB->setCheckState(Qt::Checked);
      notifyLongTasksCB->setCheckState(Qt::Checked);
      intervalCB->setCurrentIndex( intervalCB->findData(DAILY) );
!     autoCB->setCurrentIndex( autoCB->findData(SECURITY) );
      m_originModel->clearChanges();
      emit checkChanges();
  }
--- 174,180 ----
      notifyUpdatesCB->setCheckState(Qt::Checked);
      notifyLongTasksCB->setCheckState(Qt::Checked);
      intervalCB->setCurrentIndex( intervalCB->findData(DAILY) );
!     autoCB->setCurrentIndex( autoCB->findData(NONE) );
      m_originModel->clearChanges();
      emit checkChanges();
  }
Only in KPackageKit-fedora/Settings: KpkSettings.cpp~


Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/F-10/kpackagekit.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kpackagekit.spec	28 Nov 2008 11:22:20 -0000	1.14
+++ kpackagekit.spec	9 Dec 2008 00:55:34 -0000	1.15
@@ -2,7 +2,7 @@
 
 Name:	  	kpackagekit
 Version:	0.3.1
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	KDE interface for PackageKit
 
 License:	GPLv2+
@@ -12,6 +12,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: kpackagekit-0.3.1-kdeinit.patch
+Patch2: kpackagekit-0.3.1-defaults.patch
 Patch3: kpackagekit-0.3.1-pk_api.patch
 
 BuildRequires:	cmake
@@ -24,9 +25,10 @@
 KDE interface for PackageKit.
 
 %prep
-%setup -q -n KPackageKit 
+%setup -q # -n KPackageKit 
 
 %patch1 -p1 -b .kdeinit
+%patch2 -p1 -b .defaults
 %patch3 -p1 -b .pk_api
 
 
@@ -68,6 +70,9 @@
 
 
 %changelog
+* Mon Dec 08 2008 Steven M. Parrish <smparrish at shallowcreek.net> 0.3.1-8
+- Patched to default to no auto updates
+
 * Fri Nov 28 2008 Richard Hughes <rhughes at redhat.com> 0.3.1-7
 - Rebuild because Bodhi hates me.