rpms/gnome-packagekit/F-9 gnome-packagekit-0.3.12-fix-gtk-compile.patch, 1.1, 1.2 gnome-packagekit.spec, 1.55, 1.56

[Richard Hughes]

Author: rhughes

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

Modified Files:
	gnome-packagekit-0.3.12-fix-gtk-compile.patch 
	gnome-packagekit.spec 
Log Message:
* Wed Dec 10 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.12-3
- Fix the last patch to fix compile on F9 as gio is linked in explicitly.


gnome-packagekit-0.3.12-fix-gtk-compile.patch:

Index: gnome-packagekit-0.3.12-fix-gtk-compile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-9/gnome-packagekit-0.3.12-fix-gtk-compile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-packagekit-0.3.12-fix-gtk-compile.patch	10 Dec 2008 08:37:01 -0000	1.1
+++ gnome-packagekit-0.3.12-fix-gtk-compile.patch	10 Dec 2008 10:19:57 -0000	1.2
@@ -1,4 +1,4 @@
-commit 95373efcae4776a695aff7938abaaa7a3a26057a
+commit 53e36a72b0d541889e18b48c784f1e15726a17fe
 Author: Richard Hughes <richard at hughsie.com>
 Date:   Wed Dec 10 08:24:03 2008 +0000
 
@@ -46,6 +46,26 @@
  AC_PATH_PROG(GCONFTOOL, gconftool-2)
  AM_GCONF_SOURCE_2
  
+diff --git a/src/Makefile.am b/src/Makefile.am
+index b50bff2..1b48268 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -5,6 +5,7 @@ NULL =
+ 
+ INCLUDES =						\
+ 	$(GLIB_CFLAGS)					\
++	$(GIO_CFLAGS)					\
+ 	$(DBUS_CFLAGS)					\
+ 	$(GCONF_CFLAGS)					\
+ 	$(LIBGLADE_CFLAGS)				\
+@@ -99,6 +100,7 @@ shared_SOURCES =					\
+ 
+ shared_LIBS =						\
+ 	$(GLIB_LIBS)					\
++	$(GIO_LIBS)					\
+ 	$(DBUS_LIBS)					\
+ 	$(GCONF_LIBS)					\
+ 	$(LIBGLADE_LIBS)				\
 diff --git a/src/gpk-client-untrusted.c b/src/gpk-client-untrusted.c
 index f18ea6c..8c63ed8 100644
 --- a/src/gpk-client-untrusted.c


Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-9/gnome-packagekit.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- gnome-packagekit.spec	10 Dec 2008 08:37:01 -0000	1.55
+++ gnome-packagekit.spec	10 Dec 2008 10:19:58 -0000	1.56
@@ -6,7 +6,7 @@
 Summary:   GNOME PackageKit Client
 Name:      gnome-packagekit
 Version:   0.3.12
-Release:   2%{?dist}
+Release:   3%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://www.packagekit.org
@@ -19,7 +19,7 @@
 # not upstream, F9 specific
 Patch1:    gnome-packagekit-0.3.10-f9-icon-names.patch
 
-# upstream, 95366b92832f983268eadc918bcbd36f7ed26fd9
+# upstream, 53e36a72b0d541889e18b48c784f1e15726a17fe
 Patch2:    gnome-packagekit-0.3.12-fix-gtk-compile.patch
 
 Requires:  gtk2 >= 2.12.0
@@ -198,6 +198,9 @@
 %{_datadir}/applications/gpk-service-pack.desktop
 
 %changelog
+* Wed Dec 10 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.12-3
+- Fix the last patch to fix compile on F9 as gio is linked in explicitly.
+
 * Wed Dec 10 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.12-2
 - Fix compile with gtk < 2.14.