rpms/PackageKit/devel pk-fix-get-distro-upgrade.patch, NONE, 1.1 pk-install-qt-cmake-build.patch, NONE, 1.1 PackageKit.spec, 1.80, 1.81
Richard Hughes
rhughes at fedoraproject.org
Thu Oct 30 16:32:48 UTC 2008
- Previous message (by thread): rpms/perl-MooseX-StrictConstructor/F-9 perl-MooseX-StrictConstructor.spec, NONE, 1.1 sources, 1.1, 1.2
- Next message (by thread): rpms/system-config-date/devel .cvsignore, 1.92, 1.93 sources, 1.100, 1.101 system-config-date.spec, 1.104, 1.105
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rhughes
Update of /cvs/pkgs/rpms/PackageKit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31582
Modified Files:
PackageKit.spec
Added Files:
pk-fix-get-distro-upgrade.patch
pk-install-qt-cmake-build.patch
Log Message:
* Thu Oct 28 2008 Richard Hughes <rhughes at redhat.com> - 0.3.9-3
- Install the usr/share/cmake/Modules/FindQPackageKit.cmake file so we
can build KPackageKit from svn head.
- Fix installing the preupgrade package when we check for distro upgrades
on machines with 32 and 64 bit versions available. Fixes #469172
pk-fix-get-distro-upgrade.patch:
--- NEW FILE pk-fix-get-distro-upgrade.patch ---
commit 32f39d67971f1bd6dbf4b559a8f95e8712edccf8
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Oct 30 16:22:47 2008 +0000
bugfix: yum: fix getting distibution upgrade information when we have multiple repos providing preupgrade. Fixes rh#469172
diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
index 9a75200..85cf4da 100755
--- a/backends/yum/yumBackend.py
+++ b/backends/yum/yumBackend.py
@@ -1657,15 +1657,17 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
pkgs = self.yumbase.rpmdb.searchNevra(name='preupgrade')
if len(pkgs) == 0:
#install preupgrade
- pkgs = self.yumbase.pkgSack.searchNevra(name='preupgrade')
+ pkgs = self.yumbase.pkgSack.returnNewestByName(name='preupgrade')
if len(pkgs) == 0:
self.error(ERROR_PACKAGE_NOT_FOUND, "Could not find upgrade preupgrade package in any enabled repos")
- elif len(pkgs) == 1:
- txmbr = self.yumbase.install(po=pkgs[0])
- if txmbr:
- self._runYumTransaction()
+ # we can have more than one result if the package is in multiple repos, for example
+ # a machine with i386 _and_ x86_64 configured.
+ # in this case, just pick the first entry as they are both noarch
+ txmbr = self.yumbase.install(po=pkgs[0])
+ if txmbr:
+ self._runYumTransaction()
else:
- self.error(ERROR_INTERNAL_ERROR, "not one update possibility")
+ self.error(ERROR_INTERNAL_ERROR, "could not install preupgrade as no transaction")
elif len(pkgs) == 1:
# check if there are any updates to the preupgrade package
po = pkgs[0]
pk-install-qt-cmake-build.patch:
--- NEW FILE pk-install-qt-cmake-build.patch ---
commit 746b79e082e696b6eae9df10916e00e2a847b138
Author: Richard Hughes <richard at hughsie.com>
Date: Mon Oct 27 16:57:18 2008 +0000
bugfix: install FindQPackageKit.cmake as KPackageKit needs it to build
diff --git a/lib/packagekit-qt/modules/Makefile.am b/lib/packagekit-qt/modules/Makefile.am
index cd3b443..a61e00b 100644
--- a/lib/packagekit-qt/modules/Makefile.am
+++ b/lib/packagekit-qt/modules/Makefile.am
@@ -1,3 +1,9 @@
+cmakemoduledir = $(datadir)/cmake/Modules
+cmakemodule_DATA = \
+ FindQPackageKit.cmake \
+ $(NULL)
+
EXTRA_DIST = \
CMakeLists.txt \
- FindQPackageKit.cmake
+ $(cmakemodule_DATA)
+
Index: PackageKit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PackageKit/devel/PackageKit.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- PackageKit.spec 28 Oct 2008 14:41:02 -0000 1.80
+++ PackageKit.spec 30 Oct 2008 16:32:17 -0000 1.81
@@ -8,7 +8,7 @@
Summary: System daemon that is a DBUS abstraction layer for package management
Name: PackageKit
Version: 0.3.9
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://packagekit.freedesktop.org
@@ -25,6 +25,12 @@
# upstream, 211b538cd0d6e420f288af49f7bb106cf99b4ce6
Patch2: pk-fix-browser-plugin.patch
+# upstream, 746b79e082e696b6eae9df10916e00e2a847b138
+Patch3: pk-install-qt-cmake-build.patch
+
+# upstream, 32f39d67971f1bd6dbf4b559a8f95e8712edccf8
+Patch4: pk-fix-get-distro-upgrade.patch
+
Requires: dbus >= %{dbus_version}
Requires: dbus-glib >= %{dbus_glib_version}
Requires: PackageKit-glib = %{version}-%{release}
@@ -208,6 +214,8 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
%build
%configure --enable-yum --enable-smart --with-default-backend=yum --disable-local
@@ -371,6 +379,7 @@
%dir %{_includedir}/PackageKit/packagekit-qt
%{_includedir}/PackageKit/packagekit-qt/QPackageKit
%{_includedir}/PackageKit/packagekit-qt/*.h
+%{_datadir}/cmake/Modules/FindQPackageKit.cmake
%files backend-devel
%defattr(-,root,root,-)
@@ -380,6 +389,12 @@
%{_includedir}/PackageKit/backend/*.h
%changelog
+* Thu Oct 28 2008 Richard Hughes <rhughes at redhat.com> - 0.3.9-3
+- Install the usr/share/cmake/Modules/FindQPackageKit.cmake file so we
+ can build KPackageKit from svn head.
+- Fix installing the preupgrade package when we check for distro upgrades
+ on machines with 32 and 64 bit versions available. Fixes #469172
+
* Tue Oct 28 2008 Richard Hughes <rhughes at redhat.com> - 0.3.9-2
- Apply a couple of patches from upstream to fix development filtering
and installing the web plugin.
- Previous message (by thread): rpms/perl-MooseX-StrictConstructor/F-9 perl-MooseX-StrictConstructor.spec, NONE, 1.1 sources, 1.1, 1.2
- Next message (by thread): rpms/system-config-date/devel .cvsignore, 1.92, 1.93 sources, 1.100, 1.101 system-config-date.spec, 1.104, 1.105
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list