rpms/gnome-bluetooth/FC-6 gnome-bluetooth-0.7.0-pydir.patch, 1.2, 1.3 gnome-bluetooth.spec, 1.38, 1.39

[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-serv29298

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


gnome-bluetooth-0.7.0-pydir.patch:
 acinclude.m4    |  126 --------------------------------------------------------
 src/Makefile.am |    2 
 2 files changed, 3 insertions(+), 125 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-bluetooth-0.7.0-pydir.patch	27 Feb 2006 13:41:44 -0000	1.2
+++ gnome-bluetooth-0.7.0-pydir.patch	13 Nov 2006 11:03:03 -0000	1.3
@@ -158,24 +158,4 @@
  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-27 14:31:40.000000000 +0100
-@@ -1,4 +1,7 @@
- #!/bin/sh
--PYTHONPATH=@pythondir@:$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 /usr/bin/python $PYEXECDIR/gnomebt/manager.py
-+
+


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-bluetooth/FC-6/gnome-bluetooth.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gnome-bluetooth.spec	8 Nov 2006 08:54:07 -0000	1.38
+++ gnome-bluetooth.spec	13 Nov 2006 11:03:03 -0000	1.39
@@ -55,7 +55,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %setup -q
-#%patch1 -p1 -b .pydir
+%patch1 -p1 -b .pydir
 #%patch2 -p1 -b .path
 
 #aclocal
@@ -73,7 +73,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%makeinstall
+make DESTDIR=$RPM_BUILD_ROOT install 
 ./libtool --finish $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules
 
 # we do not want .la files
@@ -113,12 +113,9 @@
 %files -f %{name}.lang
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README 
-#%{_bindir}/gnome-bluetooth-admin
-%{_bindir}/gnome-bluetooth-manager
 %{_bindir}/gnome-obex-send
 %{_bindir}/gnome-obex-server
 %{_datadir}/applications/gnome-obex-server.desktop
-%{_datadir}/applications/gnome-bluetooth-manager.desktop
 %{_datadir}/gnome-bluetooth/
 %{_datadir}/pixmaps/*
 %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas