rpms/player/F-12 player.spec,1.13,1.14

[Tim Niemueller]

Author: timn

Update of /cvs/pkgs/rpms/player/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20387

Modified Files:
	player.spec 
Log Message:
Use conditional to fix build on F-11, commit on F-12 for spec unification


Index: player.spec
===================================================================
RCS file: /cvs/pkgs/rpms/player/F-12/player.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- player.spec	10 Jan 2010 13:27:40 -0000	1.13
+++ player.spec	11 Jan 2010 12:40:52 -0000	1.14
@@ -1,9 +1,9 @@
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
 
 Name:           player
 Version:        3.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Cross-platform robot device interface and server
 
 Group:          Applications/System
@@ -34,7 +34,10 @@ BuildRequires:  libtool, libtool-ltdl-de
 # Libs to enable Player features
 BuildRequires:  alsa-lib-devel
 BuildRequires:  avahi-compat-howl-devel
-BuildRequires:  boost-devel boost-thread
+BuildRequires:  boost-devel
+%if 0%{?fedora} > 11
+BuildRequires:  boost-thread
+%endif
 BuildRequires:  festival-devel
 BuildRequires:  fltk-devel
 #BuildRequires:  gearbox-devel
@@ -205,6 +208,10 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitearch}/*.so
 
 %changelog
+* Sun Jan 10 2010 Tim Niemueller <tim at niemueller.de> - 3.0.1-2
+- Use define instead of global macro to force lazy evaluation of *_sitearch
+  macros, fixes compilation when Python/Ruby is not installed by on buildsys
+
 * Sun Jan 10 2010 Rich Mattes <richmattes at gmail.com> - 3.0.1-1
 - Updated to release 3.0.1
 - Fixed ruby bindings install path