rpms/gpsd/FC-5 gpsd.spec,1.8,1.9

[Matthew D Truch (mtruch)]

Author: mtruch

Update of /cvs/extras/rpms/gpsd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26473

Modified Files:
	gpsd.spec 
Log Message:
Let's try this fix another way.  Actually check out the python packaging
instructions.  



Index: gpsd.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsd/FC-5/gpsd.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gpsd.spec	28 Feb 2007 00:05:05 -0000	1.8
+++ gpsd.spec	28 Feb 2007 02:07:34 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           gpsd
 Version:        2.34
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Service daemon for mediating access to a GPS
 
 Group:          System Environment/Daemons
@@ -53,6 +53,8 @@
 cgps resembles xgps, but without the pictorial satellite display.  It
 can run on a serial terminal or terminal emulator.
 
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 %prep
 %setup -q
 
@@ -73,9 +75,6 @@
 cp -p gpsd.hotplug gpsd.usermap %{buildroot}%{_sysconfdir}/hotplug.d/usb/
 # additional gpsd-devel files
 mkdir -p %{buildroot}%{_datadir}/gpsd
-PYVERSION=`python -c "import sys; print sys.version[:3]"`
-mkdir -p %{buildroot}%{_libdir}/python${PYVERSION}/site-packages
-cp -p gps.py gpsfake.py gpspacket.so %{buildroot}%{_libdir}/python${PYVERSION}/site-packages
 
 #remove nasty little .la files
 rm -f %{buildroot}%{_libdir}/libgps.la
@@ -111,7 +110,7 @@
 %{_mandir}/man1/gpsctl.1*
 %{_sysconfdir}/hotplug.d/usb/gpsd.hotplug
 %{_sysconfdir}/hotplug.d/usb/gpsd.usermap
-%{_libdir}/python*/site-packages/gps.py*
+%{python_sitelib}/gps.py*
 
 %files devel
 %defattr(-,root,root,-)
@@ -119,8 +118,8 @@
 %{_bindir}/gpsfake
 %{_bindir}/rtcmdecode
 %{_bindir}/gpsflash
-%{_libdir}/python*/site-packages/gpsfake*
-%{_libdir}/python*/site-packages/gpspacket.so
+%{python_sitelib}/gpsfake*
+%{python_sitelib}/gpspacket.so
 %{_libdir}/libgps.so
 %{_includedir}/gps.h
 %{_includedir}/libgpsmm.h
@@ -155,6 +154,10 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Tue Feb 27 2007 Matthew Truch <matt at truch.net> - 2.34-3
+- It's just one of those days.  I'm doing the python stuff backwards.
+  Now I see http://fedoraproject.org/wiki/Packaging/Python
+
 * Tue Feb 27 2007 Matthew Truch <matt at truch.net> - 2.34-2
 - Forgot to properly handle gpspacket.so on x86_64