packages: gnome-bluetooth/gnome-bluetooth.spec, gnome-bluetooth/gnome-bluet...

[megabajt]

Author: megabajt                     Date: Tue Feb 14 17:03:29 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed build with automake 1.11.2
- release 2

---- Files affected:
packages/gnome-bluetooth:
   gnome-bluetooth.spec (1.92 -> 1.93) , gnome-bluetooth-am.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gnome-bluetooth/gnome-bluetooth.spec
diff -u packages/gnome-bluetooth/gnome-bluetooth.spec:1.92 packages/gnome-bluetooth/gnome-bluetooth.spec:1.93
--- packages/gnome-bluetooth/gnome-bluetooth.spec:1.92	Fri Feb 10 09:15:24 2012
+++ packages/gnome-bluetooth/gnome-bluetooth.spec	Tue Feb 14 18:03:24 2012
@@ -3,12 +3,13 @@
 Summary(pl.UTF-8):	Podsystem GNOME Bluetooth
 Name:		gnome-bluetooth
 Version:	3.2.2
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-bluetooth/3.2/%{name}-%{version}.tar.xz
 # Source0-md5:	92d5a6b20ecc1bb854aaab67b0a155d6
 Source1:	61-%{name}-rfkill.rules
+Patch0:		%{name}-am.patch
 URL:		http://live.gnome.org/GnomeBluetooth
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake >= 1:1.9
@@ -120,6 +121,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__gtkdocize}
@@ -229,6 +231,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.93  2012/02/14 17:03:24  megabajt
+- fixed build with automake 1.11.2
+- release 2
+
 Revision 1.92  2012/02/10 08:15:24  lisu
 - up to 3.2.2
 

================================================================
Index: packages/gnome-bluetooth/gnome-bluetooth-am.patch
diff -u /dev/null packages/gnome-bluetooth/gnome-bluetooth-am.patch:1.1
--- /dev/null	Tue Feb 14 18:03:29 2012
+++ packages/gnome-bluetooth/gnome-bluetooth-am.patch	Tue Feb 14 18:03:24 2012
@@ -0,0 +1,29 @@
+From f6b6f6bd6020ded3dc6b115536b5382b65786f72 Mon Sep 17 00:00:00 2001
+From: Chen Xiao-Long <chillermillerlong at hotmail.com>
+Date: Fri, 06 Jan 2012 11:46:32 +0000
+Subject: applet: Fix build with automake 1.11.2
+
+pkglib_DATA cannot be used in automake 1.11.2, so use another
+name for the files.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=667323
+---
+(limited to 'applet')
+
+diff --git a/applet/Makefile-lib.am b/applet/Makefile-lib.am
+index 4bd795f..7f75083 100644
+--- a/applet/Makefile-lib.am
++++ b/applet/Makefile-lib.am
+@@ -28,7 +28,8 @@ GnomeBluetoothApplet_1_0_gir_LIBS = libgnome-bluetooth-applet.la
+ GnomeBluetoothApplet_1_0_gir_FILES = $(libgnome_bluetooth_applet_la_SOURCES) ../lib/bluetooth-enums.h
+ INTROSPECTION_GIRS += GnomeBluetoothApplet-1.0.gir
+ 
+-pkglib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
++typelibdir = $(pkglibdir)
++typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+ 
+-CLEANFILES += $(pkglib_DATA)
++CLEANFILES += $(typelib_DATA)
+ endif # HAVE_INTROSPECTION
+--
+cgit v0.9.0.2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-bluetooth/gnome-bluetooth.spec?r1=1.92&r2=1.93&f=u