From 756b531ad651c8e77e3b27eb4d0fc10432127d9706beb38f20d52e2249cfaa2b Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 1 Oct 2010 20:59:46 +0000 Subject: [PATCH] Accepting request 49641 from home:vuntz:branches:GNOME:Factory Thanks OBS-URL: https://build.opensuse.org/request/show/49641 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/PackageKit?expand=0&rev=76 --- PackageKit-fix-introspection-build.patch | 24 ++++++++++++++++++++++++ PackageKit.changes | 6 ++++++ PackageKit.spec | 3 +++ 3 files changed, 33 insertions(+) create mode 100644 PackageKit-fix-introspection-build.patch diff --git a/PackageKit-fix-introspection-build.patch b/PackageKit-fix-introspection-build.patch new file mode 100644 index 0000000..c224bb9 --- /dev/null +++ b/PackageKit-fix-introspection-build.patch @@ -0,0 +1,24 @@ +Index: PackageKit-0.6.8/lib/packagekit-glib2/Makefile.am +=================================================================== +--- PackageKit-0.6.8.orig/lib/packagekit-glib2/Makefile.am ++++ PackageKit-0.6.8/lib/packagekit-glib2/Makefile.am +@@ -238,6 +238,7 @@ PackageKitGlib-1.0.gir: libpackagekit-gl + PackageKitGlib_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0 + PackageKitGlib_1_0_gir_CFLAGS = $(INCLUDES) -DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE + PackageKitGlib_1_0_gir_LIBS = libpackagekit-glib2.la ++PackageKitGlib_1_0_gir_SCANNERFLAGS = --strip-prefix=Pk + PackageKitGlib_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources)) + INTROSPECTION_GIRS += PackageKitGlib-1.0.gir + +Index: PackageKit-0.6.8/lib/packagekit-glib2/Makefile.in +=================================================================== +--- PackageKit-0.6.8.orig/lib/packagekit-glib2/Makefile.in ++++ PackageKit-0.6.8/lib/packagekit-glib2/Makefile.in +@@ -686,6 +686,7 @@ CLEANFILES = $(BUILT_SOURCES) $(am__appe + @HAVE_INTROSPECTION_TRUE@PackageKitGlib_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0 + @HAVE_INTROSPECTION_TRUE@PackageKitGlib_1_0_gir_CFLAGS = $(INCLUDES) -DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE + @HAVE_INTROSPECTION_TRUE@PackageKitGlib_1_0_gir_LIBS = libpackagekit-glib2.la ++@HAVE_INTROSPECTION_TRUE@PackageKitGlib_1_0_gir_SCANNERFLAGS = --strip-prefix=Pk + @HAVE_INTROSPECTION_TRUE@PackageKitGlib_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources)) + @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0 + @HAVE_INTROSPECTION_TRUE@dist_gir_DATA = $(INTROSPECTION_GIRS) diff --git a/PackageKit.changes b/PackageKit.changes index e8425b7..a015025 100644 --- a/PackageKit.changes +++ b/PackageKit.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 1 19:24:43 CEST 2010 - vuntz@opensuse.org + +- Add PackageKit-fix-introspection-build.patch to fix build with + recent gobject-introspection. + ------------------------------------------------------------------- Tue Sep 28 19:27:17 UTC 2010 - aj@suse.de diff --git a/PackageKit.spec b/PackageKit.spec index fca30e1..6c9ad98 100644 --- a/PackageKit.spec +++ b/PackageKit.spec @@ -60,6 +60,8 @@ Url: http://packagekit.org/ Source: %{name}-%{version}.tar.bz2 # PATCH-FEATURE-OPENSUSE PackageKit-sysconfig-cron.patch vuntz@opensuse.org -- Change the configuration of the cron script to a sysconfig-like config Patch0: PackageKit-sysconfig-cron.patch +# PATCH-FIX-UPSTREAM PackageKit-fix-introspection-build.patch fdo#30543 vuntz@opensuse.org -- Fix build with recent g-i +Patch1: PackageKit-fix-introspection-build.patch # PATCH-FIX-UPSTREAM PackageKit-BNC559802-zypp-count-patch-size.patch glin@novell.com -- calculate the download size of the patch Patch6: PackageKit-BNC559802-zypp-count-patch-size.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -235,6 +237,7 @@ This package provides upstream Look and Feel for PackageKit. %prep %setup -q %patch0 -p1 +%patch1 -p1 %patch6 -p1 %build