rpms/gnome-packagekit/F-9 gnome-packagekit-fix-gtype.patch, NONE, 1.1 gnome-packagekit.spec, 1.49, 1.50

[Richard Hughes]

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-packagekit/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18167

Modified Files:
	gnome-packagekit.spec 
Added Files:
	gnome-packagekit-fix-gtype.patch 
Log Message:
* Mon Sep 08 2008 Richard Hughes  <rhughes at redhat.com> - 0.2.5-2
- Fix a critical GType initialisation problem.


gnome-packagekit-fix-gtype.patch:

--- NEW FILE gnome-packagekit-fix-gtype.patch ---
commit 88f211513ef1e2eeec0f1d080eb3e17866bd833b
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Sep 8 18:53:10 2008 +0100

    bugfix: fix a crash in the GType initialisation due to compiling with LibGBus

diff --git a/libgbus/libgbus.c b/libgbus/libgbus.c
index ce91b6b..58b7cdf 100644
--- a/libgbus/libgbus.c
+++ b/libgbus/libgbus.c
@@ -53,7 +53,7 @@ enum {
 
 static guint	     signals [LAST_SIGNAL] = { 0 };
 
-G_DEFINE_TYPE (LibGBus, libgbus, G_TYPE_OBJECT)
+G_DEFINE_TYPE (GpkGBus, libgbus, G_TYPE_OBJECT)
 
 /**
  * name_owner_changed_cb:
diff --git a/libgbus/libgbus.h b/libgbus/libgbus.h
index 78697ab..b47ca26 100644
--- a/libgbus/libgbus.h
+++ b/libgbus/libgbus.h
@@ -50,6 +50,9 @@ typedef struct
 	void		(* connection_replaced)	(LibGBus	*watch);
 } LibGBusClass;
 
+typedef LibGBus GpkGBus;
+typedef LibGBusClass GpkGBusClass;
+
 typedef enum {
         LIBGBUS_SESSION,
         LIBGBUS_SYSTEM


Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-9/gnome-packagekit.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- gnome-packagekit.spec	6 Sep 2008 09:51:42 -0000	1.49
+++ gnome-packagekit.spec	8 Sep 2008 18:03:19 -0000	1.50
@@ -4,16 +4,16 @@
 Summary:   GNOME PackageKit Client
 Name:      gnome-packagekit
 Version:   0.2.5
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://www.packagekit.org
-#Source0:   http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}-%{?alphatag}.tar.gz
 Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.gz
 Source1:   system-install-packages
 Source2:   system-install-packages.1.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:    gnome-packagekit-enable-kde.patch
+Patch1:    gnome-packagekit-fix-gtype.patch
 
 Requires:  gtk2 >= 2.12.0
 Requires:  gnome-icon-theme
@@ -61,6 +61,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --disable-scrollkeeper --disable-schemas-install
@@ -144,6 +145,9 @@
 %{_datadir}/applications/gpk-*.desktop
 
 %changelog
+* Mon Sep 08 2008 Richard Hughes  <rhughes at redhat.com> - 0.2.5-2
+- Fix a critical GType initialisation problem.
+
 * Sat Sep 06 2008 Richard Hughes  <rhughes at redhat.com> - 0.2.5-1
 - New upstream version, only bugfixes.