version 0.7.0

.cvsignore

@@ -1 +1 @@
-gnome-bluetooth-0.6.0.tar.bz2
+gnome-bluetooth-0.7.0.tar.bz2

gnome-bluetooth-0.7.0-pydir.patch

@@ -0,0 +1,161 @@
+--- 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
+@@ -27,108 +27,6 @@
+ # doesn't meet the requirement.  MINIMUM-VERSION should consist of
+ # numbers and dots only.
+ 
+-
+-AC_DEFUN([AM_PATH_PYTHON],
+- [
+-  dnl Find a version of Python.  I could check for python versions 1.4
+-  dnl or earlier, but the default installation locations changed from
+-  dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages
+-  dnl in 1.5, and I don't want to maintain that logic.
+-
+-  AC_PATH_PROG(PYTHON, python python2.1 python2.0 python1.6 python1.5)
+-
+-  dnl should we do the version check?
+-  ifelse([$1],[],,[
+-    AC_MSG_CHECKING(if Python version >= $1)
+-    changequote(<<, >>)dnl
+-    prog="
+-import sys, string
+-minver = '$1'
+-pyver = string.split(sys.version)[0]  # first word is version string
+-# split strings by '.' and convert to numeric
+-minver = map(string.atoi, string.split(minver, '.'))
+-pyver = map(string.atoi, string.split(pyver, '.'))
+-# we can now do comparisons on the two lists:
+-if pyver >= minver:
+-	sys.exit(0)
+-else:
+-	sys.exit(1)"
+-    changequote([, ])dnl
+-    if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
+-    then
+-      AC_MSG_RESULT(okay)
+-    else
+-      AC_MSG_ERROR(too old)
+-    fi
+-  ])
+-
+-  AC_MSG_CHECKING([local Python configuration])
+-
+-  dnl Query Python for its version number.  Getting [:3] seems to be
+-  dnl the best way to do this; it's what "site.py" does in the standard
+-  dnl library.  Need to change quote character because of [:3]
+-
+-  AC_SUBST(PYTHON_VERSION)
+-  changequote(<<, >>)dnl
+-  PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[:3]"`
+-  changequote([, ])dnl
+-
+-
+-  dnl Use the values of $prefix and $exec_prefix for the corresponding
+-  dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX.  These are made
+-  dnl distinct variables so they can be overridden if need be.  However,
+-  dnl general consensus is that you shouldn't need this ability.
+-
+-  AC_SUBST(PYTHON_PREFIX)
+-  changequote(<<, >>)dnl
+-  PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"`
+-  changequote([, ])dnl
+-
+-  AC_SUBST(PYTHON_EXEC_PREFIX)
+-  PYTHON_EXEC_PREFIX='${exec_prefix}'
+-
+-  dnl At times (like when building shared libraries) you may want
+-  dnl to know which OS platform Python thinks this is.
+-
+-  AC_SUBST(PYTHON_PLATFORM)
+-  PYTHON_PLATFORM=`$PYTHON -c "import sys; print sys.platform"`
+-
+-
+-  dnl Set up 4 directories:
+-
+-  dnl pythondir -- where to install python scripts.  This is the
+-  dnl   site-packages directory, not the python standard library
+-  dnl   directory like in previous automake betas.  This behaviour
+-  dnl   is more consistent with lispdir.m4 for example.
+-  dnl
+-  dnl Also, if the package prefix isn't the same as python's prefix,
+-  dnl then the old $(pythondir) was pretty useless.
+-
+-  AC_SUBST(pythondir)
+-  pythondir=$PYTHON_PREFIX${libdir##$prefix}"/python"$PYTHON_VERSION"/site-packages"
+-
+-  dnl pkgpythondir -- $PACKAGE directory under pythondir.  Was
+-  dnl   PYTHON_SITE_PACKAGE in previous betas, but this naming is
+-  dnl   more consistent with the rest of automake.
+-  dnl   Maybe this should be put in python.am?
+-
+-  AC_SUBST(pkgpythondir)
+-  pkgpythondir=\${pythondir}/$PACKAGE
+-
+-  dnl pyexecdir -- directory for installing python extension modules
+-  dnl   (shared libraries)  Was PYTHON_SITE_EXEC in previous betas.
+-
+-  AC_SUBST(pyexecdir)
+-  pyexecdir=$PYTHON_EXEC_PREFIX"/lib/python"$PYTHON_VERSION/site-packages
+-
+-  dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
+-  dnl   Maybe this should be put in python.am?
+-
+-  AC_SUBST(pkgpyexecdir)
+-  pkgpyexecdir=\${pyexecdir}/$PACKAGE
+-
+-  AC_MSG_RESULT([looks good])
+-])
+ dnl -- taken from gnome-python -- thanks james henstridge
+ dnl a macro to check for ability to create python extensions
+ dnl  AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
+@@ -141,7 +39,8 @@
+ py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+ PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+ if test "$py_prefix" != "$py_exec_prefix"; then
+-  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
++  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_V
++ERSION}"
+ fi
+ AC_SUBST(PYTHON_INCLUDES)
+ dnl check if the headers exist:
+@@ -155,27 +54,6 @@
+ CPPFLAGS="$save_CPPFLAGS"
+ ])
+ 
+-dnl
+-dnl JH_ADD_CFLAG(FLAG)
+-dnl checks whether the C compiler supports the given flag, and if so, adds
+-dnl it to $CFLAGS.  If the flag is already present in the list, then the
+-dnl check is not performed.
+-AC_DEFUN([JH_ADD_CFLAG],
+-[
+-case " $CFLAGS " in
+-*@<:@\	\ @:>@$1@<:@\	\ @:>@*)
+-  ;;
+-*)
+-  save_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS $1"
+-  AC_MSG_CHECKING([whether [$]CC understands $1])
+-  AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no])
+-  AC_MSG_RESULT($jh_has_option)
+-  if test $jh_has_option = no; then
+-    CFLAGS="$save_CFLAGS"
+-  fi
+-  ;;
+-esac])
+ dnl Configure paths for libsdp
+ dnl Edd Dumbill <edd@usefulinc.com>
+ dnl Shamelessly stolen from Jack Moffitt, who stole
+--- 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
+@@ -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
++

