Hello community, here is the log from the commit of package gnome-bluetooth for openSUSE:Factory checked in at Fri Sep 24 00:25:21 CEST 2010. -------- --- GNOME/gnome-bluetooth/gnome-bluetooth.changes 2010-09-06 14:11:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-bluetooth/gnome-bluetooth.changes 2010-09-19 00:51:15.000000000 +0200 @@ -1,0 +2,21 @@ +Sun Sep 19 00:50:00 CEST 2010 - vuntz@opensuse.org + +- Move gir files to devel subpackage. + +------------------------------------------------------------------- +Sun Sep 19 00:16:15 CEST 2010 - vuntz@opensuse.org + +- Remove gir-repository BuildRequires: this was only needed for the + DBusGLib gir, which is now part of gobject-introspection. +- Add gnome-bluetooth-fix-parallel-build.patch: this updates the + build system for introspection, to work correctly. This requires + the gnome-common BuildRequires and the call to gnome-autogen.sh. + +------------------------------------------------------------------- +Mon Sep 13 18:00:37 CEST 2010 - vuntz@opensuse.org + +- Update to version 2.31.90: + + More killswitch fixes + + Fix crasher when Bluetooth nautilus-sendto plugin is loaded + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gnome-bluetooth-2.31.6.tar.bz2 New: ---- gnome-bluetooth-2.31.90.tar.bz2 gnome-bluetooth-fix-parallel-build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-bluetooth.spec ++++++ --- /var/tmp/diff_new_pack.8SnNwY/_old 2010-09-24 00:25:02.000000000 +0200 +++ /var/tmp/diff_new_pack.8SnNwY/_new 2010-09-24 00:25:02.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gnome-bluetooth (Version 2.31.6) +# spec file for package gnome-bluetooth (Version 2.31.90) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,8 +18,8 @@ Name: gnome-bluetooth -Version: 2.31.6 -Release: 3 +Version: 2.31.90 +Release: 1 License: GPLv2+ Summary: GNOME Bluetooth graphical utilities Url: http://live.gnome.org/GnomeBluetooth @@ -27,10 +27,13 @@ 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 BuildRequires: fdupes # Needed for geoclue plugin BuildRequires: gconf2-devel -BuildRequires: gir-repository +# Needed for patch1 gnome-bluetooth-fix-parallel-build.patch +BuildRequires: gnome-common BuildRequires: gnome-doc-utils-devel BuildRequires: gobject-introspection-devel BuildRequires: intltool @@ -109,8 +112,10 @@ %setup -q translation-update-upstream %patch0 -p1 +%patch1 -p1 %build +NOCONFIGURE=1 gnome-autogen.sh %configure \ --disable-icon-update \ --disable-scrollkeeper \ @@ -171,14 +176,14 @@ %files -n libgnome-bluetooth8 %defattr(-,root,root,-) %{_libdir}/libgnome-bluetooth.so.* -%{_libdir}/girepository-1.0/*.typelib -%{_datadir}/gir-1.0/*.gir +%{_libdir}/girepository-1.0/GnomeBluetooth-1.0.typelib %files devel %defattr(-, root, root) %{_includedir}/gnome-bluetooth %{_libdir}/libgnome-bluetooth.so %{_libdir}/pkgconfig/gnome-bluetooth-1.0.pc +%{_datadir}/gir-1.0/*.gir %{_datadir}/gtk-doc/html/gnome-bluetooth %files plugins-geoclue ++++++ gnome-bluetooth-2.31.6.tar.bz2 -> gnome-bluetooth-2.31.90.tar.bz2 ++++++ ++++ 15020 lines of diff (skipped) ++++++ gnome-bluetooth-fix-parallel-build.patch ++++++ 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 EXTRA_DIST = -BUILT_GIRSOURCES = +CLEANFILES = noinst_LTLIBRARIES = libcommon.la lib_LTLIBRARIES = libgnome-bluetooth.la @@ -55,41 +55,33 @@ gnomebluetooth_HEADERS = \ 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 -dnl -dnl This file is free software; the author(s) gives unlimited -dnl permission to copy and/or distribute it, with or without -dnl modifications, as long as this notice is preserved. -dnl - -# serial 1 - -m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], -[ - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([LT_INIT],[$0])dnl setup libtool first - - dnl enable/disable introspection - m4_if([$2], [require], - [dnl - enable_introspection=yes - ],[dnl - AC_ARG_ENABLE(introspection, - AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], - [Enable introspection for this build]),, - [enable_introspection=auto]) - ])dnl - - AC_MSG_CHECKING([for gobject-introspection]) - - dnl presence/version checking - AS_CASE([$enable_introspection], - [no], [dnl - found_introspection="no (disabled, use --enable-introspection to enable)" - ],dnl - [yes],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0],, - AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], - found_introspection=yes, - AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) - ],dnl - [auto],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) - ],dnl - [dnl - AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) - ])dnl - - AC_MSG_RESULT([$found_introspection]) - - INTROSPECTION_SCANNER= - INTROSPECTION_COMPILER= - INTROSPECTION_GENERATE= - INTROSPECTION_GIRDIR= - INTROSPECTION_TYPELIBDIR= - if test "x$found_introspection" = "xyes"; then - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" - fi - AC_SUBST(INTROSPECTION_SCANNER) - AC_SUBST(INTROSPECTION_COMPILER) - AC_SUBST(INTROSPECTION_GENERATE) - AC_SUBST(INTROSPECTION_GIRDIR) - AC_SUBST(INTROSPECTION_TYPELIBDIR) - - AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") -]) - - -dnl Usage: -dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) - -AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) -]) - -dnl Usage: -dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) - - -AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) -]) - - dnl as-ac-expand.m4 0.2.0 -*- autoconf -*- dnl autostars m4 macro for expanding directories using configure's prefix ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org