[Python-checkins] python/dist/src/Misc/RPM python-2.2.spec,1.1.2.2,1.1.2.3

[loewis@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Misc/RPM
In directory usw-pr-cvs1:/tmp/cvs-serv11355

Modified Files:
      Tag: release22-maint
	python-2.2.spec 
Log Message:
Patch #619352: Update for 2.2.2b1. Install python2 and python2.2.
Add Makefile.pre.in to -devel.


Index: python-2.2.spec
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/RPM/python-2.2.spec,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** python-2.2.spec	9 Apr 2002 09:29:28 -0000	1.1.2.2
--- python-2.2.spec	7 Oct 2002 05:53:29 -0000	1.1.2.3
***************
*** 5,28 ****
  #  Is the resulting package and the installed binary named "python" or
  #  "python2"?
! #WARNING: Commenting out doesn't work.  Last line is what's used.
! %define config_binsuffix none
! %define config_binsuffix 2
  
  #  Build tkinter?  "auto" enables it if /usr/bin/wish exists.
! #WARNING: Commenting out doesn't work.  Last line is what's used.
! %define config_tkinter no
! %define config_tkinter yes
  %define config_tkinter auto
  
  #  Use pymalloc?  The last line (commented or not) determines wether
  #  pymalloc is used.
! #WARNING: Commenting out doesn't work.  Last line is what's used.
! %define config_pymalloc yes
  %define config_pymalloc no
  
  #  Enable IPV6?
! #WARNING: Commenting out doesn't work.  Last line is what's used.
! %define config_ipv6 yes
! %define config_ipv6 no
  
  #################################
--- 5,23 ----
  #  Is the resulting package and the installed binary named "python" or
  #  "python2"?
! # Valid values: [none/2/2.2]
! %define config_binsuffix 2.2.2b1
  
  #  Build tkinter?  "auto" enables it if /usr/bin/wish exists.
! # Valid values: [no/yes/auto]
  %define config_tkinter auto
  
  #  Use pymalloc?  The last line (commented or not) determines wether
  #  pymalloc is used.
! # Valid values: [no/yes]
  %define config_pymalloc no
  
  #  Enable IPV6?
! # Valid values: [no/yes/auto]
! %define config_ipv6 auto
  
  #################################
***************
*** 31,35 ****
  
  %define name python
! %define version 2.2.1
  %define release 1
  %define __prefix /usr
--- 26,30 ----
  
  %define name python
! %define version 2.2.2b1
  %define release 1
  %define __prefix /usr
***************
*** 37,41 ****
  
  #  kludge to get around rpm <percent>define weirdness
! %define ipv6 %(if [ "%{config_ipv6}" = yes ]; then echo --enable-ipv6; else echo --disable-ipv6; fi)
  %define pymalloc %(if [ "%{config_pymalloc}" = yes ]; then echo --with-pymalloc; else echo --without-pymalloc; fi)
  %define binsuffix %(if [ "%{config_binsuffix}" = none ]; then echo ; else echo "%{config_binsuffix}"; fi)
--- 32,36 ----
  
  #  kludge to get around rpm <percent>define weirdness
! %define ipv6 %(if [ "%{config_ipv6}" = yes ]; then echo --enable-ipv6; else if [ "%{config_ipv6}" == auto ]; then echo; else echo --disable-ipv6; fi; fi)
  %define pymalloc %(if [ "%{config_pymalloc}" = yes ]; then echo --with-pymalloc; else echo --without-pymalloc; fi)
  %define binsuffix %(if [ "%{config_binsuffix}" = none ]; then echo ; else echo "%{config_binsuffix}"; fi)
***************
*** 128,132 ****
  
  %changelog
! * Tue Mar 26 2002 Sean Reifschneider <jafo-rpms@tummy.com>
  [Release 2.2.1c2-1]
  - Updated to 2.2.1c2.
--- 123,139 ----
  
  %changelog
! * Sun Oct 06 2002 Sean Reifschneider <jafo-rpms@tummy.com>
! [Release 2.2.2b1-1]
! - Updated for the 2.2.2b1 release.
! - Changing ipv6 settings to include "auto" which will let configure
!       figure it out.  (suggested by Martin v. Loewis)
! - Changing the settable flags at the top of this file.
!       (suggested by Martin v. Loewis)
! 
! [Release 2.2.1-2]
! - Enabled IPV6 by default.  (Suggested by Pekka Pessi)
! - Set up to install python2 and python2.2 when using the suffix.
! - Added Makefile.pre.in to -devel.
! 
  [Release 2.2.1c2-1]
  - Updated to 2.2.1c2.
***************
*** 219,222 ****
--- 226,232 ----
  make prefix=$RPM_BUILD_ROOT%{__prefix} install
  
+ #  copy over Makefile.pre.in
+ cp Makefile.pre.in Makefile.pre $RPM_BUILD_ROOT%{__prefix}/lib/python%{libvers}/config/
+ 
  #  REPLACE PATH IN PYDOC
  if [ ! -z "%{binsuffix}" ]
***************
*** 235,239 ****
  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 )
--- 245,250 ----
  if [ ! -z "%{binsuffix}" ]
  then
!    ( cd $RPM_BUILD_ROOT%{__prefix}/bin;
!          rm -f python"%{binsuffix}";
           mv -f python python"%{binsuffix}" )
     ( cd $RPM_BUILD_ROOT%{__prefix}/man/man1; mv python.1 python%{binsuffix}.1 )