gnome-bluetooth.spec

@@ -1,7 +1,7 @@
 Summary: GNOME Bluetooth Subsystem
 Name: gnome-bluetooth
-Version: 0.6.0
+Version: 0.7.0
-Release: 2.2.1
+Release: 1
 License: GPL
 Group: System Environment/Libraries
 URL: http://usefulinc.com/software/gnome-bluetooth
@@ -11,13 +11,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: autoconf >= 2.57 bluez-libs-devel >= 2.8 bluez-utils 
 BuildRequires: libgnomeui-devel >= 2.2 libbonobo-devel >= 2.0
 BuildRequires: GConf2-devel >= 2.0 librsvg2-devel
-BuildRequires: libbtctl-devel >= 0.5.0
+BuildRequires: libbtctl-devel >= 0.6.0
 BuildRequires: gob2 openobex-devel >= 1.0.1
 BuildRequires: pygtk2-devel python-devel
 Requires: %{name}-libs = %{version}-%{release}
 ExcludeArch: s390 s390x
 
-Patch1: gnome-bluetooth-0.5.1-pydir.patch
+Patch1: gnome-bluetooth-0.7.0-pydir.patch
 
 %description
 This package contains a Bonobo server to control Bluetooth devices,
@@ -50,11 +50,6 @@ rm -rf $RPM_BUILD_ROOT
 %setup -q
 %patch1 -p1 -b .pydir
 
-perl -pi -e 's|^Icon=.*|Icon=%{_datadir}/pixmaps/blueradio.png|g' \
-    */*.desktop.in
-#perl -pi -e 's#-DGTK_DISABLE_DEPRECATED##g' $(find libegg -name Makefile.in)
-#sed -i.bool -e 's#gtk.TRUE#True#g;s#gtk.FALSE#False#g' python/*.py
-
 aclocal
 automake -a
 autoconf
@@ -68,9 +63,6 @@ make
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 ./libtool --finish $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules
-mkdir -p %{buildroot}%{_datadir}/pixmaps/
-cp -a %{buildroot}%{_datadir}/gnome-bluetooth/pixmaps/blueradio-48.png \
-      %{buildroot}%{_datadir}/pixmaps/blueradio.png
 
 # we do not want .la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -95,7 +87,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/gnome-obex-server.desktop
 %{_datadir}/applications/gnome-bluetooth-manager.desktop
 %{_datadir}/gnome-bluetooth/
-%{_datadir}/pixmaps/blueradio.png
+%{_datadir}/pixmaps/*
 %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas
 
 %files libs
@@ -110,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/gnome-bluetooth/
 
 %changelog
+* Thu Feb 16 2006 Harald Hoyer <harald@redhat.com> - 0.7.0-1
+- version 0.7.0
+
 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 0.6.0-2.2.1
 - bump again for double-long bug on ppc(64)
 

sources

@@ -1 +1 @@
-d661d950a559865c06aa8ad836708dde  gnome-bluetooth-0.6.0.tar.bz2
+90614d7a757cf30054021f0666308fe2  gnome-bluetooth-0.7.0.tar.bz2