*** python-2.6.spec.orig	2008-12-03 21:59:51.000000000 -0500
--- python-2.6.spec.pjt	2009-01-25 17:01:43.000000000 -0500
***************
*** 36,41 ****
--- 36,42 ----
  #--start constants--
  %define version 2.6.1
  %define libver 2.6
+ %define libvers 2.6
  #--end constants--
  %define release 1pydotorg
  %define __prefix /usr
***************
*** 54,60 ****
  Name: %{name}%{binsuffix}
  Version: %{version}
  Release: %{release}
! Copyright: Modified CNRI Open Source License
  Group: Development/Languages
  Source: Python-%{version}.tar.bz2
  %if %{include_docs}
--- 55,61 ----
  Name: %{name}%{binsuffix}
  Version: %{version}
  Release: %{release}
! License: Modified CNRI Open Source License
  Group: Development/Languages
  Source: Python-%{version}.tar.bz2
  %if %{include_docs}
***************
*** 223,229 ****
  #  BUILD
  ########
  %build
! ./configure --enable-unicode=ucs4 %{ipv6} %{pymalloc} --prefix=%{__prefix}
  make
  
  ##########
--- 224,231 ----
  #  BUILD
  ########
  %build
! #We like shared libs over static.
! ./configure --enable-shared --enable-unicode=ucs4 %{ipv6} %{pymalloc} --prefix=%{__prefix}
  make
  
  ##########
