From 6fb99d272c6320fafe3aadee80120ad2adfd74d9cdfeed5d8af820852c3fdeb8 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 28 Sep 2010 19:17:03 +0000 Subject: [PATCH 1/4] Accepting request 49394 from home:vuntz:branches:GNOME:Factory thanks OBS-URL: https://build.opensuse.org/request/show/49394 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-bluetooth?expand=0&rev=56 --- gnome-bluetooth-2.31.90.tar.bz2 | 3 --- gnome-bluetooth-2.32.0.tar.bz2 | 3 +++ gnome-bluetooth.changes | 6 ++++++ gnome-bluetooth.spec | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 gnome-bluetooth-2.31.90.tar.bz2 create mode 100644 gnome-bluetooth-2.32.0.tar.bz2 diff --git a/gnome-bluetooth-2.31.90.tar.bz2 b/gnome-bluetooth-2.31.90.tar.bz2 deleted file mode 100644 index 717ee30..0000000 --- a/gnome-bluetooth-2.31.90.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f5dec899c9fd425972074308fdd6287376bd7087a33101fe0644fa82c10076dc -size 3662410 diff --git a/gnome-bluetooth-2.32.0.tar.bz2 b/gnome-bluetooth-2.32.0.tar.bz2 new file mode 100644 index 0000000..2cde0db --- /dev/null +++ b/gnome-bluetooth-2.32.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57b1f06c96a1b85e1c19ff919d708cc38e95edae658881ed99968c325839a973 +size 1231205 diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes index 7bbc857..5963e6c 100644 --- a/gnome-bluetooth.changes +++ b/gnome-bluetooth.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 28 18:51:54 CEST 2010 - vuntz@opensuse.org + +- Update to version 2.32.0: + + Updated translations. + ------------------------------------------------------------------- Sun Sep 19 00:50:00 CEST 2010 - vuntz@opensuse.org diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index 57045c1..12ee8bf 100644 --- a/gnome-bluetooth.spec +++ b/gnome-bluetooth.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-bluetooth (Version 2.31.90) +# spec file for package gnome-bluetooth (Version 2.32.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: gnome-bluetooth -Version: 2.31.90 +Version: 2.32.0 Release: 1 License: GPLv2+ Summary: GNOME Bluetooth graphical utilities From 35126df7cd966a7f3ecacec809dfb7712fbf9c64e1032688672d86ebb887727b Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 1 Oct 2010 20:54:52 +0000 Subject: [PATCH 2/4] Accepting request 49633 from home:vuntz:branches:GNOME:Factory thanks OBS-URL: https://build.opensuse.org/request/show/49633 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-bluetooth?expand=0&rev=57 --- ...me-bluetooth-fix-introspection-build.patch | 191 ++++++++++-------- gnome-bluetooth.changes | 8 + gnome-bluetooth.spec | 4 +- 3 files changed, 118 insertions(+), 85 deletions(-) rename gnome-bluetooth-fix-parallel-build.patch => gnome-bluetooth-fix-introspection-build.patch (69%) diff --git a/gnome-bluetooth-fix-parallel-build.patch b/gnome-bluetooth-fix-introspection-build.patch similarity index 69% rename from gnome-bluetooth-fix-parallel-build.patch rename to gnome-bluetooth-fix-introspection-build.patch index 41475dc..78bf7a9 100644 --- a/gnome-bluetooth-fix-parallel-build.patch +++ b/gnome-bluetooth-fix-introspection-build.patch @@ -1,89 +1,31 @@ -Index: gnome-bluetooth-2.31.90/lib/Makefile.am -=================================================================== ---- gnome-bluetooth-2.31.90.orig/lib/Makefile.am -+++ gnome-bluetooth-2.31.90/lib/Makefile.am -@@ -1,7 +1,7 @@ - SUBDIRS = plugins +commit c07d2f7fd6c38deda7b827902e62c507e55ac300 +Author: Vincent Untz +Date: Fri Oct 1 18:05:03 2010 +0200 + + Fix introspection build + + https://bugzilla.gnome.org/show_bug.cgi?id=630024 + +diff --git a/Makefile.am b/Makefile.am +index 9391392..f73baf4 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -9,10 +9,9 @@ SUBDIRS = icons lib applet properties wizard sendto $(MOBLIN_DIR) docs po help + DIST_SUBDIRS = $(DEF_SUBDIRS) moblin + EXTRA_DIST = intltool-extract.in intltool-update.in intltool-merge.in ChangeLog.pre-2.27 gtk-doc.make gnome-doc-utils.make - EXTRA_DIST = --BUILT_GIRSOURCES = -+CLEANFILES = +-# FIXME https://bugzilla.gnome.org/show_bug.cgi?id=595675 + DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install \ + --disable-desktop-update --disable-mime-update --disable-icon-update \ +- --enable-gtk-doc --disable-scrollkeeper --enable-introspection=no ++ --enable-gtk-doc --disable-scrollkeeper --enable-introspection - noinst_LTLIBRARIES = libcommon.la - lib_LTLIBRARIES = libgnome-bluetooth.la -@@ -55,41 +55,33 @@ gnomebluetooth_HEADERS = \ + DISTCLEANFILES = intltool-extract intltool-update intltool-merge gnome-doc-utils.make - AM_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS) $(COMMON_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPLUGINDIR=\"$(libdir)/gnome-bluetooth/plugins\" - --if HAVE_INTROSPECTION --BUILT_GIRSOURCES += GnomeBluetooth-1.0.gir -+-include $(INTROSPECTION_MAKEFILE) -+INTROSPECTION_GIRS = -+INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir) -+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) - -+if HAVE_INTROSPECTION - GnomeBluetooth-1.0.gir: $(libgnome_bluetooth_la_SOURCES) - GnomeBluetooth-1.0.gir: $(gnomebluetooth_HEADERS) - GnomeBluetooth-1.0.gir: libgnome-bluetooth.la - GnomeBluetooth-1.0.gir: $(INTROSPECTION_SCANNER) -- $(AM_V_GEN) $(INTROSPECTION_SCANNER) -v --namespace GnomeBluetooth --nsversion=1.0 \ -- --add-include-path=$(srcdir) --add-include-path=. \ -- --include=GObject-2.0 \ -- --include=Gtk-2.0 \ -- --include=DBusGLib-1.0 \ -- --include=GModule-2.0 \ -- --libtool="$(LIBTOOL)" \ -- --library=gnome-bluetooth \ -- --output $@ \ -- --pkg gobject-2.0 \ -- --pkg gtk+-2.0 \ -- --pkg dbus-glib-1 \ -- --pkg gmodule-2.0 \ -- -I$(srcdir) \ -- $(LIBGNOMEBT_CFLAGS) \ -- $(gnomebluetooth_HEADERS) - --girdir = $(INTROSPECTION_GIRDIR) --dist_gir_DATA = $(BUILT_GIRSOURCES) -+GnomeBluetooth_1_0_gir_INCLUDES = GObject-2.0 Gtk-2.0 DBusGLib-1.0 GModule-2.0 -+GnomeBluetooth_1_0_gir_CFLAGS = \ -+ -I$(srcdir) \ -+ $(LIBGNOMEBT_CFLAGS) -+GnomeBluetooth_1_0_gir_LIBS = libgnome-bluetooth.la -+GnomeBluetooth_1_0_gir_FILES = $(gnomebluetooth_HEADERS) -+GnomeBluetooth_1_0_gir_SCANNERFLAGS = --namespace=GnomeBluetooth -+INTROSPECTION_GIRS += GnomeBluetooth-1.0.gir - --EXTRA_DIST += $(BUILT_GIRSOURCES) -+girdir = $(INTROSPECTION_GIRDIR) -+gir_DATA = $(INTROSPECTION_GIRS) - --typelibsdir = $(INTROSPECTION_TYPELIBDIR) --typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) -+typelibdir = $(INTROSPECTION_TYPELIBDIR) -+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) - --%.typelib: %.gir $(G_IR_COMPILER) -- $(AM_V_GEN) LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@ -- -+CLEANFILES += $(gir_DATA) $(typelib_DATA) - endif # HAVE_INTROSPECTION - - BUILT_SOURCES = marshal.h marshal.c \ -@@ -101,7 +93,7 @@ BUILT_SOURCES = marshal.h marshal.c \ - - nodist_libcommon_la_SOURCES = $(BUILT_SOURCES) - --CLEANFILES = $(BUILT_SOURCES) -+CLEANFILES += $(BUILT_SOURCES) - - noinst_PROGRAMS = test-client test-agent test-deviceselection test-plugins test-class - -Index: gnome-bluetooth-2.31.90/acinclude.m4 -=================================================================== ---- gnome-bluetooth-2.31.90.orig/acinclude.m4 -+++ gnome-bluetooth-2.31.90/acinclude.m4 +diff --git a/acinclude.m4 b/acinclude.m4 +index 5cf8c03..deebd2b 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 @@ -1,93 +1,3 @@ -dnl -*- mode: autoconf -*- -dnl Copyright 2009 Johan Dahlin @@ -178,3 +120,86 @@ Index: gnome-bluetooth-2.31.90/acinclude.m4 dnl as-ac-expand.m4 0.2.0 -*- autoconf -*- dnl autostars m4 macro for expanding directories using configure's prefix +diff --git a/configure.ac b/configure.ac +index 8bbce4e..02aaf5f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -186,7 +186,7 @@ AC_SUBST(DBUS_BINDING_TOOL) + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` + AC_SUBST(GLIB_GENMARSHAL) + +-GOBJECT_INTROSPECTION_CHECK([0.6.3]) ++GOBJECT_INTROSPECTION_CHECK([0.6.7]) + + GNOME_COMMON_INIT + GNOME_DEBUG_CHECK +diff --git a/lib/Makefile.am b/lib/Makefile.am +index 6da2a9c..d0bc250 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -55,41 +55,27 @@ gnomebluetooth_HEADERS = \ + + AM_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS) $(COMMON_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPLUGINDIR=\"$(libdir)/gnome-bluetooth/plugins\" + ++-include $(INTROSPECTION_MAKEFILE) ++INTROSPECTION_GIRS = ++INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir) ++INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) ++ + if HAVE_INTROSPECTION +-BUILT_GIRSOURCES += GnomeBluetooth-1.0.gir ++introspection_sources = $(gnomebluetooth_HEADERS) + +-GnomeBluetooth-1.0.gir: $(libgnome_bluetooth_la_SOURCES) +-GnomeBluetooth-1.0.gir: $(gnomebluetooth_HEADERS) + GnomeBluetooth-1.0.gir: libgnome-bluetooth.la +-GnomeBluetooth-1.0.gir: $(INTROSPECTION_SCANNER) +- $(AM_V_GEN) $(INTROSPECTION_SCANNER) -v --namespace GnomeBluetooth --nsversion=1.0 \ +- --add-include-path=$(srcdir) --add-include-path=. \ +- --include=GObject-2.0 \ +- --include=Gtk-2.0 \ +- --include=DBusGLib-1.0 \ +- --include=GModule-2.0 \ +- --libtool="$(LIBTOOL)" \ +- --library=gnome-bluetooth \ +- --output $@ \ +- --pkg gobject-2.0 \ +- --pkg gtk+-2.0 \ +- --pkg dbus-glib-1 \ +- --pkg gmodule-2.0 \ +- -I$(srcdir) \ +- $(LIBGNOMEBT_CFLAGS) \ +- $(gnomebluetooth_HEADERS) ++GnomeBluetooth_1_0_gir_INCLUDES = GObject-2.0 Gtk-2.0 DBusGLib-1.0 GModule-2.0 ++GnomeBluetooth_1_0_gir_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS) ++GnomeBluetooth_1_0_gir_LIBS = libgnome-bluetooth.la ++GnomeBluetooth_1_0_gir_SCANNERFLAGS = --strip-prefix=Bluetooth --pkg-export=gnome-bluetooth-1.0 ++GnomeBluetooth_1_0_gir_FILES = $(introspection_sources) ++INTROSPECTION_GIRS += GnomeBluetooth-1.0.gir + + girdir = $(INTROSPECTION_GIRDIR) +-dist_gir_DATA = $(BUILT_GIRSOURCES) +- +-EXTRA_DIST += $(BUILT_GIRSOURCES) +- +-typelibsdir = $(INTROSPECTION_TYPELIBDIR) +-typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) ++gir_DATA = $(INTROSPECTION_GIRS) + +-%.typelib: %.gir $(G_IR_COMPILER) +- $(AM_V_GEN) LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@ +- ++typelibdir = $(INTROSPECTION_TYPELIBDIR) ++typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) + endif # HAVE_INTROSPECTION + + BUILT_SOURCES = marshal.h marshal.c \ +@@ -101,7 +87,7 @@ BUILT_SOURCES = marshal.h marshal.c \ + + nodist_libcommon_la_SOURCES = $(BUILT_SOURCES) + +-CLEANFILES = $(BUILT_SOURCES) ++CLEANFILES = $(BUILT_SOURCES) $(gir_DATA) $(typelib_DATA) + + noinst_PROGRAMS = test-client test-agent test-deviceselection test-plugins test-class + diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes index 5963e6c..6e2252c 100644 --- a/gnome-bluetooth.changes +++ b/gnome-bluetooth.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Oct 1 18:08:32 CEST 2010 - vuntz@opensuse.org + +- Add gnome-bluetooth-fix-introspection-build.patch, which + obsoletes gnome-bluetooth-fix-parallel-build.patch: this updated + patch will really fix the build with recent + gobject-introspection. + ------------------------------------------------------------------- Tue Sep 28 18:51:54 CEST 2010 - vuntz@opensuse.org diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index 12ee8bf..02d5ca1 100644 --- a/gnome-bluetooth.spec +++ b/gnome-bluetooth.spec @@ -27,8 +27,8 @@ Group: System/GUI/GNOME Source: http://download.gnome.org/sources/gnome-bluetooth/2.27/gnome-bluetooth-%{version}.tar.bz2 # PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches Patch0: lxde-support.patch -# PATCH-FIX-UPSTREAM gnome-bluetooth-fix-parallel-build.patch bgo#630024 vuntz@opensuse.org -- Improve build system for introspection to fix parallel build -Patch1: gnome-bluetooth-fix-parallel-build.patch +# PATCH-FIX-UPSTREAM gnome-bluetooth-fix-introspection-build.patch bgo#630024 vuntz@opensuse.org -- Fix build with recent gobject-introspection +Patch1: gnome-bluetooth-fix-introspection-build.patch BuildRequires: fdupes # Needed for geoclue plugin BuildRequires: gconf2-devel From 7cc9ec0ce117f0b3f84ff841033871a263ccf3bf564e65a603fc94d94cdf8cbb Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 15 Oct 2010 14:44:43 +0000 Subject: [PATCH 3/4] Accepting request 50686 from GNOME:Factory checked in (request 50686) OBS-URL: https://build.opensuse.org/request/show/50686 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-bluetooth?expand=0&rev=58 --- gnome-bluetooth-2.31.90.tar.bz2 | 3 + gnome-bluetooth-2.32.0.tar.bz2 | 3 - ...> gnome-bluetooth-fix-parallel-build.patch | 191 ++++++++---------- gnome-bluetooth.changes | 14 -- gnome-bluetooth.spec | 8 +- 5 files changed, 90 insertions(+), 129 deletions(-) create mode 100644 gnome-bluetooth-2.31.90.tar.bz2 delete mode 100644 gnome-bluetooth-2.32.0.tar.bz2 rename gnome-bluetooth-fix-introspection-build.patch => gnome-bluetooth-fix-parallel-build.patch (69%) diff --git a/gnome-bluetooth-2.31.90.tar.bz2 b/gnome-bluetooth-2.31.90.tar.bz2 new file mode 100644 index 0000000..717ee30 --- /dev/null +++ b/gnome-bluetooth-2.31.90.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f5dec899c9fd425972074308fdd6287376bd7087a33101fe0644fa82c10076dc +size 3662410 diff --git a/gnome-bluetooth-2.32.0.tar.bz2 b/gnome-bluetooth-2.32.0.tar.bz2 deleted file mode 100644 index 2cde0db..0000000 --- a/gnome-bluetooth-2.32.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:57b1f06c96a1b85e1c19ff919d708cc38e95edae658881ed99968c325839a973 -size 1231205 diff --git a/gnome-bluetooth-fix-introspection-build.patch b/gnome-bluetooth-fix-parallel-build.patch similarity index 69% rename from gnome-bluetooth-fix-introspection-build.patch rename to gnome-bluetooth-fix-parallel-build.patch index 78bf7a9..41475dc 100644 --- a/gnome-bluetooth-fix-introspection-build.patch +++ b/gnome-bluetooth-fix-parallel-build.patch @@ -1,31 +1,89 @@ -commit c07d2f7fd6c38deda7b827902e62c507e55ac300 -Author: Vincent Untz -Date: Fri Oct 1 18:05:03 2010 +0200 - - Fix introspection build - - https://bugzilla.gnome.org/show_bug.cgi?id=630024 - -diff --git a/Makefile.am b/Makefile.am -index 9391392..f73baf4 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -9,10 +9,9 @@ SUBDIRS = icons lib applet properties wizard sendto $(MOBLIN_DIR) docs po help - DIST_SUBDIRS = $(DEF_SUBDIRS) moblin - EXTRA_DIST = intltool-extract.in intltool-update.in intltool-merge.in ChangeLog.pre-2.27 gtk-doc.make gnome-doc-utils.make +Index: gnome-bluetooth-2.31.90/lib/Makefile.am +=================================================================== +--- gnome-bluetooth-2.31.90.orig/lib/Makefile.am ++++ gnome-bluetooth-2.31.90/lib/Makefile.am +@@ -1,7 +1,7 @@ + SUBDIRS = plugins --# FIXME https://bugzilla.gnome.org/show_bug.cgi?id=595675 - DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install \ - --disable-desktop-update --disable-mime-update --disable-icon-update \ -- --enable-gtk-doc --disable-scrollkeeper --enable-introspection=no -+ --enable-gtk-doc --disable-scrollkeeper --enable-introspection + EXTRA_DIST = +-BUILT_GIRSOURCES = ++CLEANFILES = - DISTCLEANFILES = intltool-extract intltool-update intltool-merge gnome-doc-utils.make + noinst_LTLIBRARIES = libcommon.la + lib_LTLIBRARIES = libgnome-bluetooth.la +@@ -55,41 +55,33 @@ gnomebluetooth_HEADERS = \ -diff --git a/acinclude.m4 b/acinclude.m4 -index 5cf8c03..deebd2b 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 + AM_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS) $(COMMON_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPLUGINDIR=\"$(libdir)/gnome-bluetooth/plugins\" + +-if HAVE_INTROSPECTION +-BUILT_GIRSOURCES += GnomeBluetooth-1.0.gir ++-include $(INTROSPECTION_MAKEFILE) ++INTROSPECTION_GIRS = ++INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir) ++INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) + ++if HAVE_INTROSPECTION + GnomeBluetooth-1.0.gir: $(libgnome_bluetooth_la_SOURCES) + GnomeBluetooth-1.0.gir: $(gnomebluetooth_HEADERS) + GnomeBluetooth-1.0.gir: libgnome-bluetooth.la + GnomeBluetooth-1.0.gir: $(INTROSPECTION_SCANNER) +- $(AM_V_GEN) $(INTROSPECTION_SCANNER) -v --namespace GnomeBluetooth --nsversion=1.0 \ +- --add-include-path=$(srcdir) --add-include-path=. \ +- --include=GObject-2.0 \ +- --include=Gtk-2.0 \ +- --include=DBusGLib-1.0 \ +- --include=GModule-2.0 \ +- --libtool="$(LIBTOOL)" \ +- --library=gnome-bluetooth \ +- --output $@ \ +- --pkg gobject-2.0 \ +- --pkg gtk+-2.0 \ +- --pkg dbus-glib-1 \ +- --pkg gmodule-2.0 \ +- -I$(srcdir) \ +- $(LIBGNOMEBT_CFLAGS) \ +- $(gnomebluetooth_HEADERS) + +-girdir = $(INTROSPECTION_GIRDIR) +-dist_gir_DATA = $(BUILT_GIRSOURCES) ++GnomeBluetooth_1_0_gir_INCLUDES = GObject-2.0 Gtk-2.0 DBusGLib-1.0 GModule-2.0 ++GnomeBluetooth_1_0_gir_CFLAGS = \ ++ -I$(srcdir) \ ++ $(LIBGNOMEBT_CFLAGS) ++GnomeBluetooth_1_0_gir_LIBS = libgnome-bluetooth.la ++GnomeBluetooth_1_0_gir_FILES = $(gnomebluetooth_HEADERS) ++GnomeBluetooth_1_0_gir_SCANNERFLAGS = --namespace=GnomeBluetooth ++INTROSPECTION_GIRS += GnomeBluetooth-1.0.gir + +-EXTRA_DIST += $(BUILT_GIRSOURCES) ++girdir = $(INTROSPECTION_GIRDIR) ++gir_DATA = $(INTROSPECTION_GIRS) + +-typelibsdir = $(INTROSPECTION_TYPELIBDIR) +-typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) ++typelibdir = $(INTROSPECTION_TYPELIBDIR) ++typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) + +-%.typelib: %.gir $(G_IR_COMPILER) +- $(AM_V_GEN) LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@ +- ++CLEANFILES += $(gir_DATA) $(typelib_DATA) + endif # HAVE_INTROSPECTION + + BUILT_SOURCES = marshal.h marshal.c \ +@@ -101,7 +93,7 @@ BUILT_SOURCES = marshal.h marshal.c \ + + nodist_libcommon_la_SOURCES = $(BUILT_SOURCES) + +-CLEANFILES = $(BUILT_SOURCES) ++CLEANFILES += $(BUILT_SOURCES) + + noinst_PROGRAMS = test-client test-agent test-deviceselection test-plugins test-class + +Index: gnome-bluetooth-2.31.90/acinclude.m4 +=================================================================== +--- gnome-bluetooth-2.31.90.orig/acinclude.m4 ++++ gnome-bluetooth-2.31.90/acinclude.m4 @@ -1,93 +1,3 @@ -dnl -*- mode: autoconf -*- -dnl Copyright 2009 Johan Dahlin @@ -120,86 +178,3 @@ index 5cf8c03..deebd2b 100644 dnl as-ac-expand.m4 0.2.0 -*- autoconf -*- dnl autostars m4 macro for expanding directories using configure's prefix -diff --git a/configure.ac b/configure.ac -index 8bbce4e..02aaf5f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -186,7 +186,7 @@ AC_SUBST(DBUS_BINDING_TOOL) - GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` - AC_SUBST(GLIB_GENMARSHAL) - --GOBJECT_INTROSPECTION_CHECK([0.6.3]) -+GOBJECT_INTROSPECTION_CHECK([0.6.7]) - - GNOME_COMMON_INIT - GNOME_DEBUG_CHECK -diff --git a/lib/Makefile.am b/lib/Makefile.am -index 6da2a9c..d0bc250 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -55,41 +55,27 @@ gnomebluetooth_HEADERS = \ - - AM_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS) $(COMMON_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPLUGINDIR=\"$(libdir)/gnome-bluetooth/plugins\" - -+-include $(INTROSPECTION_MAKEFILE) -+INTROSPECTION_GIRS = -+INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir) -+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) -+ - if HAVE_INTROSPECTION --BUILT_GIRSOURCES += GnomeBluetooth-1.0.gir -+introspection_sources = $(gnomebluetooth_HEADERS) - --GnomeBluetooth-1.0.gir: $(libgnome_bluetooth_la_SOURCES) --GnomeBluetooth-1.0.gir: $(gnomebluetooth_HEADERS) - GnomeBluetooth-1.0.gir: libgnome-bluetooth.la --GnomeBluetooth-1.0.gir: $(INTROSPECTION_SCANNER) -- $(AM_V_GEN) $(INTROSPECTION_SCANNER) -v --namespace GnomeBluetooth --nsversion=1.0 \ -- --add-include-path=$(srcdir) --add-include-path=. \ -- --include=GObject-2.0 \ -- --include=Gtk-2.0 \ -- --include=DBusGLib-1.0 \ -- --include=GModule-2.0 \ -- --libtool="$(LIBTOOL)" \ -- --library=gnome-bluetooth \ -- --output $@ \ -- --pkg gobject-2.0 \ -- --pkg gtk+-2.0 \ -- --pkg dbus-glib-1 \ -- --pkg gmodule-2.0 \ -- -I$(srcdir) \ -- $(LIBGNOMEBT_CFLAGS) \ -- $(gnomebluetooth_HEADERS) -+GnomeBluetooth_1_0_gir_INCLUDES = GObject-2.0 Gtk-2.0 DBusGLib-1.0 GModule-2.0 -+GnomeBluetooth_1_0_gir_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS) -+GnomeBluetooth_1_0_gir_LIBS = libgnome-bluetooth.la -+GnomeBluetooth_1_0_gir_SCANNERFLAGS = --strip-prefix=Bluetooth --pkg-export=gnome-bluetooth-1.0 -+GnomeBluetooth_1_0_gir_FILES = $(introspection_sources) -+INTROSPECTION_GIRS += GnomeBluetooth-1.0.gir - - girdir = $(INTROSPECTION_GIRDIR) --dist_gir_DATA = $(BUILT_GIRSOURCES) -- --EXTRA_DIST += $(BUILT_GIRSOURCES) -- --typelibsdir = $(INTROSPECTION_TYPELIBDIR) --typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) -+gir_DATA = $(INTROSPECTION_GIRS) - --%.typelib: %.gir $(G_IR_COMPILER) -- $(AM_V_GEN) LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@ -- -+typelibdir = $(INTROSPECTION_TYPELIBDIR) -+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) - endif # HAVE_INTROSPECTION - - BUILT_SOURCES = marshal.h marshal.c \ -@@ -101,7 +87,7 @@ BUILT_SOURCES = marshal.h marshal.c \ - - nodist_libcommon_la_SOURCES = $(BUILT_SOURCES) - --CLEANFILES = $(BUILT_SOURCES) -+CLEANFILES = $(BUILT_SOURCES) $(gir_DATA) $(typelib_DATA) - - noinst_PROGRAMS = test-client test-agent test-deviceselection test-plugins test-class - diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes index 6e2252c..7bbc857 100644 --- a/gnome-bluetooth.changes +++ b/gnome-bluetooth.changes @@ -1,17 +1,3 @@ -------------------------------------------------------------------- -Fri Oct 1 18:08:32 CEST 2010 - vuntz@opensuse.org - -- Add gnome-bluetooth-fix-introspection-build.patch, which - obsoletes gnome-bluetooth-fix-parallel-build.patch: this updated - patch will really fix the build with recent - gobject-introspection. - -------------------------------------------------------------------- -Tue Sep 28 18:51:54 CEST 2010 - vuntz@opensuse.org - -- Update to version 2.32.0: - + Updated translations. - ------------------------------------------------------------------- Sun Sep 19 00:50:00 CEST 2010 - vuntz@opensuse.org diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index 02d5ca1..57045c1 100644 --- a/gnome-bluetooth.spec +++ b/gnome-bluetooth.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-bluetooth (Version 2.32.0) +# spec file for package gnome-bluetooth (Version 2.31.90) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: gnome-bluetooth -Version: 2.32.0 +Version: 2.31.90 Release: 1 License: GPLv2+ Summary: GNOME Bluetooth graphical utilities @@ -27,8 +27,8 @@ Group: System/GUI/GNOME Source: http://download.gnome.org/sources/gnome-bluetooth/2.27/gnome-bluetooth-%{version}.tar.bz2 # PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches Patch0: lxde-support.patch -# PATCH-FIX-UPSTREAM gnome-bluetooth-fix-introspection-build.patch bgo#630024 vuntz@opensuse.org -- Fix build with recent gobject-introspection -Patch1: gnome-bluetooth-fix-introspection-build.patch +# PATCH-FIX-UPSTREAM gnome-bluetooth-fix-parallel-build.patch bgo#630024 vuntz@opensuse.org -- Improve build system for introspection to fix parallel build +Patch1: gnome-bluetooth-fix-parallel-build.patch BuildRequires: fdupes # Needed for geoclue plugin BuildRequires: gconf2-devel From ed9ab1f5810af08ddcf31b3c86a93a2794a89a537432f26b3d9bd21fd1587176 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 15 Oct 2010 14:44:44 +0000 Subject: [PATCH 4/4] Updating link to change in openSUSE:Factory/gnome-bluetooth revision 36.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-bluetooth?expand=0&rev=bcbfe57a19754195a3bc4fa344872214 --- gnome-bluetooth-2.31.90.tar.bz2 | 3 - gnome-bluetooth-2.32.0.tar.bz2 | 3 + ...me-bluetooth-fix-introspection-build.patch | 191 ++++++++++-------- gnome-bluetooth.changes | 14 ++ gnome-bluetooth.spec | 8 +- 5 files changed, 129 insertions(+), 90 deletions(-) delete mode 100644 gnome-bluetooth-2.31.90.tar.bz2 create mode 100644 gnome-bluetooth-2.32.0.tar.bz2 rename gnome-bluetooth-fix-parallel-build.patch => gnome-bluetooth-fix-introspection-build.patch (69%) diff --git a/gnome-bluetooth-2.31.90.tar.bz2 b/gnome-bluetooth-2.31.90.tar.bz2 deleted file mode 100644 index 717ee30..0000000 --- a/gnome-bluetooth-2.31.90.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f5dec899c9fd425972074308fdd6287376bd7087a33101fe0644fa82c10076dc -size 3662410 diff --git a/gnome-bluetooth-2.32.0.tar.bz2 b/gnome-bluetooth-2.32.0.tar.bz2 new file mode 100644 index 0000000..2cde0db --- /dev/null +++ b/gnome-bluetooth-2.32.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57b1f06c96a1b85e1c19ff919d708cc38e95edae658881ed99968c325839a973 +size 1231205 diff --git a/gnome-bluetooth-fix-parallel-build.patch b/gnome-bluetooth-fix-introspection-build.patch similarity index 69% rename from gnome-bluetooth-fix-parallel-build.patch rename to gnome-bluetooth-fix-introspection-build.patch index 41475dc..78bf7a9 100644 --- a/gnome-bluetooth-fix-parallel-build.patch +++ b/gnome-bluetooth-fix-introspection-build.patch @@ -1,89 +1,31 @@ -Index: gnome-bluetooth-2.31.90/lib/Makefile.am -=================================================================== ---- gnome-bluetooth-2.31.90.orig/lib/Makefile.am -+++ gnome-bluetooth-2.31.90/lib/Makefile.am -@@ -1,7 +1,7 @@ - SUBDIRS = plugins +commit c07d2f7fd6c38deda7b827902e62c507e55ac300 +Author: Vincent Untz +Date: Fri Oct 1 18:05:03 2010 +0200 + + Fix introspection build + + https://bugzilla.gnome.org/show_bug.cgi?id=630024 + +diff --git a/Makefile.am b/Makefile.am +index 9391392..f73baf4 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -9,10 +9,9 @@ SUBDIRS = icons lib applet properties wizard sendto $(MOBLIN_DIR) docs po help + DIST_SUBDIRS = $(DEF_SUBDIRS) moblin + EXTRA_DIST = intltool-extract.in intltool-update.in intltool-merge.in ChangeLog.pre-2.27 gtk-doc.make gnome-doc-utils.make - EXTRA_DIST = --BUILT_GIRSOURCES = -+CLEANFILES = +-# FIXME https://bugzilla.gnome.org/show_bug.cgi?id=595675 + DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install \ + --disable-desktop-update --disable-mime-update --disable-icon-update \ +- --enable-gtk-doc --disable-scrollkeeper --enable-introspection=no ++ --enable-gtk-doc --disable-scrollkeeper --enable-introspection - noinst_LTLIBRARIES = libcommon.la - lib_LTLIBRARIES = libgnome-bluetooth.la -@@ -55,41 +55,33 @@ gnomebluetooth_HEADERS = \ + DISTCLEANFILES = intltool-extract intltool-update intltool-merge gnome-doc-utils.make - AM_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS) $(COMMON_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPLUGINDIR=\"$(libdir)/gnome-bluetooth/plugins\" - --if HAVE_INTROSPECTION --BUILT_GIRSOURCES += GnomeBluetooth-1.0.gir -+-include $(INTROSPECTION_MAKEFILE) -+INTROSPECTION_GIRS = -+INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir) -+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) - -+if HAVE_INTROSPECTION - GnomeBluetooth-1.0.gir: $(libgnome_bluetooth_la_SOURCES) - GnomeBluetooth-1.0.gir: $(gnomebluetooth_HEADERS) - GnomeBluetooth-1.0.gir: libgnome-bluetooth.la - GnomeBluetooth-1.0.gir: $(INTROSPECTION_SCANNER) -- $(AM_V_GEN) $(INTROSPECTION_SCANNER) -v --namespace GnomeBluetooth --nsversion=1.0 \ -- --add-include-path=$(srcdir) --add-include-path=. \ -- --include=GObject-2.0 \ -- --include=Gtk-2.0 \ -- --include=DBusGLib-1.0 \ -- --include=GModule-2.0 \ -- --libtool="$(LIBTOOL)" \ -- --library=gnome-bluetooth \ -- --output $@ \ -- --pkg gobject-2.0 \ -- --pkg gtk+-2.0 \ -- --pkg dbus-glib-1 \ -- --pkg gmodule-2.0 \ -- -I$(srcdir) \ -- $(LIBGNOMEBT_CFLAGS) \ -- $(gnomebluetooth_HEADERS) - --girdir = $(INTROSPECTION_GIRDIR) --dist_gir_DATA = $(BUILT_GIRSOURCES) -+GnomeBluetooth_1_0_gir_INCLUDES = GObject-2.0 Gtk-2.0 DBusGLib-1.0 GModule-2.0 -+GnomeBluetooth_1_0_gir_CFLAGS = \ -+ -I$(srcdir) \ -+ $(LIBGNOMEBT_CFLAGS) -+GnomeBluetooth_1_0_gir_LIBS = libgnome-bluetooth.la -+GnomeBluetooth_1_0_gir_FILES = $(gnomebluetooth_HEADERS) -+GnomeBluetooth_1_0_gir_SCANNERFLAGS = --namespace=GnomeBluetooth -+INTROSPECTION_GIRS += GnomeBluetooth-1.0.gir - --EXTRA_DIST += $(BUILT_GIRSOURCES) -+girdir = $(INTROSPECTION_GIRDIR) -+gir_DATA = $(INTROSPECTION_GIRS) - --typelibsdir = $(INTROSPECTION_TYPELIBDIR) --typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) -+typelibdir = $(INTROSPECTION_TYPELIBDIR) -+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) - --%.typelib: %.gir $(G_IR_COMPILER) -- $(AM_V_GEN) LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@ -- -+CLEANFILES += $(gir_DATA) $(typelib_DATA) - endif # HAVE_INTROSPECTION - - BUILT_SOURCES = marshal.h marshal.c \ -@@ -101,7 +93,7 @@ BUILT_SOURCES = marshal.h marshal.c \ - - nodist_libcommon_la_SOURCES = $(BUILT_SOURCES) - --CLEANFILES = $(BUILT_SOURCES) -+CLEANFILES += $(BUILT_SOURCES) - - noinst_PROGRAMS = test-client test-agent test-deviceselection test-plugins test-class - -Index: gnome-bluetooth-2.31.90/acinclude.m4 -=================================================================== ---- gnome-bluetooth-2.31.90.orig/acinclude.m4 -+++ gnome-bluetooth-2.31.90/acinclude.m4 +diff --git a/acinclude.m4 b/acinclude.m4 +index 5cf8c03..deebd2b 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 @@ -1,93 +1,3 @@ -dnl -*- mode: autoconf -*- -dnl Copyright 2009 Johan Dahlin @@ -178,3 +120,86 @@ Index: gnome-bluetooth-2.31.90/acinclude.m4 dnl as-ac-expand.m4 0.2.0 -*- autoconf -*- dnl autostars m4 macro for expanding directories using configure's prefix +diff --git a/configure.ac b/configure.ac +index 8bbce4e..02aaf5f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -186,7 +186,7 @@ AC_SUBST(DBUS_BINDING_TOOL) + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` + AC_SUBST(GLIB_GENMARSHAL) + +-GOBJECT_INTROSPECTION_CHECK([0.6.3]) ++GOBJECT_INTROSPECTION_CHECK([0.6.7]) + + GNOME_COMMON_INIT + GNOME_DEBUG_CHECK +diff --git a/lib/Makefile.am b/lib/Makefile.am +index 6da2a9c..d0bc250 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -55,41 +55,27 @@ gnomebluetooth_HEADERS = \ + + AM_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS) $(COMMON_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPLUGINDIR=\"$(libdir)/gnome-bluetooth/plugins\" + ++-include $(INTROSPECTION_MAKEFILE) ++INTROSPECTION_GIRS = ++INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir) ++INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) ++ + if HAVE_INTROSPECTION +-BUILT_GIRSOURCES += GnomeBluetooth-1.0.gir ++introspection_sources = $(gnomebluetooth_HEADERS) + +-GnomeBluetooth-1.0.gir: $(libgnome_bluetooth_la_SOURCES) +-GnomeBluetooth-1.0.gir: $(gnomebluetooth_HEADERS) + GnomeBluetooth-1.0.gir: libgnome-bluetooth.la +-GnomeBluetooth-1.0.gir: $(INTROSPECTION_SCANNER) +- $(AM_V_GEN) $(INTROSPECTION_SCANNER) -v --namespace GnomeBluetooth --nsversion=1.0 \ +- --add-include-path=$(srcdir) --add-include-path=. \ +- --include=GObject-2.0 \ +- --include=Gtk-2.0 \ +- --include=DBusGLib-1.0 \ +- --include=GModule-2.0 \ +- --libtool="$(LIBTOOL)" \ +- --library=gnome-bluetooth \ +- --output $@ \ +- --pkg gobject-2.0 \ +- --pkg gtk+-2.0 \ +- --pkg dbus-glib-1 \ +- --pkg gmodule-2.0 \ +- -I$(srcdir) \ +- $(LIBGNOMEBT_CFLAGS) \ +- $(gnomebluetooth_HEADERS) ++GnomeBluetooth_1_0_gir_INCLUDES = GObject-2.0 Gtk-2.0 DBusGLib-1.0 GModule-2.0 ++GnomeBluetooth_1_0_gir_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS) ++GnomeBluetooth_1_0_gir_LIBS = libgnome-bluetooth.la ++GnomeBluetooth_1_0_gir_SCANNERFLAGS = --strip-prefix=Bluetooth --pkg-export=gnome-bluetooth-1.0 ++GnomeBluetooth_1_0_gir_FILES = $(introspection_sources) ++INTROSPECTION_GIRS += GnomeBluetooth-1.0.gir + + girdir = $(INTROSPECTION_GIRDIR) +-dist_gir_DATA = $(BUILT_GIRSOURCES) +- +-EXTRA_DIST += $(BUILT_GIRSOURCES) +- +-typelibsdir = $(INTROSPECTION_TYPELIBDIR) +-typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) ++gir_DATA = $(INTROSPECTION_GIRS) + +-%.typelib: %.gir $(G_IR_COMPILER) +- $(AM_V_GEN) LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@ +- ++typelibdir = $(INTROSPECTION_TYPELIBDIR) ++typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) + endif # HAVE_INTROSPECTION + + BUILT_SOURCES = marshal.h marshal.c \ +@@ -101,7 +87,7 @@ BUILT_SOURCES = marshal.h marshal.c \ + + nodist_libcommon_la_SOURCES = $(BUILT_SOURCES) + +-CLEANFILES = $(BUILT_SOURCES) ++CLEANFILES = $(BUILT_SOURCES) $(gir_DATA) $(typelib_DATA) + + noinst_PROGRAMS = test-client test-agent test-deviceselection test-plugins test-class + diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes index 7bbc857..6e2252c 100644 --- a/gnome-bluetooth.changes +++ b/gnome-bluetooth.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Oct 1 18:08:32 CEST 2010 - vuntz@opensuse.org + +- Add gnome-bluetooth-fix-introspection-build.patch, which + obsoletes gnome-bluetooth-fix-parallel-build.patch: this updated + patch will really fix the build with recent + gobject-introspection. + +------------------------------------------------------------------- +Tue Sep 28 18:51:54 CEST 2010 - vuntz@opensuse.org + +- Update to version 2.32.0: + + Updated translations. + ------------------------------------------------------------------- Sun Sep 19 00:50:00 CEST 2010 - vuntz@opensuse.org diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index 57045c1..02d5ca1 100644 --- a/gnome-bluetooth.spec +++ b/gnome-bluetooth.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-bluetooth (Version 2.31.90) +# spec file for package gnome-bluetooth (Version 2.32.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: gnome-bluetooth -Version: 2.31.90 +Version: 2.32.0 Release: 1 License: GPLv2+ Summary: GNOME Bluetooth graphical utilities @@ -27,8 +27,8 @@ Group: System/GUI/GNOME Source: http://download.gnome.org/sources/gnome-bluetooth/2.27/gnome-bluetooth-%{version}.tar.bz2 # PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches Patch0: lxde-support.patch -# PATCH-FIX-UPSTREAM gnome-bluetooth-fix-parallel-build.patch bgo#630024 vuntz@opensuse.org -- Improve build system for introspection to fix parallel build -Patch1: gnome-bluetooth-fix-parallel-build.patch +# PATCH-FIX-UPSTREAM gnome-bluetooth-fix-introspection-build.patch bgo#630024 vuntz@opensuse.org -- Fix build with recent gobject-introspection +Patch1: gnome-bluetooth-fix-introspection-build.patch BuildRequires: fdupes # Needed for geoclue plugin BuildRequires: gconf2-devel