[Python-checkins] python/dist/src/Misc/RPM python-2.3.spec,1.2,1.3

[loewis at users.sourceforge.net]

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

Modified Files:
	python-2.3.spec 
Log Message:
Patch #823259: Update spec file:
- skip building HTML documentation if it is not available.
- Removal of patches, which can't be referenced from a build
directly from the tar-file.
- Using the RPM tmp directory macro for the buildroot location.
- Ensuring that the clean directive doesn't accidentally
delete the users root directory or another directory.
- --enable-unicode=ucs4 in configure line.
Backported to 2.3.


Index: python-2.3.spec
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/RPM/python-2.3.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** python-2.3.spec	24 Feb 2003 17:55:37 -0000	1.2
--- python-2.3.spec	19 Oct 2003 18:34:52 -0000	1.3
***************
*** 31,35 ****
  
  %define name python
! %define version 2.3b1
  %define libvers 2.3
  %define release 1pydotorg
--- 31,35 ----
  
  %define name python
! %define version 2.3.2
  %define libvers 2.3
  %define release 1pydotorg
***************
*** 42,45 ****
--- 42,48 ----
  %define include_tkinter %(if [ \\( "%{config_tkinter}" = auto -a -f /usr/bin/wish \\) -o "%{config_tkinter}" = yes ]; then echo 1; else echo 0; fi)
  
+ #  detect if documentation is available
+ %define include_docs %(if [ -f "%{_sourcedir}/html-%{version}.tar.bz2" ]; then echo 1; else echo 0; fi)
+ 
  Summary: An interpreted, interactive, object-oriented programming language.
  Name: %{name}%{binsuffix}
***************
*** 49,56 ****
  Group: Development/Languages
  Source: Python-%{version}.tgz
  Source1: html-%{version}.tar.bz2
! Patch0: Python-2.1-pythonpath.patch
! #Patch1: Python-2.1-expat.patch
! BuildRoot: /var/tmp/%{name}-%{version}-root
  BuildPrereq: expat-devel
  BuildPrereq: db4-devel
--- 52,59 ----
  Group: Development/Languages
  Source: Python-%{version}.tgz
+ %if %{include_docs}
  Source1: html-%{version}.tar.bz2
! %endif
! BuildRoot: %{_tmppath}/%{name}-%{version}-root
  BuildPrereq: expat-devel
  BuildPrereq: db4-devel
***************
*** 114,117 ****
--- 117,121 ----
  tkinter packages.
  
+ %if %{include_docs}
  %package docs
  Summary: Python-related documentation.
***************
*** 121,126 ****
--- 125,137 ----
  Documentation relating to the Python programming language in HTML and info
  formats.
+ %endif
  
  %changelog
+ * Mon Oct 13 2003 Sean Reifschneider <jafo-rpms at tummy.com> [2.3.2-1pydotorg]
+ - Adding code to detect wether documentation is available to build.
+ 
+ * Fri Sep 19 2003 Sean Reifschneider <jafo-rpms at tummy.com> [2.3.1-1pydotorg]
+ - Updating to the 2.3.1 release.
+ 
  * Mon Feb 24 2003 Sean Reifschneider <jafo-rpms at tummy.com> [2.3b1-1pydotorg]
  - Updating to 2.3b1 release.
***************
*** 176,181 ****
  %prep
  %setup -n Python-%{version}
- %patch0 -p1
- #%patch1
  
  ########
--- 187,190 ----
***************
*** 183,187 ****
  ########
  %build
! ./configure %{ipv6} %{pymalloc} --prefix=%{__prefix}
  make
  
--- 192,196 ----
  ########
  %build
! ./configure --enable-unicode=ucs4 %{ipv6} %{pymalloc} --prefix=%{__prefix}
  make
  
***************
*** 224,228 ****
  #  Tools
  echo '#!/bin/bash' >${RPM_BUILD_ROOT}%{_bindir}/idle%{binsuffix}
! echo 'exec %{_prefix}/bin/python%{binsuffix} /usr/lib/python%{libvers}/Tools/idle/idle.py' >>$RPM_BUILD_ROOT%{_bindir}/idle%{binsuffix}
  chmod 755 $RPM_BUILD_ROOT%{_bindir}/idle%{binsuffix}
  cp -a Tools $RPM_BUILD_ROOT%{_prefix}/lib/python%{libvers}
--- 233,237 ----
  #  Tools
  echo '#!/bin/bash' >${RPM_BUILD_ROOT}%{_bindir}/idle%{binsuffix}
! echo 'exec %{_prefix}/bin/python%{binsuffix} /usr/lib/python%{libvers}/idlelib/idle.py' >>$RPM_BUILD_ROOT%{_bindir}/idle%{binsuffix}
  chmod 755 $RPM_BUILD_ROOT%{_bindir}/idle%{binsuffix}
  cp -a Tools $RPM_BUILD_ROOT%{_prefix}/lib/python%{libvers}
***************
*** 238,247 ****
  
  rm -f tools.files
! find "$RPM_BUILD_ROOT""%{__prefix}"/lib/python%{libvers}/Tools -type f |
! 	sed "s|^${RPM_BUILD_ROOT}|/|" >tools.files
  echo "%{__prefix}"/bin/idle%{binsuffix} >>tools.files
  
  ######
  # Docs
  mkdir -p "$RPM_BUILD_ROOT"/var/www/html/python
  (
--- 247,258 ----
  
  rm -f tools.files
! find "$RPM_BUILD_ROOT""%{__prefix}"/lib/python%{libvers}/idlelib \
!       "$RPM_BUILD_ROOT""%{__prefix}"/lib/python%{libvers}/Tools -type f |
!       sed "s|^${RPM_BUILD_ROOT}|/|" >tools.files
  echo "%{__prefix}"/bin/idle%{binsuffix} >>tools.files
  
  ######
  # Docs
+ %if %{include_docs}
  mkdir -p "$RPM_BUILD_ROOT"/var/www/html/python
  (
***************
*** 249,252 ****
--- 260,264 ----
     bunzip2 < %{SOURCE1} | tar x
  )
+ %endif
  
  ########
***************
*** 254,258 ****
  ########
  %clean
! rm -fr $RPM_BUILD_ROOT
  rm -f mainpkg.files tools.files
  
--- 266,270 ----
  ########
  %clean
! [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
  rm -f mainpkg.files tools.files
  
***************
*** 275,279 ****
  %{__prefix}/lib/python%{libvers}/distutils
  %{__prefix}/lib/python%{libvers}/encodings
- %dir %{__prefix}/lib/python%{libvers}/lib-old
  %{__prefix}/lib/python%{libvers}/plat-linux2
  %{__prefix}/lib/python%{libvers}/site-packages
--- 287,290 ----
***************
*** 302,306 ****
--- 313,319 ----
  %endif
  
+ %if %{include_docs}
  %files docs
  %defattr(-,root,root)
  /var/www/html/python/*
+ %endif