rpms/gnome-bluetooth/FC-6 gnome-bluetooth-0.7.0-pydir.patch, 1.4, 1.5

[fedora-cvs-commits at redhat.com]

Author: harald

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

Modified Files:
	gnome-bluetooth-0.7.0-pydir.patch 
Log Message:


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/FC-6/gnome-bluetooth-0.7.0-pydir.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-bluetooth-0.7.0-pydir.patch	23 Nov 2006 16:40:25 -0000	1.4
+++ gnome-bluetooth-0.7.0-pydir.patch	23 Nov 2006 16:56:04 -0000	1.5
@@ -1,5 +1,5 @@
---- gnome-bluetooth-0.7.0/src/Makefile.am.pydir	2005-11-19 20:02:15.000000000 +0100
-+++ gnome-bluetooth-0.7.0/src/Makefile.am	2006-11-23 10:59:53.000000000 +0100
+--- 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 > $@
@@ -10,7 +10,7 @@
  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-11-23 10:59:53.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.
@@ -158,12 +158,24 @@
  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/gnome-bluetooth-manager.in.pydir	2006-11-23 11:03:32.000000000 +0100
-+++ gnome-bluetooth-0.7.0/python/gnome-bluetooth-manager.in	2006-11-23 11:04:00.000000000 +0100
-@@ -1,4 +1,4 @@
+--- 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-27 14:31:40.000000000 +0100
+@@ -1,4 +1,7 @@
  #!/bin/sh
 -PYTHONPATH=@pythondir@:$PYTHONPATH
-+PYTHONPATH=@pyexecdir@:$PYTHONPATH
++PYEXECDIR=$(/usr/bin/python -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='/usr')")
++
++PYTHONPATH="$PYEXECDIR:$PYTHONPATH"
  export PYTHONPATH
 -exec @PYTHON@ @pythondir@/gnomebt/manager.py
-+exec @PYTHON@ @pyexecdir@/gnomebt/manager.py
++exec /usr/bin/python $PYEXECDIR/gnomebt/manager.py
++