rpms/moblin-app-installer/devel mai-fixPK.patch, NONE, 1.1 moblin-app-installer.spec, 1.1, 1.2

[Peter Robinson]

Author: pbrobinson

Update of /cvs/pkgs/rpms/moblin-app-installer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20611

Modified Files:
	moblin-app-installer.spec 
Added Files:
	mai-fixPK.patch 
Log Message:
- First attempt at PK-0.6 support

mai-fixPK.patch:
 configure.ac                    |    6 +++---
 tests/test-concurrent-install.c |    2 +-
 tests/test-object-store.c       |    2 +-
 tests/test-repo-changed.c       |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE mai-fixPK.patch ---
--- moblin-app-installer-0.4.0/configure.ac.orig	2010-01-26 09:35:37.000000000 +0000
+++ moblin-app-installer-0.4.0/configure.ac	2010-01-26 09:36:09.000000000 +0000
@@ -49,8 +49,8 @@
 ])
 
 AC_MSG_CHECKING([for backend])
-pk_req='packagekit-glib >= 0.4'
-pk_api='glib'
+pk_req='packagekit-glib2 >= 0.4'
+pk_api='glib2'
 AC_ARG_WITH(packagekit-glib2,
             [AS_HELP_STRING([--with-packagekit-glib2],
                             [Use PK's unstable glib2 API])],
@@ -64,7 +64,7 @@
 deps="$deps $pk_req"
 if test "$pk_api" = "glib"; then
   AC_DEFINE([HAVE_PACKAGEKIT_GLIB], [1], [Building against $pk_req])
-  PKG_CHECK_EXISTS([packagekit-glib >= 0.5.5],
+  PKG_CHECK_EXISTS([packagekit-glib2 >= 0.5.5],
   [
     AC_DEFINE([HAVE_PACKAGEKIT_GLIB_0_5], [1], [Building against development version])
   ])
--- moblin-app-installer-0.4.0/tests/test-concurrent-install.c.orig	2010-01-26 11:35:10.000000000 +0000
+++ moblin-app-installer-0.4.0/tests/test-concurrent-install.c	2010-01-26 11:36:03.000000000 +0000
@@ -1,5 +1,5 @@
 
-#include <packagekit-glib/packagekit.h>
+#include <packagekit-glib2/packagekit.h>
 #include <gtk/gtk.h>
 #include <config.h>
 
--- moblin-app-installer-0.4.0/tests/test-object-store.c.orig	2010-01-26 11:35:19.000000000 +0000
+++ moblin-app-installer-0.4.0/tests/test-object-store.c	2010-01-26 11:36:17.000000000 +0000
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <packagekit-glib/packagekit.h>
+#include <packagekit-glib2/packagekit.h>
 #include <clutter/clutter.h>
 #include <gtk/gtk.h>
 #include "mai-object-store.h"
--- moblin-app-installer-0.4.0/tests/test-repo-changed.c.orig	2010-01-26 11:35:31.000000000 +0000
+++ moblin-app-installer-0.4.0/tests/test-repo-changed.c	2010-01-26 11:36:34.000000000 +0000
@@ -1,5 +1,5 @@
 
-#include <packagekit-glib/packagekit.h>
+#include <packagekit-glib2/packagekit.h>
 #include <gtk/gtk.h>
 
 static void


Index: moblin-app-installer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-app-installer/devel/moblin-app-installer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- moblin-app-installer.spec	25 Jan 2010 22:08:05 -0000	1.1
+++ moblin-app-installer.spec	26 Jan 2010 14:20:21 -0000	1.2
@@ -11,7 +11,7 @@
 
 Name:          moblin-app-installer
 Version:       0.4.0
-Release:       0.4%{?dist}
+Release:       0.5%{?dist}
 Summary:       Moblin Application Installer
 
 Group:         Applications/System
@@ -20,6 +20,7 @@ URL:           http://www.moblin.org/
 # Source0:       http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
 Source0:       %{tarfile}
 Patch0:        mai-applist.patch
+Patch1:        mai-fixPK.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: clutter-gtk-devel
@@ -44,6 +45,7 @@ a logically categorized list of applicat
 %prep
 %setup -q
 %patch0 -p1 -b .applist
+%patch1 -p1 -b .fixPK
 
 # run autogen.sh until we have a proper release, but don't run configure twice.
 NOCONFIGURE=true ./autogen.sh
@@ -77,6 +79,9 @@ rm -rf %{buildroot}
 %{_datadir}/moblin-app-installer
 
 %changelog
+* Tue Jan 26 2010 Peter Robinson <pbrobinson at gmail.com> 0.4.0-0.5
+- First attempt at PK-0.6 support
+
 * Mon Jan 25 2010 Peter Robinson <pbrobinson at gmail.com> 0.4.0-0.4
 - Changes for the current applist
 - remove appicons so we don't ship patented proprietary icons