From 9ad1ad62f982387123ace69efa68d0ef4d8cf39c Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 27 Feb 2006 13:41:44 +0000 Subject: [PATCH] pydir fixes for lib64 --- gnome-bluetooth-0.7.0-pydir.patch | 24 ++++++++++++++++++++++-- gnome-bluetooth.spec | 5 ++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/gnome-bluetooth-0.7.0-pydir.patch b/gnome-bluetooth-0.7.0-pydir.patch index ec070a3..c15a582 100644 --- a/gnome-bluetooth-0.7.0-pydir.patch +++ b/gnome-bluetooth-0.7.0-pydir.patch @@ -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 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 diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index b916623..ee21b63 100644 --- a/gnome-bluetooth.spec +++ b/gnome-bluetooth.spec @@ -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 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/gnome-bluetooth/ %changelog +* Mon Feb 27 2006 Harald Hoyer - 0.7.0-2 +- pydir fixes for lib64 + * Thu Feb 16 2006 Harald Hoyer - 0.7.0-1 - version 0.7.0