[PackageKit] 0.8.1-8
Rex Dieter
rdieter at fedoraproject.org
Thu Jul 12 16:18:19 UTC 2012
commit 686bc5ab086b818a835f62bd4e7ba12344378616
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Thu Jul 12 11:21:10 2012 -0500
0.8.1-8
- fix UL vs ULL type mismatch in qt bindings (#839712)
- tighten subpkg deps with %_isa
PackageKit-0.8.1-qt_ULL.patch | 80 +++++++++++++++++++++++++++++++++++++++++
PackageKit.spec | 43 +++++++++++++---------
2 files changed, 105 insertions(+), 18 deletions(-)
---
diff --git a/PackageKit-0.8.1-qt_ULL.patch b/PackageKit-0.8.1-qt_ULL.patch
new file mode 100644
index 0000000..f1965cd
--- /dev/null
+++ b/PackageKit-0.8.1-qt_ULL.patch
@@ -0,0 +1,80 @@
+diff -up PackageKit-0.8.1/lib/packagekit-qt2/packagedetails.h.ULL PackageKit-0.8.1/lib/packagekit-qt2/packagedetails.h
+--- PackageKit-0.8.1/lib/packagekit-qt2/packagedetails.h.ULL 2012-06-22 10:30:52.000000000 -0500
++++ PackageKit-0.8.1/lib/packagekit-qt2/packagedetails.h 2012-07-12 11:01:32.812483103 -0500
+@@ -62,41 +62,41 @@ public:
+ * Describes the different package groups
+ */
+ enum Group {
+- GroupUnknown = 1UL << 0,
+- GroupAccessibility = 1UL << 1,
+- GroupAccessories = 1UL << 2,
+- GroupAdminTools = 1UL << 3,
+- GroupCommunication = 1UL << 4,
+- GroupDesktopGnome = 1UL << 5,
+- GroupDesktopKde = 1UL << 6,
+- GroupDesktopOther = 1UL << 7,
+- GroupDesktopXfce = 1UL << 8,
+- GroupEducation = 1UL << 9,
+- GroupFonts = 1UL << 10,
+- GroupGames = 1UL << 11,
+- GroupGraphics = 1UL << 12,
+- GroupInternet = 1UL << 13,
+- GroupLegacy = 1UL << 14,
+- GroupLocalization = 1UL << 15,
+- GroupMaps = 1UL << 16,
+- GroupMultimedia = 1UL << 17,
+- GroupNetwork = 1UL << 18,
+- GroupOffice = 1UL << 19,
+- GroupOther = 1UL << 20,
+- GroupPowerManagement = 1UL << 21,
+- GroupProgramming = 1UL << 22,
+- GroupPublishing = 1UL << 23,
+- GroupRepos = 1UL << 24,
+- GroupSecurity = 1UL << 25,
+- GroupServers = 1UL << 26,
+- GroupSystem = 1UL << 27,
+- GroupVirtualization = 1UL << 28,
+- GroupScience = 1UL << 29,
+- GroupDocumentation = 1UL << 30,
+- GroupElectronics = 1UL << 31,
+- GroupCollections = 1UL << 32,
+- GroupVendor = 1UL << 33,
+- GroupNewest = 1UL << 34
++ GroupUnknown = 1ULL << 0,
++ GroupAccessibility = 1ULL << 1,
++ GroupAccessories = 1ULL << 2,
++ GroupAdminTools = 1ULL << 3,
++ GroupCommunication = 1ULL << 4,
++ GroupDesktopGnome = 1ULL << 5,
++ GroupDesktopKde = 1ULL << 6,
++ GroupDesktopOther = 1ULL << 7,
++ GroupDesktopXfce = 1ULL << 8,
++ GroupEducation = 1ULL << 9,
++ GroupFonts = 1ULL << 10,
++ GroupGames = 1ULL << 11,
++ GroupGraphics = 1ULL << 12,
++ GroupInternet = 1ULL << 13,
++ GroupLegacy = 1ULL << 14,
++ GroupLocalization = 1ULL << 15,
++ GroupMaps = 1ULL << 16,
++ GroupMultimedia = 1ULL << 17,
++ GroupNetwork = 1ULL << 18,
++ GroupOffice = 1ULL << 19,
++ GroupOther = 1ULL << 20,
++ GroupPowerManagement = 1ULL << 21,
++ GroupProgramming = 1ULL << 22,
++ GroupPublishing = 1ULL << 23,
++ GroupRepos = 1ULL << 24,
++ GroupSecurity = 1ULL << 25,
++ GroupServers = 1ULL << 26,
++ GroupSystem = 1ULL << 27,
++ GroupVirtualization = 1ULL << 28,
++ GroupScience = 1ULL << 29,
++ GroupDocumentation = 1ULL << 30,
++ GroupElectronics = 1ULL << 31,
++ GroupCollections = 1ULL << 32,
++ GroupVendor = 1ULL << 33,
++ GroupNewest = 1ULL << 34
+ };
+ typedef qulonglong Groups;
+
diff --git a/PackageKit.spec b/PackageKit.spec
index 18dfa0e..2d40760 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
@@ -3,7 +3,7 @@
Summary: Package management service
Name: PackageKit
Version: 0.8.1
-Release: 7%{?dist}
+Release: 8%{?dist}
License: GPLv2+ and LGPLv2+
URL: http://www.packagekit.org
Source0: http://www.packagekit.org/releases/%{name}-%{version}.tar.xz
@@ -20,7 +20,10 @@ Patch4: PackageKit-0.7.4-xulrunner2.patch
# Upstream already
Patch5: PackageKit-0.8.1-master.patch
-Requires: PackageKit-glib = %{version}-%{release}
+# Upstreamable. fix UL vs ULL type mismatch in qt bindings
+Patch6: PackageKit-0.8.1-qt_ULL.patch
+
+Requires: %{name}-glib%{?_isa} = %{version}-%{release}
Requires: PackageKit-backend
Requires: shared-mime-info
Requires: comps-extras
@@ -83,7 +86,7 @@ Group: System Environment/Libraries
Requires: yum >= 3.2.19
# python(gio)
Requires: pygobject2
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
Provides: PackageKit-backend
%description yum
@@ -94,7 +97,7 @@ A backend for PackageKit to enable yum functionality.
Summary: PackageKit Zif backend
Group: System Environment/Libraries
Requires: zif >= 0.2.5
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
Provides: PackageKit-backend
%description zif
@@ -104,7 +107,7 @@ A backend for PackageKit to enable Zif functionality.
Summary: PackageKit SMART backend
Group: System Environment/Libraries
Requires: smart
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description smart
A backend for PackageKit to enable SMART functionality.
@@ -136,7 +139,7 @@ will almost instantly update itself to reflect this.
Summary: GLib libraries for accessing PackageKit
Group: Development/Libraries
Requires: dbus >= 1.1.1
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: gobject-introspection
Obsoletes: PackageKit-libs < %{version}-%{release}
Provides: PackageKit-libs = %{version}-%{release}
@@ -147,7 +150,7 @@ GLib libraries for accessing PackageKit.
%package qt
Summary: QT libraries for accessing PackageKit
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
%description qt
@@ -157,7 +160,7 @@ QT libraries for accessing PackageKit.
Summary: Cron job and related utilities for PackageKit
Group: System Environment/Base
Requires: cronie
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description cron
Crontab and utilities for running PackageKit as a cron job.
@@ -165,7 +168,7 @@ Crontab and utilities for running PackageKit as a cron job.
%package debug-install
Summary: Facility to install debugging packages using PackageKit
Group: System Environment/Base
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
Obsoletes: PackageKit-debuginfo-install <= 0.5.2-0.1.20090902git.fc12
%description debug-install
@@ -174,10 +177,9 @@ Provides facility to install debugging packages using PackageKit.
%package glib-devel
Summary: GLib Libraries and headers for PackageKit
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-glib%{?_isa} = %{version}-%{release}
Requires: dbus-devel >= 1.1.1
Requires: sqlite-devel
-Requires: PackageKit-glib = %{version}-%{release}
Obsoletes: PackageKit-devel < %{version}-%{release}
Provides: PackageKit-devel = %{version}-%{release}
@@ -187,7 +189,7 @@ GLib headers and libraries for PackageKit.
%package qt-devel
Summary: Qt Libraries and headers for PackageKit
Group: Development/Libraries
-Requires: %{name}-qt = %{version}-%{release}
+Requires: %{name}-qt%{?_isa} = %{version}-%{release}
%description qt-devel
Qt headers and libraries for PackageKit.
@@ -195,7 +197,7 @@ Qt headers and libraries for PackageKit.
%package backend-devel
Summary: Headers to compile out of tree PackageKit backends
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description backend-devel
Headers to compile out of tree PackageKit backends.
@@ -204,7 +206,7 @@ Headers to compile out of tree PackageKit backends.
Summary: Browser Plugin for PackageKit
Group: Development/Libraries
Requires: gtk2
-Requires: PackageKit-glib = %{version}-%{release}
+Requires: %{name}-glib%{?_isa} = %{version}-%{release}
Requires: mozilla-filesystem
%description browser-plugin
@@ -216,7 +218,7 @@ using PackageKit.
Summary: Install GStreamer codecs using PackageKit
Group: Development/Libraries
Requires: gstreamer
-Requires: PackageKit-glib = %{version}-%{release}
+Requires: %{name}-glib%{?_isa} = %{version}-%{release}
Obsoletes: codeina < 0.10.1-10
Provides: codeina = 0.10.1-10
@@ -228,7 +230,7 @@ codecs from configured repositories using PackageKit.
Summary: Install fonts automatically using PackageKit
Group: Development/Libraries
Requires: pango
-Requires: PackageKit-glib = %{version}-%{release}
+Requires: %{name}-glib%{?_isa} = %{version}-%{release}
%description gtk3-module
The PackageKit GTK3+ module allows any Pango application to install
@@ -238,7 +240,7 @@ fonts from configured repositories using PackageKit.
Summary: Ask the user to install command line programs automatically
Group: Development/Libraries
Requires: bash
-Requires: PackageKit-glib = %{version}-%{release}
+Requires: %{name}-glib%{?_isa} = %{version}-%{release}
%description command-not-found
A simple helper that offers to install new packages on the command line
@@ -247,7 +249,7 @@ using PackageKit.
%package device-rebind
Summary: Device rebind functionality for PackageKit
Group: Development/Libraries
-Requires: PackageKit-glib = %{version}-%{release}
+Requires: %{name}-glib%{?_isa} = %{version}-%{release}
%description device-rebind
The device rebind functionality offer the ability to re-initialize devices
@@ -260,6 +262,7 @@ user to restart the computer or remove and re-insert the device.
%patch1 -p1 -b .no-time
%patch4 -p1 -b .xulrunner2
%patch5 -p1 -b .master
+%patch6 -p1 -b .qt_ULL
NOCONFIGURE=1 ./autogen.sh
%build
@@ -472,6 +475,10 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%{_libdir}/pkgconfig/packagekit-plugin.pc
%changelog
+* Thu Jul 12 2012 Rex Dieter <rdieter at fedoraproject.org> - 0.8.1-8
+- fix UL vs ULL type mismatch in qt bindings (#839712)
+- tighten subpkg deps with %%_isa
+
* Tue Jul 09 2012 Richard Hughes <rhughes at redhat.com> - 0.8.1-7
- Fix several reported problems with the offline-update funtionality.
More information about the scm-commits
mailing list