rpms/kpackagekit/F-9 kpackagekit-0.3.1-defaults.patch, NONE, 1.1 kpackagekit.spec, 1.1, 1.2 FindQPackageKit.cmake, 1.1, NONE kpackagekit-0.3.1-cmake_module_path.patch, 1.1, NONE
Richard Hughes
rhughes at fedoraproject.org
Wed Dec 10 08:58:20 UTC 2008
Author: rhughes
Update of /cvs/pkgs/rpms/kpackagekit/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8403
Modified Files:
kpackagekit.spec
Added Files:
kpackagekit-0.3.1-defaults.patch
Removed Files:
FindQPackageKit.cmake
kpackagekit-0.3.1-cmake_module_path.patch
Log Message:
* Wed Dec 10 2008 Richard Hughes <rhughes at redhat.com> 0.3.1-6
- Rebuild so we can skip a PK, GPK, KPK combined update.
- Patched to default to no auto updates
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-9/kpackagekit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kpackagekit.spec 12 Nov 2008 12:01:53 -0000 1.1
+++ kpackagekit.spec 10 Dec 2008 08:57:49 -0000 1.2
@@ -2,7 +2,7 @@
Name: kpackagekit
Version: 0.3.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: KDE interface for PackageKit
License: GPLv2+
@@ -11,44 +11,40 @@
URL: http://www.kde-apps.org/content/show.php/KPackageKit?content=84745
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# http://websvn.kde.org/*checkout*/trunk/playground/sysadmin/kpackagekit/cmake/modules/FindQPackageKit.cmake
-Source1: FindQPackageKit.cmake
-
Patch1: kpackagekit-0.3.1-kdeinit.patch
-Patch2: kpackagekit-0.3.1-cmake_module_path.patch
+Patch2: kpackagekit-0.3.1-defaults.patch
Patch3: kpackagekit-0.3.1-pk_api.patch
BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: kde-filesystem
BuildRequires: kdelibs4-devel
-BuildRequires: PackageKit-qt-devel >= 0.3.9-3
+BuildRequires: PackageKit-qt-devel >= 0.3.11
%description
KDE interface for PackageKit.
%prep
-%setup -q -n KPackageKit
+%setup -q # -n KPackageKit
%patch1 -p1 -b .kdeinit
-
-#install -p -D %{SOURCE1} cmake/modules/FindQPackageKit.cmake
-#patch2 -p1 -b .cmake_module_path
-
+%patch2 -p1 -b .defaults
%patch3 -p1 -b .pk_api
%build
-%{cmake_kde4} \
- -DQPACKAGEKIT_INCLUDE_DIR=%{_includedir}/PackageKit/ \
- .
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
-make %{?_smp_mflags} VERBOSE=1
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=${RPM_BUILD_ROOT}
+make install/fast DESTDIR=${RPM_BUILD_ROOT} -C %{_target_platform}
desktop-file-install \
--dir=$RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4 \
@@ -74,6 +70,10 @@
%changelog
+* Wed Dec 10 2008 Richard Hughes <rhughes at redhat.com> 0.3.1-6
+- Rebuild so we can skip a PK, GPK, KPK combined update.
+- Patched to default to no auto updates
+
* Sat Nov 01 2008 Rex Dieter <rdieter at fedoraproject.org> 0.3.1-5
- use PackageKit's FindQPackageKit.cmake
--- FindQPackageKit.cmake DELETED ---
--- kpackagekit-0.3.1-cmake_module_path.patch DELETED ---
More information about the fedora-extras-commits
mailing list