updates from sean

This commit is contained in:
Anthony Baxter 2003-09-24 01:36:13 +00:00
parent ffe469e827
commit fd95c3a466
3 changed files with 12 additions and 51 deletions

View File

@ -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')):

View File

@ -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.

View File

@ -2,5 +2,15 @@ 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.
It is recommended that RPM builders use the python*.src.rpm file
downloaded from the "ftp.python.org:/pub/python/<version>/rpms". These
may be more up to date than the files included in the base Python
release tar-file.
If you wish to build RPMs from the base Python release tar-file, note
that you will have to download the
"doc/<version>/html-<version>.tar.bz2"
file from python.org and place it into your "SOURCES" directory for
the build to complete. This is the same directory that you place the
Python-2.3.1 release tar-file in. You can then use the ".spec" file in
this directory to build RPMs.