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

[Richard Hughes]

Author: rhughes

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

Modified Files:
	gnome-packagekit.spec 
Added Files:
	gnome-packagekit-0.3.12-fix-gtk-compile.patch 
Log Message:
* Wed Dec 10 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.12-2
- Fix compile with gtk < 2.14.


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

--- NEW FILE gnome-packagekit-0.3.12-fix-gtk-compile.patch ---
commit 95373efcae4776a695aff7938abaaa7a3a26057a
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Dec 10 08:24:03 2008 +0000

    bugfix: don't use gtk_dialog_get_action_area on gtk < 2.14

diff --git a/configure.ac b/configure.ac
index ad157ef..6c74e30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,12 +97,6 @@ PKG_CHECK_MODULES(GIO, gio-2.0)
 AC_SUBST(GIO_CFLAGS)
 AC_SUBST(GIO_LIBS)
 
-OLDCPPFLAGS=$CPPFLAGS
-CPPFLAGS=$GIO_CFLAGS
-LIBS=$GIO_LIBS
-AC_CHECK_FUNCS(g_file_make_directory_with_parents)
-CPPFLAGS=$OLDCPPFLAGS
-
 PKG_CHECK_MODULES(DBUS, \
  dbus-glib-1 >= $DBUS_GLIB_REQUIRED \
  dbus-1 >= $DBUS_REQUIRED \
@@ -135,6 +129,24 @@ PKG_CHECK_MODULES(LIBNOTIFY, \
 AC_SUBST(LIBNOTIFY_CFLAGS)
 AC_SUBST(LIBNOTIFY_LIBS)
 
+dnl ---------------------------------------------------------------------------
+dnl - Check for g_file_make_directory_with_parents
+dnl ---------------------------------------------------------------------------
+OLDCPPFLAGS=$CPPFLAGS
+CPPFLAGS=$GIO_CFLAGS
+LIBS=$GIO_LIBS
+AC_CHECK_FUNCS(g_file_make_directory_with_parents)
+CPPFLAGS=$OLDCPPFLAGS
+
+dnl ---------------------------------------------------------------------------
+dnl - Check for gtk_dialog_get_action_area
+dnl ---------------------------------------------------------------------------
+OLDCPPFLAGS=$CPPFLAGS
+CPPFLAGS=$GTK_CFLAGS
+LIBS=$GTK_LIBS
+AC_CHECK_FUNCS(gtk_dialog_get_action_area)
+CPPFLAGS=$OLDCPPFLAGS
+
 AC_PATH_PROG(GCONFTOOL, gconftool-2)
 AM_GCONF_SOURCE_2
 
diff --git a/src/gpk-client-untrusted.c b/src/gpk-client-untrusted.c
index f18ea6c..8c63ed8 100644
--- a/src/gpk-client-untrusted.c
+++ b/src/gpk-client-untrusted.c
@@ -123,7 +123,11 @@ gpk_client_untrusted_show (PkErrorCodeEnum code)
 
 	/* add to box */
 	widget = glade_xml_get_widget (glade_xml, "dialog_error");
+#ifdef HAVE_GTK_DIALOG_GET_ACTION_AREA
 	widget = gtk_dialog_get_action_area (GTK_DIALOG(widget));
+#else
+	widget = GTK_DIALOG(widget)->action_area;
+#endif
 	gtk_box_pack_start (GTK_BOX (widget), button, FALSE, FALSE, 0);
 
 	/* show window */


Index: gnome-packagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-packagekit/F-9/gnome-packagekit.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- gnome-packagekit.spec	8 Dec 2008 22:46:25 -0000	1.54
+++ gnome-packagekit.spec	10 Dec 2008 08:37:01 -0000	1.55
@@ -6,7 +6,7 @@
 Summary:   GNOME PackageKit Client
 Name:      gnome-packagekit
 Version:   0.3.12
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       http://www.packagekit.org
@@ -15,8 +15,13 @@
 Source2:   system-install-packages.1.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:    gnome-packagekit-enable-kde.patch
+
+# not upstream, F9 specific
 Patch1:    gnome-packagekit-0.3.10-f9-icon-names.patch
 
+# upstream, 95366b92832f983268eadc918bcbd36f7ed26fd9
+Patch2:    gnome-packagekit-0.3.12-fix-gtk-compile.patch
+
 Requires:  gtk2 >= 2.12.0
 Requires:  gnome-icon-theme
 Requires:  libnotify >= 0.4.3
@@ -74,8 +79,10 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
+autoconf
 %configure --disable-scrollkeeper --disable-schemas-install
 make %{?_smp_mflags}
 
@@ -191,6 +198,9 @@
 %{_datadir}/applications/gpk-service-pack.desktop
 
 %changelog
+* Wed Dec 10 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.12-2
+- Fix compile with gtk < 2.14.
+
 * Mon Dec 08 2008 Richard Hughes  <rhughes at redhat.com> - 0.3.12-1
 - Backport new upstream version from F10.