***************
*** 236,242 ****
  
  [ -d "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
  mkdir -p $RPM_BUILD_ROOT%{__prefix}/%{libdirname}/python%{libvers}/lib-dynload
! make prefix=$RPM_BUILD_ROOT%{__prefix} install
  
  #  REPLACE PATH IN PYDOC
  if [ ! -z "%{binsuffix}" ]
--- 238,244 ----
  
  [ -d "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
  mkdir -p $RPM_BUILD_ROOT%{__prefix}/%{libdirname}/python%{libvers}/lib-dynload
! make prefix=$RPM_BUILD_ROOT%{__prefix} altinstall
  
  #  REPLACE PATH IN PYDOC
  if [ ! -z "%{binsuffix}" ]
***************
*** 252,265 ****
  fi
  
  #  add the binsuffix
! if [ ! -z "%{binsuffix}" ]
! then
!    ( cd $RPM_BUILD_ROOT%{__prefix}/bin; rm -f python[0-9a-zA-Z]*;
!          mv -f python python"%{binsuffix}" )
!    ( cd $RPM_BUILD_ROOT%{__prefix}/man/man1; mv python.1 python%{binsuffix}.1 )
!    ( cd $RPM_BUILD_ROOT%{__prefix}/bin; mv -f pydoc pydoc"%{binsuffix}" )
!    ( cd $RPM_BUILD_ROOT%{__prefix}/bin; mv -f idle idle"%{binsuffix}" )
! fi
  
  ########
  #  Tools
--- 254,268 ----
  fi
  
  #  add the binsuffix
! #This breaks the new python-config file.  Let's do a make altinstall instead?
! #if [ ! -z "%{binsuffix}" ]
! #then
! #   ( cd $RPM_BUILD_ROOT%{__prefix}/bin; rm -f python[0-9a-zA-Z]*;
! #         mv -f python python"%{binsuffix}" )
! #   ( cd $RPM_BUILD_ROOT%{__prefix}/man/man1; mv python.1 python%{binsuffix}.1 )
! #   ( cd $RPM_BUILD_ROOT%{__prefix}/bin; mv -f pydoc pydoc"%{binsuffix}" )
! #   ( cd $RPM_BUILD_ROOT%{__prefix}/bin; mv -f idle idle"%{binsuffix}" )
! #fi
  
  ########
  #  Tools
***************
*** 341,354 ****
  %defattr(-,root,root)
  %doc Misc/README Misc/cheatsheet Misc/Porting
  %doc LICENSE Misc/ACKS Misc/HISTORY Misc/NEWS
! %{__prefix}/man/man1/python%{binsuffix}.1*
  
  %attr(755,root,root) %dir %{__prefix}/include/python%{libvers}
  %attr(755,root,root) %dir %{__prefix}/%{libdirname}/python%{libvers}/
  %{__prefix}/%{libdirname}/python%{libvers}/*.txt
  %{__prefix}/%{libdirname}/python%{libvers}/*.py*
  %{__prefix}/%{libdirname}/python%{libvers}/pdb.doc
! %{__prefix}/%{libdirname}/python%{libvers}/profile.doc
  %{__prefix}/%{libdirname}/python%{libvers}/curses
  %{__prefix}/%{libdirname}/python%{libvers}/distutils
  %{__prefix}/%{libdirname}/python%{libvers}/encodings
--- 344,357 ----
  %defattr(-,root,root)
  %doc Misc/README Misc/cheatsheet Misc/Porting
  %doc LICENSE Misc/ACKS Misc/HISTORY Misc/NEWS
! #%{__prefix}/man/man1/python%{binsuffix}.1*
  
  %attr(755,root,root) %dir %{__prefix}/include/python%{libvers}
  %attr(755,root,root) %dir %{__prefix}/%{libdirname}/python%{libvers}/
  %{__prefix}/%{libdirname}/python%{libvers}/*.txt
  %{__prefix}/%{libdirname}/python%{libvers}/*.py*
  %{__prefix}/%{libdirname}/python%{libvers}/pdb.doc
! #%{__prefix}/%{libdirname}/python%{libvers}/profile.doc
  %{__prefix}/%{libdirname}/python%{libvers}/curses
  %{__prefix}/%{libdirname}/python%{libvers}/distutils
  %{__prefix}/%{libdirname}/python%{libvers}/encodings
***************
*** 357,369 ****
  %{__prefix}/%{libdirname}/python%{libvers}/test
  %{__prefix}/%{libdirname}/python%{libvers}/xml
  %{__prefix}/%{libdirname}/python%{libvers}/email
- %{__prefix}/%{libdirname}/python%{libvers}/email/mime
  %{__prefix}/%{libdirname}/python%{libvers}/sqlite3
  %{__prefix}/%{libdirname}/python%{libvers}/compiler
  %{__prefix}/%{libdirname}/python%{libvers}/bsddb
  %{__prefix}/%{libdirname}/python%{libvers}/hotshot
  %{__prefix}/%{libdirname}/python%{libvers}/logging
  %{__prefix}/%{libdirname}/python%{libvers}/lib-old
  
  %files devel
  %defattr(-,root,root)
--- 360,381 ----
  %{__prefix}/%{libdirname}/python%{libvers}/test
  %{__prefix}/%{libdirname}/python%{libvers}/xml
  %{__prefix}/%{libdirname}/python%{libvers}/email
  %{__prefix}/%{libdirname}/python%{libvers}/sqlite3
  %{__prefix}/%{libdirname}/python%{libvers}/compiler
  %{__prefix}/%{libdirname}/python%{libvers}/bsddb
  %{__prefix}/%{libdirname}/python%{libvers}/hotshot
  %{__prefix}/%{libdirname}/python%{libvers}/logging
  %{__prefix}/%{libdirname}/python%{libvers}/lib-old
+ #New libs
+ %{__prefix}/%{libdirname}/python%{libvers}/multiprocessing
+ %{__prefix}/%{libdirname}/python%{libvers}/lib2to3
+ %{__prefix}/%{libdirname}/python%{libvers}/json
+ %{__prefix}/%{libdirname}/python%{libvers}/ctypes
+ %{__prefix}/%{libdirname}/python%{libvers}/wsgiref
+ %{__prefix}/%{libdirname}/python%{libvers}/wsgiref.egg-info
+ #Shared libs
+ %{__prefix}/%{libdirname}/libpython%{libvers}.so*
+ 
  
  %files devel
  %defattr(-,root,root)