[Python-checkins] python/dist/src/Misc/RPM README,1.1.24.1,1.1.24.2 python-2.2.spec,1.1.2.1,1.1.2.2 Python-2.1-expat.patch,1.1.2.1,NONE Python-2.1-pythonpath.patch,1.1.2.1,NONE
mwh@sourceforge.net
mwh@sourceforge.net
Tue, 09 Apr 2002 02:29:30 -0700
Update of /cvsroot/python/python/dist/src/Misc/RPM
In directory usw-pr-cvs1:/tmp/cvs-serv31129
Modified Files:
Tag: release22-maint
README python-2.2.spec
Removed Files:
Tag: release22-maint
Python-2.1-expat.patch Python-2.1-pythonpath.patch
Log Message:
Updates from Sean Reifschneider.
Index: README
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/RPM/README,v
retrieving revision 1.1.24.1
retrieving revision 1.1.24.2
diff -C2 -d -r1.1.24.1 -r1.1.24.2
*** README 28 Jan 2002 14:58:24 -0000 1.1.24.1
--- README 9 Apr 2002 09:29:28 -0000 1.1.24.2
***************
*** 1,6 ****
This directory contains support file used to build RPM releases of
Python. Its contents are maintained by Sean Reifschneider
! <jafo@tummy.com>.
!
! Note that the patches say "2.1" in the name -- they didn't need to be
! updated for 2.2.
--- 1,3 ----
This directory contains support file used to build RPM releases of
Python. Its contents are maintained by Sean Reifschneider
! <jafo-rpms@tummy.com>.
Index: python-2.2.spec
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/RPM/python-2.2.spec,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** python-2.2.spec 28 Jan 2002 14:58:24 -0000 1.1.2.1
--- python-2.2.spec 9 Apr 2002 09:29:28 -0000 1.1.2.2
***************
*** 31,38 ****
%define name python
! %define version 2.2
! %define libvers 2.2
! %define release 2
%define __prefix /usr
# kludge to get around rpm <percent>define weirdness
--- 31,38 ----
%define name python
! %define version 2.2.1
! %define release 1
%define __prefix /usr
+ %define libvers %(echo "%{version}" | awk -F. '{ printf "%s.%s", $1, $2 }')
# kludge to get around rpm <percent>define weirdness
***************
*** 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)
+ # look for documentation files
+ %define include_htmldocs %(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,59 ****
Group: Development/Languages
Source: Python-%{version}.tgz
Source1: html-%{version}.tar.bz2
! Source2: info-%{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: db1-devel
BuildPrereq: gdbm-devel
Prefix: %{__prefix}
--- 52,61 ----
Group: Development/Languages
Source: Python-%{version}.tgz
+ %if %{include_htmldocs}
Source1: html-%{version}.tar.bz2
! %endif
BuildRoot: /var/tmp/%{name}-%{version}-root
BuildPrereq: expat-devel
! BuildPrereq: /usr/include/db1/db.h
BuildPrereq: gdbm-devel
Prefix: %{__prefix}
***************
*** 115,118 ****
--- 117,121 ----
tkinter packages.
+ %if %{include_htmldocs}
%package docs
Summary: Python-related documentation.
***************
*** 122,127 ****
--- 125,142 ----
Documentation relating to the Python programming language in HTML and info
formats.
+ %endif
%changelog
+ * Tue Mar 26 2002 Sean Reifschneider <jafo-rpms@tummy.com>
+ [Release 2.2.1c2-1]
+ - Updated to 2.2.1c2.
+ - Changed build pre-req for db to use file instead of package.
+ (Suggested by Alf Werder)
+
+ * Wed Jan 23 2002 Sean Reifschneider <jafo-rpms@tummy.com>
+ [Release 2.2-3]
+ - Using "*" for the man page extension to pick up both systems which use
+ .bz2 and .gz compressed man pages. (Pointed out by Tony Hammitt)
+
* Sun Dec 23 2001 Sean Reifschneider <jafo-rpms@tummy.com>
[Release 2.2-2]
***************
*** 171,176 ****
%prep
%setup -n Python-%{version}
! %patch0 -p1
! %patch1
########
--- 186,191 ----
%prep
%setup -n Python-%{version}
!
! # fix path to xmlparse header file
########
***************
*** 181,184 ****
--- 196,210 ----
make
+ # fix paths
+ for file in \
+ Tools/scripts/pathfix.py \
+ Lib/cgi.py \
+ Tools/faqwiz/faqw.py \
+ Tools/scripts/parseentities.py
+ do
+ ./python Tools/scripts/pathfix.py -i '/usr/bin/env python' "$file"
+ rm -f "$file"~ # remove backup
+ done
+
##########
# INSTALL
***************
*** 238,241 ****
--- 264,268 ----
######
# Docs
+ %if %{include_htmldocs}
mkdir -p "$RPM_BUILD_ROOT"/var/www/html/python
(
***************
*** 243,251 ****
bunzip2 < %{SOURCE1} | tar x
)
! mkdir -p "$RPM_BUILD_ROOT"/usr/share/info
! (
! cd "$RPM_BUILD_ROOT"/usr/share/info
! bunzip2 < %{SOURCE2} | tar x
! )
########
--- 270,274 ----
bunzip2 < %{SOURCE1} | tar x
)
! %endif
########
***************
*** 261,267 ****
%files -f mainpkg.files
%defattr(-,root,root)
! %doc Misc/README Misc/HYPE Misc/cheatsheet Misc/unicode.txt Misc/Porting
! %doc LICENSE Misc/ACKS Misc/BLURB.* Misc/HISTORY Misc/NEWS
! %{__prefix}/man/man1/python%{binsuffix}.1.gz
%dir %{__prefix}/include/python%{libvers}
--- 284,292 ----
%files -f mainpkg.files
%defattr(-,root,root)
! %doc Misc/*README Misc/cheatsheet Misc/Porting Misc/gdbinit Misc/indent.pro
! %doc LICENSE Misc/ACKS Misc/HISTORY Misc/NEWS Misc/Porting
! %doc Misc/python-mode.el Misc/RFD Misc/setuid-prog.c Misc/vgrindefs
! %doc Misc/RPM/README
! %{__prefix}/man/man1/python%{binsuffix}.1*
%dir %{__prefix}/include/python%{libvers}
***************
*** 297,302 ****
%endif
%files docs
%defattr(-,root,root)
/var/www/html/python
! /usr/share/info
--- 322,329 ----
%endif
+ %if %{include_htmldocs}
%files docs
%defattr(-,root,root)
/var/www/html/python
! #/usr/share/info
! %endif
--- Python-2.1-expat.patch DELETED ---
--- Python-2.1-pythonpath.patch DELETED ---