rpms/Pyrex/devel Pyrex.spec,1.11,1.12

[fedora-cvs-commits at redhat.com]

Author: johnp

Update of /cvs/dist/rpms/Pyrex/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10152

Modified Files:
	Pyrex.spec 
Log Message:
- Remove lib64 hack since this is a noarch package
- use pythonsitelib script for determining where to install to




Index: Pyrex.spec
===================================================================
RCS file: /cvs/dist/rpms/Pyrex/devel/Pyrex.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Pyrex.spec	30 Sep 2005 21:47:37 -0000	1.11
+++ Pyrex.spec	26 Oct 2005 20:22:18 -0000	1.12
@@ -1,7 +1,9 @@
 %define pyver %(python -c 'import sys ; print sys.version[:3]')
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 Name:           Pyrex
 Version:        0.9.3.1
-Release: 	1
+Release: 	2
 Epoch:		0
 BuildArch:	noarch
 Summary:        A compiler/language for writing Python extension modules.
@@ -42,13 +44,6 @@
 rm -rf $RPM_BUILD_ROOT
 python setup.py install --skip-build --root $RPM_BUILD_ROOT --record=INSTALLED_FILES
 
-#hack to get around a bug in the python distutils on 64 bit archs
-%if "%{_lib}" == "lib64"
-cp -r $RPM_BUILD_ROOT/usr/lib/* $RPM_BUILD_ROOT%{_libdir}/
-rm -rf $RPM_BUILD_ROOT/usr/lib
-perl -pi -e 's/\/usr\/lib\//\/usr\/lib64\//g' INSTALLED_FILES
-%endif
-
 # Add directories to the INSTALLED_FILES
 #find $RPM_BUILD_ROOT%{_libdir}/python%{pyver}/site-packages/Pyrex/Plex -type d -print | \
 #sed "s|$RPM_BUILD_ROOT|%dir |g" >>INSTALLED_FILES
@@ -68,13 +63,17 @@
 %doc USAGE.txt README.txt CHANGES.txt ToDo.txt Demos Doc
 
 %defattr(-,root,root,-)
-%ghost %{_libdir}/python%{pyver}/site-packages/Pyrex/Plex/*.pyo
-%ghost %{_libdir}/python%{pyver}/site-packages/Pyrex/*.pyo
-%ghost %{_libdir}/python%{pyver}/site-packages/Pyrex/Compiler/*.pyo
-%ghost %{_libdir}/python%{pyver}/site-packages/Pyrex/Distutils/*.pyo
-%exclude %{_libdir}/python%{pyver}/site-packages/Pyrex/Mac
+%ghost %{python_sitelib}/Pyrex/Plex/*.pyo
+%ghost %{python_sitelib}/Pyrex/*.pyo
+%ghost %{python_sitelib}/Pyrex/Compiler/*.pyo
+%ghost %{python_sitelib}/Pyrex/Distutils/*.pyo
+%exclude %{python_sitelib}/Pyrex/Mac
 
 %changelog
+* Wed Oct 26 2005 John (J5) Palmieri <johnp at redhat.com> - 0.9.3.1-2
+- Remove lib64 hack since this is a noarch package  
+- use python_sitelib script for determining where to install to 
+
 * Fri Sep 30 2005 John (J5) Palmieri <johnp at redhat.com> - 0.9.3.1-1
 - update to 0.9.3.1
 - remove gcc4 patch which is incorporated in this release