rpms/moblin-app-installer/devel 0001-Fix-build-when-not-using-PackageKit-glib-such-as-wit.patch, NONE, 1.1 mai-fixPK.patch, 1.1, 1.2 moblin-app-installer.spec, 1.3, 1.4
Peter Robinson
pbrobinson at fedoraproject.org
Tue Jan 26 15:39:47 UTC 2010
Author: pbrobinson
Update of /cvs/pkgs/rpms/moblin-app-installer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1793
Modified Files:
mai-fixPK.patch moblin-app-installer.spec
Added Files:
0001-Fix-build-when-not-using-PackageKit-glib-such-as-wit.patch
Log Message:
- Fix build with PK 0.6, patch courtesy of Richard Hughes
0001-Fix-build-when-not-using-PackageKit-glib-such-as-wit.patch:
Makefile.am | 7 ++++++-
test-object-store.c | 10 +++++++++-
test-repo-changed.c | 10 ++++++++--
3 files changed, 23 insertions(+), 4 deletions(-)
--- NEW FILE 0001-Fix-build-when-not-using-PackageKit-glib-such-as-wit.patch ---
>From 959048458574b2730884432fc998790fe3e7f301 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard at hughsie.com>
Date: Tue, 26 Jan 2010 15:04:40 +0000
Subject: [PATCH] Fix build when not using PackageKit-glib, such as with Fedora 13
---
tests/Makefile.am | 7 ++++++-
tests/test-object-store.c | 10 +++++++++-
tests/test-repo-changed.c | 9 ++++++++-
3 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 55885eb..74946fe 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,12 +9,16 @@ AM_CFLAGS = \
$(NULL)
bin_PROGRAMS = \
- test-concurrent-install \
test-expander \
test-object-store \
test-repo-changed \
$(NULL)
+if !HAVE_PACKAGEKIT_GLIB2
+bin_PROGRAMS += \
+ test-concurrent-install \
+ $(NULL)
+
test_concurrent_install_SOURCES = \
test-concurrent-install.c \
$(NULL)
@@ -22,6 +26,7 @@ test_concurrent_install_SOURCES = \
test_concurrent_install_LDADD = \
$(MAI_LIBS) \
$(NULL)
+endif
test_expander_SOURCES = \
test-expander.c \
diff --git a/tests/test-object-store.c b/tests/test-object-store.c
index 6d121a5..c4c5941 100644
--- a/tests/test-object-store.c
+++ b/tests/test-object-store.c
@@ -1,8 +1,16 @@
+#include <config.h>
+
#include <stdio.h>
#include <stdlib.h>
-#include <packagekit-glib/packagekit.h>
+#ifdef HAVE_PACKAGEKIT_GLIB2
+ #define I_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE
+ #include <packagekit-glib2/packagekit.h>
+#else
+ #include <packagekit-glib/packagekit.h>
+#endif
+
#include <clutter/clutter.h>
#include <gtk/gtk.h>
#include "mai-object-store.h"
diff --git a/tests/test-repo-changed.c b/tests/test-repo-changed.c
index b2ad48c..090d72f 100644
--- a/tests/test-repo-changed.c
+++ b/tests/test-repo-changed.c
@@ -1,5 +1,12 @@
-#include <packagekit-glib/packagekit.h>
+#include <config.h>
+
+#ifdef HAVE_PACKAGEKIT_GLIB2
+ #define I_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE
+ #include <packagekit-glib2/packagekit.h>
+#else
+ #include <packagekit-glib/packagekit.h>
+#endif
#include <gtk/gtk.h>
static void
--
1.6.6
mai-fixPK.patch:
configure.ac | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Index: mai-fixPK.patch
===================================================================
RCS file: /cvs/pkgs/rpms/moblin-app-installer/devel/mai-fixPK.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mai-fixPK.patch 26 Jan 2010 14:20:21 -0000 1.1
+++ mai-fixPK.patch 26 Jan 2010 15:39:46 -0000 1.2
@@ -20,32 +20,3 @@
[
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.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- moblin-app-installer.spec 26 Jan 2010 14:22:34 -0000 1.3
+++ moblin-app-installer.spec 26 Jan 2010 15:39:46 -0000 1.4
@@ -11,7 +11,7 @@
Name: moblin-app-installer
Version: 0.4.0
-Release: 0.6%{?dist}
+Release: 0.7%{?dist}
Summary: Moblin Application Installer
Group: Applications/System
@@ -20,7 +20,8 @@ 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
+Patch1: 0001-Fix-build-when-not-using-PackageKit-glib-such-as-wit.patch
+Patch2: mai-fixPK.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: clutter-gtk-devel
@@ -45,7 +46,8 @@ a logically categorized list of applicat
%prep
%setup -q
%patch0 -p1 -b .applist
-%patch1 -p1 -b .fixPK
+%patch1 -p1 -b .newPK
+%patch2 -p1 -b .fixPK
# run autogen.sh until we have a proper release, but don't run configure twice.
NOCONFIGURE=true ./autogen.sh
@@ -79,6 +81,9 @@ rm -rf %{buildroot}
%{_datadir}/moblin-app-installer
%changelog
+* Tue Jan 26 2010 Peter Robinson <pbrobinson at gmail.com> 0.4.0-0.7
+- Fix build with PK 0.6, patch courtesy of Richard Hughes
+
* Tue Jan 26 2010 Peter Robinson <pbrobinson at gmail.com> 0.4.0-0.6
- Bump release
More information about the scm-commits
mailing list