rpms/python/devel python.spec,1.76,1.77

[fedora-cvs-commits at redhat.com]

Author: misa

Update of /cvs/dist/rpms/python/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7032

Modified Files:
	python.spec 
Log Message:
Fixed python-devel to be multilib friendly (bug #192747, #139911)


Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/devel/python.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- python.spec	13 Jun 2006 12:14:02 -0000	1.76
+++ python.spec	13 Jun 2006 13:47:45 -0000	1.77
@@ -20,7 +20,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: %{pybasever}.3
-Release: 8.FC6
+Release: 9.FC6
 License: PSF - see LICENSE
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -303,6 +303,32 @@
 install -d $RPM_BUILD_ROOT/usr/lib/python%{pybasever}/site-packages
 %endif
 
+# Install pydoc wrapper (bug #193484)
+install -m 0755 %{SOURCE8} %{_bindir}/pydoc
+
+# Make python-devel multilib-ready (bug #192747, #139911)
+%define _pyconfig32_h pyconfig-32.h
+%define _pyconfig64_h pyconfig-64.h
+
+%if %{_lib} == lib64
+%define _pyconfig_h %{_pyconfig64.h}
+%else
+%define _pyconfig_h %{_pyconfig32.h}
+%endif
+mv $RPM_BUILD_ROOT%{_includedir}/python%{pybasever}/pyconfig.h \
+   $RPM_BUILD_ROOT%{_includedir}/python%{pybasever}/%{_pyconfig_h}
+cat > $RPM_BUILD_ROOT%{_includedir}/python%{pybasever}/pyconfig.h << EOF
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "%{_pyconfig32_h}"
+#elif __WORDSIZE == 64
+#include "%{_pyconfig64_h}"
+#else
+#error "Unkown word size"
+#endif
+EOF
+
 %clean
 rm -fr $RPM_BUILD_ROOT
 
@@ -369,6 +395,9 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
 
 %changelog
+* Mon Jun 12 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-9
+- Fixed python-devel to be multilib friendly (bug #192747, #139911)
+
 * Tue Jun 13 2006 Mihai Ibanescu <misa at redhat.com> - 2.4.3-8
 - Only copying mkhowto from the Docs - we don't need perl dependencies from
   python-tools.