*** BUILD/Python-2.6.1/Misc/RPM/python-2.6.spec	2008-12-03 21:59:51.000000000 -0500
--- SPECS/python-2.6.spec	2009-01-25 22:03:24.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
  
  ##########
***************
*** 256,262 ****
  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
--- 258,265 ----
  then
     ( cd $RPM_BUILD_ROOT%{__prefix}/bin; rm -f python[0-9a-zA-Z]*;
           mv -f python python"%{binsuffix}" )
!    ( cd $RPM_BUILD_ROOT%{__prefix}/bin; mv -f python-config python"%{binsuffix}"-config )
!    ( cd $RPM_BUILD_ROOT%{__prefix}/share/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
***************
*** 276,282 ****
  find "$RPM_BUILD_ROOT""%{__prefix}"/%{libdirname}/python%{libvers}/lib-dynload -type f |
  	sed "s|^${RPM_BUILD_ROOT}|/|" |
  	grep -v -e '_tkinter.so$' >mainpkg.files
! find "$RPM_BUILD_ROOT""%{__prefix}"/bin -type f |
  	sed "s|^${RPM_BUILD_ROOT}|/|" |
  	grep -v -e '/bin/idle%{binsuffix}$' >>mainpkg.files
  
--- 279,285 ----
  find "$RPM_BUILD_ROOT""%{__prefix}"/%{libdirname}/python%{libvers}/lib-dynload -type f |
  	sed "s|^${RPM_BUILD_ROOT}|/|" |
  	grep -v -e '_tkinter.so$' >mainpkg.files
! find "$RPM_BUILD_ROOT""%{__prefix}"/bin -type f -o -type l |
  	sed "s|^${RPM_BUILD_ROOT}|/|" |
  	grep -v -e '/bin/idle%{binsuffix}$' >>mainpkg.files
  
***************
*** 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}/share/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,379 ----
  %{__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
+ %{__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
+ %{__prefix}/%{libdirname}/libpython%{libvers}.so*
+ 
  
  %files devel
  %defattr(-,root,root)