From: Michael W. Hudson Date: Tue, 9 Apr 2002 09:29:28 +0000 (+0000) Subject: Updates from Sean Reifschneider. X-Git-Tag: v2.2.1~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc70e4b2c60be07c214059bda57d0f4ea17c8637;p=thirdparty%2FPython%2Fcpython.git Updates from Sean Reifschneider. --- diff --git a/Misc/RPM/Python-2.1-expat.patch b/Misc/RPM/Python-2.1-expat.patch deleted file mode 100644 index 3686458701a7..000000000000 --- a/Misc/RPM/Python-2.1-expat.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- Modules/pyexpat.c.old Tue Mar 6 02:30:48 2001 -+++ Modules/pyexpat.c Tue Mar 6 02:31:15 2001 -@@ -12,7 +12,7 @@ - #define EXPAT_VERSION 0x015f00 - #endif - #else /* !defined(HAVE_EXPAT_H) */ --#include "xmlparse.h" -+#include "expat/xmlparse.h" - /* Assume Expat 1.1 unless told otherwise */ - #ifndef EXPAT_VERSION - #define EXPAT_VERSION 0x010100 ---- setup.py-orig Fri Feb 2 11:24:25 2001 -+++ setup.py Wed Feb 14 18:13:15 2001 -@@ -445,7 +445,7 @@ - # expat.h was found - expat_defs = [('HAVE_EXPAT_H', 1)] - else: -- expat_incs = find_file('xmlparse.h', inc_dirs, []) -+ expat_incs = find_file('expat/xmlparse.h', inc_dirs, []) - - if (expat_incs is not None and - self.compiler.find_library_file(lib_dirs, 'expat')): diff --git a/Misc/RPM/Python-2.1-pythonpath.patch b/Misc/RPM/Python-2.1-pythonpath.patch deleted file mode 100644 index a6281281b562..000000000000 --- a/Misc/RPM/Python-2.1-pythonpath.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ur Python-2.1a1.old/Lib/cgi.py Python-2.1a1/Lib/cgi.py ---- Python-2.1a1.old/Lib/cgi.py Sat Jan 20 12:54:20 2001 -+++ Python-2.1a1/Lib/cgi.py Fri Jan 26 01:07:57 2001 -@@ -1,4 +1,4 @@ --#! /usr/local/bin/python -+#!/usr/bin/env python - - """Support module for CGI (Common Gateway Interface) scripts. - -diff -ur Python-2.1a1.old/Tools/faqwiz/faqw.py Python-2.1a1/Tools/faqwiz/faqw.py ---- Python-2.1a1.old/Tools/faqwiz/faqw.py Fri Apr 3 15:27:04 1998 -+++ Python-2.1a1/Tools/faqwiz/faqw.py Fri Jan 26 01:08:07 2001 -@@ -1,4 +1,4 @@ --#! /usr/local/bin/python -+#!/usr/bin/env python - - """FAQ wizard bootstrap.""" - -diff -ur Python-2.1a1.old/Tools/scripts/parseentities.py Python-2.1a1/Tools/scripts/parseentities.py ---- Python-2.1a1.old/Tools/scripts/parseentities.py Wed Jan 17 01:48:39 2001 -+++ Python-2.1a1/Tools/scripts/parseentities.py Fri Jan 26 01:08:16 2001 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/env python - """ Utility for parsing HTML entity definitions available from: - - http://www.w3.org/ as e.g. diff --git a/Misc/RPM/README b/Misc/RPM/README index 5dbfccd69fcd..e45675378a44 100644 --- a/Misc/RPM/README +++ b/Misc/RPM/README @@ -1,6 +1,3 @@ This directory contains support file used to build RPM releases of Python. Its contents are maintained by Sean Reifschneider -. - -Note that the patches say "2.1" in the name -- they didn't need to be -updated for 2.2. +. diff --git a/Misc/RPM/python-2.2.spec b/Misc/RPM/python-2.2.spec index db1ab477fdd6..d2659a735843 100644 --- a/Misc/RPM/python-2.2.spec +++ b/Misc/RPM/python-2.2.spec @@ -30,10 +30,10 @@ ################################# %define name python -%define version 2.2 -%define libvers 2.2 -%define release 2 +%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 define weirdness %define ipv6 %(if [ "%{config_ipv6}" = yes ]; then echo --enable-ipv6; else echo --disable-ipv6; fi) @@ -41,6 +41,9 @@ %define binsuffix %(if [ "%{config_binsuffix}" = none ]; then echo ; else echo "%{config_binsuffix}"; fi) %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} Version: %{version} @@ -48,13 +51,12 @@ Release: %{release} Copyright: Modified CNRI Open Source License Group: Development/Languages Source: Python-%{version}.tgz +%if %{include_htmldocs} Source1: html-%{version}.tar.bz2 -Source2: info-%{version}.tar.bz2 -Patch0: Python-2.1-pythonpath.patch -Patch1: Python-2.1-expat.patch +%endif BuildRoot: /var/tmp/%{name}-%{version}-root BuildPrereq: expat-devel -BuildPrereq: db1-devel +BuildPrereq: /usr/include/db1/db.h BuildPrereq: gdbm-devel Prefix: %{__prefix} Packager: Sean Reifschneider @@ -114,6 +116,7 @@ Install python-tools if you want to use these tools to develop Python programs. You will also need to install the python and tkinter packages. +%if %{include_htmldocs} %package docs Summary: Python-related documentation. Group: Development/Documentation @@ -121,8 +124,20 @@ Group: Development/Documentation %description docs Documentation relating to the Python programming language in HTML and info formats. +%endif %changelog +* Tue Mar 26 2002 Sean Reifschneider +[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 +[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 [Release 2.2-2] - Added -docs package. @@ -170,8 +185,8 @@ formats. ####### %prep %setup -n Python-%{version} -%patch0 -p1 -%patch1 + +# fix path to xmlparse header file ######## # BUILD @@ -180,6 +195,17 @@ formats. ./configure %{ipv6} %{pymalloc} --prefix=%{__prefix} 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 ########## @@ -237,16 +263,13 @@ echo "%{__prefix}"/bin/idle%{binsuffix} >>tools.files ###### # Docs +%if %{include_htmldocs} mkdir -p "$RPM_BUILD_ROOT"/var/www/html/python ( cd "$RPM_BUILD_ROOT"/var/www/html/python bunzip2 < %{SOURCE1} | tar x ) -mkdir -p "$RPM_BUILD_ROOT"/usr/share/info -( - cd "$RPM_BUILD_ROOT"/usr/share/info - bunzip2 < %{SOURCE2} | tar x -) +%endif ######## # CLEAN @@ -260,9 +283,11 @@ rm -f mainpkg.files tools.files ######## %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 +%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} %dir %{__prefix}/lib/python%{libvers}/ @@ -296,7 +321,9 @@ rm -f mainpkg.files tools.files %{__prefix}/lib/python%{libvers}/lib-dynload/_tkinter.so* %endif +%if %{include_htmldocs} %files docs %defattr(-,root,root) /var/www/html/python -/usr/share/info +#/usr/share/info +%endif