--- a/Solaris/SUNWPython.spec	Thu Oct 27 15:48:51 2005 +0000
+++ b/Solaris/SUNWPython.spec	Thu Oct 27 20:17:04 2005 +0000
@@ -26,7 +26,7 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 Source:                  http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2
 Source1:                 http://www.python.org/ftp/python/%{p23_version}/Python-%{p23_version}.tar.bz2
-Source2:                 l10n-configure.sh
+Patch1:                  Python-01-solaris-lib-dirs.diff
 
 %include default-depend.inc
 BuildRequires: SUNWTk
@@ -57,6 +57,8 @@
 %prep
 %setup -q -c -n %name-%version
 %setup -q -D -T -b 1 -c -n %name-%version
+cd Python-%{version}
+%patch1 -p1
 
 %build
 cd Python-%{p23_version}
@@ -70,13 +72,12 @@
 %else
 # -xregs=no%%frameptr breaks the build of Python 2.4.1
 export CFLAGS=`echo '%optflags' | sed -e 's/-xregs=no%%frameptr//'`
-export CFLAGS="$CFLAGS -DANSICPP -D__STDC_VERSION__=199409L"
 %endif
-export BASECFLAGS=$CFLAGS
-export RPM_OPT_FLAGS="$CFLAGS"
+export OPT=$CFLAGS
+export BASECFLAGS=
 export LD_RUN_PATH="/usr/sfw/lib"
 export LDFLAGS="-z ignore"
-export CPP="$CC -E $CFLAGS"
+export CPP="$CC -E"
 ./configure --prefix=%{p23_prefix} \
   --libdir=%{p23_libdir} \
   --mandir=%{p23_mandir} \
@@ -84,6 +85,7 @@
   --infodir=%{p23_datadir}/info
 
 make -j$CPUS
+unset LD_RUN_PATH
 
 cd ../Python-%{version}
 ./configure --prefix=%{_prefix} \
@@ -107,11 +109,18 @@
 cd ../Python-%{version}
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# search for vendor packages in /usr/lib/python<version>/vendor-packages
+echo "import site; site.addsitedir('%{_libdir}/python2.4/vendor-packages')" \
+    > $RPM_BUILD_ROOT%{_libdir}/python2.4/site-packages/vendor-packages.pth
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/python2.4/vendor-packages
+
 cd $RPM_BUILD_ROOT%{_bindir} && rm python  && ln -s python2.4 python
 rm -rf $RPM_BUILD_ROOT%{_libdir}/python2.4/bsddb
 cd $RPM_BUILD_ROOT%{p23_bindir} && rm python  && ln -s ../../bin/python2.4 python
 rm -rf $RPM_BUILD_ROOT%{p23_libdir}/python2.3/bsddb
 
+echo deleting pyo files:
+find $RPM_BUILD_ROOT -name '*.pyo' -exec rm {} \; -print
 
 %{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
 
@@ -119,7 +128,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr (-, root, other)
+%defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{p23_prefix}
 %dir %attr (0755, root, bin) %{p23_bindir}
 %{p23_bindir}/*
@@ -131,7 +140,7 @@
 %{p23_libdir}/*
 
 %files share
-%defattr (-, root, other)
+%defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{p23_prefix}
 %dir %attr(0755, root, sys) %{_datadir}
 %dir %attr(0755, root, bin) %{p23_datadir}
@@ -143,7 +152,7 @@
 %{p23_mandir}/*/*
 
 %files devel
-%defattr (-, root, other)
+%defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{p23_prefix}
 %dir %attr (0755, root, bin) %{_includedir}
 %{_includedir}/*