rpms/gnome-bluetooth/devel gnome-bluetooth-0.7.0-pydir.patch, 1.1, 1.2 gnome-bluetooth.spec, 1.29, 1.30

[fedora-cvs-commits at redhat.com]

Author: harald

Update of /cvs/dist/rpms/gnome-bluetooth/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23515

Modified Files:
	gnome-bluetooth-0.7.0-pydir.patch gnome-bluetooth.spec 
Log Message:
pydir fixes for lib64

gnome-bluetooth-0.7.0-pydir.patch:
 acinclude.m4                      |  126 --------------------------------------
 python/Makefile.am                |    2 
 python/gnome-bluetooth-manager.in |    7 +-
 src/Makefile.am                   |    2 
 4 files changed, 9 insertions(+), 128 deletions(-)

Index: gnome-bluetooth-0.7.0-pydir.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-bluetooth/devel/gnome-bluetooth-0.7.0-pydir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-bluetooth-0.7.0-pydir.patch	16 Feb 2006 14:22:08 -0000	1.1
+++ gnome-bluetooth-0.7.0-pydir.patch	27 Feb 2006 13:41:44 -0000	1.2
@@ -1,5 +1,16 @@
+--- gnome-bluetooth-0.7.0/src/Makefile.am.pydir	2006-02-27 14:37:05.000000000 +0100
++++ gnome-bluetooth-0.7.0/src/Makefile.am	2006-02-27 14:37:52.000000000 +0100
+@@ -118,7 +118,7 @@
+ 		--override $(srcdir)/gnomebt-chooser.override \
+ 		$(srcdir)/gnomebt-chooser.defs > $@
+ 
+-pydir = @pythondir@/gnomebt/
++pydir = @pyexecdir@/gnomebt/
+ 
+ controller_la_SOURCES = gnomebt-controller-py.c gnomebt-controller-pymodule.c
+ controller_la_LIBADD =  libgnomebt.la
 --- gnome-bluetooth-0.7.0/acinclude.m4.pydir	2005-11-21 23:13:25.000000000 +0100
-+++ gnome-bluetooth-0.7.0/acinclude.m4	2006-02-16 11:26:49.000000000 +0100
++++ gnome-bluetooth-0.7.0/acinclude.m4	2006-02-27 14:31:40.000000000 +0100
 @@ -27,108 +27,6 @@
  # doesn't meet the requirement.  MINIMUM-VERSION should consist of
  # numbers and dots only.
@@ -147,8 +158,17 @@
  dnl Configure paths for libsdp
  dnl Edd Dumbill <edd at usefulinc.com>
  dnl Shamelessly stolen from Jack Moffitt, who stole
+--- gnome-bluetooth-0.7.0/python/Makefile.am.pydir	2006-02-27 14:37:13.000000000 +0100
++++ gnome-bluetooth-0.7.0/python/Makefile.am	2006-02-27 14:37:30.000000000 +0100
+@@ -1,5 +1,5 @@
+ 
+-pythondir = @pythondir@/gnomebt
++pythondir = @pyexecdir@/gnomebt
+ pkgpythondir = $(pythondir)
+ libdir = $(pkgpythondir)
+ 
 --- gnome-bluetooth-0.7.0/python/gnome-bluetooth-manager.in.pydir	2005-11-19 20:02:14.000000000 +0100
-+++ gnome-bluetooth-0.7.0/python/gnome-bluetooth-manager.in	2006-02-16 11:40:39.000000000 +0100
++++ gnome-bluetooth-0.7.0/python/gnome-bluetooth-manager.in	2006-02-27 14:31:40.000000000 +0100
 @@ -1,4 +1,7 @@
  #!/bin/sh
 -PYTHONPATH=@pythondir@:$PYTHONPATH


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gnome-bluetooth.spec	16 Feb 2006 18:07:53 -0000	1.29
+++ gnome-bluetooth.spec	27 Feb 2006 13:41:44 -0000	1.30
@@ -1,7 +1,7 @@
 Summary: GNOME Bluetooth Subsystem
 Name: gnome-bluetooth
 Version: 0.7.0
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Libraries
 URL: http://usefulinc.com/software/gnome-bluetooth
@@ -107,6 +107,9 @@
 %{_includedir}/gnome-bluetooth/
 
 %changelog
+* Mon Feb 27 2006 Harald Hoyer <harald at redhat.com> - 0.7.0-2
+- pydir fixes for lib64
+
 * Thu Feb 16 2006 Harald Hoyer <harald at redhat.com> - 0.7.0-1
 - version 0.7.0