2003-02-23 21:09:53 -04:00
|
|
|
##########################
|
|
|
|
|
# User-modifiable configs
|
|
|
|
|
##########################
|
|
|
|
|
|
|
|
|
|
# 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
|
Merge current trunk into p3yk. This includes the PyNumber_Index API change,
which unfortunately means the errors from the bytes type change somewhat:
bytes([300]) still raises a ValueError, but bytes([10**100]) now raises a
TypeError (either that, or bytes(1.0) also raises a ValueError --
PyNumber_AsSsize_t() can only raise one type of exception.)
Merged revisions 51188-51433 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r51189 | kurt.kaiser | 2006-08-10 19:11:09 +0200 (Thu, 10 Aug 2006) | 4 lines
Retrieval of previous shell command was not always preserving indentation
since 1.2a1) Patch 1528468 Tal Einat.
........
r51190 | guido.van.rossum | 2006-08-10 19:41:07 +0200 (Thu, 10 Aug 2006) | 3 lines
Chris McDonough's patch to defend against certain DoS attacks on FieldStorage.
SF bug #1112549.
........
r51191 | guido.van.rossum | 2006-08-10 19:42:50 +0200 (Thu, 10 Aug 2006) | 2 lines
News item for SF bug 1112549.
........
r51192 | guido.van.rossum | 2006-08-10 20:09:25 +0200 (Thu, 10 Aug 2006) | 2 lines
Fix title -- it's rc1, not beta3.
........
r51194 | martin.v.loewis | 2006-08-10 21:04:00 +0200 (Thu, 10 Aug 2006) | 3 lines
Update dangling references to the 3.2 database to
mention that this is UCD 4.1 now.
........
r51195 | tim.peters | 2006-08-11 00:45:34 +0200 (Fri, 11 Aug 2006) | 6 lines
Followup to bug #1069160.
PyThreadState_SetAsyncExc(): internal correctness changes wrt
refcount safety and deadlock avoidance. Also added a basic test
case (relying on ctypes) and repaired the docs.
........
r51196 | tim.peters | 2006-08-11 00:48:45 +0200 (Fri, 11 Aug 2006) | 2 lines
Whitespace normalization.
........
r51197 | tim.peters | 2006-08-11 01:22:13 +0200 (Fri, 11 Aug 2006) | 5 lines
Whitespace normalization broke test_cgi, because a line
of quoted test data relied on preserving a single trailing
blank. Changed the string from raw to regular, and forced
in the trailing blank via an explicit \x20 escape.
........
r51198 | tim.peters | 2006-08-11 02:49:01 +0200 (Fri, 11 Aug 2006) | 10 lines
test_PyThreadState_SetAsyncExc(): This is failing on some
64-bit boxes. I have no idea what the ctypes docs mean
by "integers", and blind-guessing here that it intended to
mean the signed C "int" type, in which case perhaps I can
repair this by feeding the thread id argument to type
ctypes.c_long().
Also made the worker thread daemonic, so it doesn't hang
Python shutdown if the test continues to fail.
........
r51199 | tim.peters | 2006-08-11 05:49:10 +0200 (Fri, 11 Aug 2006) | 6 lines
force_test_exit(): This has been completely ineffective
at stopping test_signal from hanging forever on the Tru64
buildbot. That could be because there's no such thing as
signal.SIGALARM. Changed to the idiotic (but standard)
signal.SIGALRM instead, and added some more debug output.
........
r51202 | neal.norwitz | 2006-08-11 08:09:41 +0200 (Fri, 11 Aug 2006) | 6 lines
Fix the failures on cygwin (2006-08-10 fixed the actual locking issue).
The first hunk changes the colon to an ! like other Windows variants.
We need to always wait on the child so the lock gets released and
no other tests fail. This is the try/finally in the second hunk.
........
r51205 | georg.brandl | 2006-08-11 09:15:38 +0200 (Fri, 11 Aug 2006) | 3 lines
Add Chris McDonough (latest cgi.py patch)
........
r51206 | georg.brandl | 2006-08-11 09:26:10 +0200 (Fri, 11 Aug 2006) | 3 lines
logging's atexit hook now runs even if the rest of the module has
already been cleaned up.
........
r51212 | thomas.wouters | 2006-08-11 17:02:39 +0200 (Fri, 11 Aug 2006) | 4 lines
Add ignore of *.pyc and *.pyo to Lib/xml/etree/.
........
r51215 | thomas.heller | 2006-08-11 21:55:35 +0200 (Fri, 11 Aug 2006) | 7 lines
When a ctypes C callback function is called, zero out the result
storage before converting the result to C data. See the comment in
the code for details.
Provide a better context for errors when the conversion of a callback
function's result cannot be converted.
........
r51218 | neal.norwitz | 2006-08-12 03:43:40 +0200 (Sat, 12 Aug 2006) | 6 lines
Klocwork made another run and found a bunch more problems.
This is the first batch of fixes that should be easy to verify based on context.
This fixes problem numbers: 220 (ast), 323-324 (symtable),
321-322 (structseq), 215 (array), 210 (hotshot), 182 (codecs), 209 (etree).
........
r51219 | neal.norwitz | 2006-08-12 03:45:47 +0200 (Sat, 12 Aug 2006) | 9 lines
Even though _Py_Mangle() isn't truly public anyone can call it and
there was no verification that privateobj was a PyString. If it wasn't
a string, this could have allowed a NULL pointer to creep in below and crash.
I wonder if this should be PyString_CheckExact? Must identifiers be strings
or can they be subclasses?
Klocwork #275
........
r51220 | neal.norwitz | 2006-08-12 03:46:42 +0200 (Sat, 12 Aug 2006) | 5 lines
It's highly unlikely, though possible for PyEval_Get*() to return NULLs.
So be safe and do an XINCREF.
Klocwork # 221-222.
........
r51221 | neal.norwitz | 2006-08-12 03:47:59 +0200 (Sat, 12 Aug 2006) | 7 lines
This code is actually not used unless WITHOUT_COMPLEX is defined.
However, there was no error checking that PyFloat_FromDouble returned
a valid pointer. I believe this change is correct as it seemed
to follow other code in the area.
Klocwork # 292.
........
r51222 | neal.norwitz | 2006-08-12 03:49:12 +0200 (Sat, 12 Aug 2006) | 5 lines
Handle NULL nodes while parsing. I'm not entirely sure this is correct.
There might be something else that needs to be done to setup the error.
Klocwork #295.
........
r51223 | neal.norwitz | 2006-08-12 03:50:38 +0200 (Sat, 12 Aug 2006) | 6 lines
If _stat_float_times is false, we will try to INCREF ival which could be NULL.
Return early in that case. The caller checks for PyErr_Occurred so this
should be ok.
Klocwork #297
........
r51224 | neal.norwitz | 2006-08-12 03:51:12 +0200 (Sat, 12 Aug 2006) | 3 lines
Move the assert which checks for a NULL pointer first.
Klocwork #274.
........
r51225 | neal.norwitz | 2006-08-12 03:53:28 +0200 (Sat, 12 Aug 2006) | 5 lines
Try to handle a malloc failure. I'm not entirely sure this is correct.
There might be something else we need to do to handle the exception.
Klocwork # 212-213
........
r51226 | neal.norwitz | 2006-08-12 03:57:47 +0200 (Sat, 12 Aug 2006) | 6 lines
I'm not sure why this code allocates this string for the error message.
I think it would be better to always use snprintf and have the format
limit the size of the name appropriately (like %.200s).
Klocwork #340
........
r51227 | neal.norwitz | 2006-08-12 04:06:34 +0200 (Sat, 12 Aug 2006) | 3 lines
Check returned pointer is valid.
Klocwork #233
........
r51228 | neal.norwitz | 2006-08-12 04:12:30 +0200 (Sat, 12 Aug 2006) | 1 line
Whoops, how did that get in there. :-) Revert all the parts of 51227 that were not supposed to go it. Only Modules/_ctypes/cfields.c was supposed to be changed
........
r51229 | neal.norwitz | 2006-08-12 04:33:36 +0200 (Sat, 12 Aug 2006) | 4 lines
Don't deref v if it's NULL.
Klocwork #214
........
r51230 | neal.norwitz | 2006-08-12 05:16:54 +0200 (Sat, 12 Aug 2006) | 5 lines
Check return of PyMem_MALLOC (garbage) is non-NULL.
Check seq in both portions of if/else.
Klocwork #289-290.
........
r51231 | neal.norwitz | 2006-08-12 05:17:41 +0200 (Sat, 12 Aug 2006) | 4 lines
PyModule_GetDict() can fail, produce fatal errors if this happens on startup.
Klocwork #298-299.
........
r51232 | neal.norwitz | 2006-08-12 05:18:50 +0200 (Sat, 12 Aug 2006) | 5 lines
Verify verdat which is returned from malloc is not NULL.
Ensure we don't pass NULL to free.
Klocwork #306 (at least the first part, checking malloc)
........
r51233 | tim.peters | 2006-08-12 06:42:47 +0200 (Sat, 12 Aug 2006) | 35 lines
test_signal: Signal handling on the Tru64 buildbot
appears to be utterly insane. Plug some theoretical
insecurities in the test script:
- Verify that the SIGALRM handler was actually installed.
- Don't call alarm() before the handler is installed.
- Move everything that can fail inside the try/finally,
so the test cleans up after itself more often.
- Try sending all the expected signals in
force_test_exit(), not just SIGALRM. Since that was
fixed to actually send SIGALRM (instead of invisibly
dying with an AttributeError), we've seen that sending
SIGALRM alone does not stop this from hanging.
- Move the "kill the child" business into the finally
clause, so the child doesn't survive test failure
to send SIGALRM to other tests later (there are also
baffling SIGALRM-related failures in test_socket).
- Cancel the alarm in the finally clause -- if the
test dies early, we again don't want SIGALRM showing
up to confuse a later test.
Alas, this still relies on timing luck wrt the spawned
script that sends the test signals, but it's hard to see
how waiting for seconds can so often be so unlucky.
test_threadedsignals: curiously, this test never fails
on Tru64, but doesn't normally signal SIGALRM. Anyway,
fixed an obvious (but probably inconsequential) logic
error.
........
r51234 | tim.peters | 2006-08-12 07:17:41 +0200 (Sat, 12 Aug 2006) | 8 lines
Ah, fudge. One of the prints here actually "shouldn't be"
protected by "if verbose:", which caused the test to fail on
all non-Windows boxes.
Note that I deliberately didn't convert this to unittest yet,
because I expect it would be even harder to debug this on Tru64
after conversion.
........
r51235 | georg.brandl | 2006-08-12 10:32:02 +0200 (Sat, 12 Aug 2006) | 3 lines
Repair logging test spew caused by rev. 51206.
........
r51236 | neal.norwitz | 2006-08-12 19:03:09 +0200 (Sat, 12 Aug 2006) | 8 lines
Patch #1538606, Patch to fix __index__() clipping.
I modified this patch some by fixing style, some error checking, and adding
XXX comments. This patch requires review and some changes are to be expected.
I'm checking in now to get the greatest possible review and establish a
baseline for moving forward. I don't want this to hold up release if possible.
........
r51238 | neal.norwitz | 2006-08-12 20:44:06 +0200 (Sat, 12 Aug 2006) | 10 lines
Fix a couple of bugs exposed by the new __index__ code. The 64-bit buildbots
were failing due to inappropriate clipping of numbers larger than 2**31
with new-style classes. (typeobject.c) In reviewing the code for classic
classes, there were 2 problems. Any negative value return could be returned.
Always return -1 if there was an error. Also make the checks similar
with the new-style classes. I believe this is correct for 32 and 64 bit
boxes, including Windows64.
Add a test of classic classes too.
........
r51240 | neal.norwitz | 2006-08-13 02:20:49 +0200 (Sun, 13 Aug 2006) | 1 line
SF bug #1539336, distutils example code missing
........
r51245 | neal.norwitz | 2006-08-13 20:10:10 +0200 (Sun, 13 Aug 2006) | 6 lines
Move/copy assert for tstate != NULL before first use.
Verify that PyEval_Get{Globals,Locals} returned valid pointers.
Klocwork 231-232
........
r51246 | neal.norwitz | 2006-08-13 20:10:28 +0200 (Sun, 13 Aug 2006) | 5 lines
Handle a whole lot of failures from PyString_FromInternedString().
Should fix most of Klocwork 234-272.
........
r51247 | neal.norwitz | 2006-08-13 20:10:47 +0200 (Sun, 13 Aug 2006) | 8 lines
cpathname could be NULL if it was longer than MAXPATHLEN. Don't try
to write the .pyc to NULL.
Check results of PyList_GetItem() and PyModule_GetDict() are not NULL.
Klocwork 282, 283, 285
........
r51248 | neal.norwitz | 2006-08-13 20:11:08 +0200 (Sun, 13 Aug 2006) | 6 lines
Fix segfault when doing string formatting on subclasses of long if
__oct__, __hex__ don't return a string.
Klocwork 308
........
r51250 | neal.norwitz | 2006-08-13 20:11:27 +0200 (Sun, 13 Aug 2006) | 5 lines
Check return result of PyModule_GetDict().
Fix a bunch of refleaks in the init of the module. This would only be found
when running python -v.
........
r51251 | neal.norwitz | 2006-08-13 20:11:43 +0200 (Sun, 13 Aug 2006) | 5 lines
Handle malloc and fopen failures more gracefully.
Klocwork 180-181
........
r51252 | neal.norwitz | 2006-08-13 20:12:03 +0200 (Sun, 13 Aug 2006) | 7 lines
It's very unlikely, though possible that source is not a string. Verify
that PyString_AsString() returns a valid pointer. (The problem can
arise when zlib.decompress doesn't return a string.)
Klocwork 346
........
r51253 | neal.norwitz | 2006-08-13 20:12:26 +0200 (Sun, 13 Aug 2006) | 5 lines
Handle failures from lookup.
Klocwork 341-342
........
r51254 | neal.norwitz | 2006-08-13 20:12:45 +0200 (Sun, 13 Aug 2006) | 6 lines
Handle failure from PyModule_GetDict() (Klocwork 208).
Fix a bunch of refleaks in the init of the module. This would only be found
when running python -v.
........
r51255 | neal.norwitz | 2006-08-13 20:13:02 +0200 (Sun, 13 Aug 2006) | 4 lines
Really address the issue of where to place the assert for leftblock.
(Followup of Klocwork 274)
........
r51256 | neal.norwitz | 2006-08-13 20:13:36 +0200 (Sun, 13 Aug 2006) | 4 lines
Handle malloc failure.
Klocwork 281
........
r51258 | neal.norwitz | 2006-08-13 20:40:39 +0200 (Sun, 13 Aug 2006) | 4 lines
Handle alloca failures.
Klocwork 225-228
........
r51259 | neal.norwitz | 2006-08-13 20:41:15 +0200 (Sun, 13 Aug 2006) | 1 line
Get rid of compiler warning
........
r51261 | neal.norwitz | 2006-08-14 02:51:15 +0200 (Mon, 14 Aug 2006) | 1 line
Ignore pgen.exe and kill_python.exe for cygwin
........
r51262 | neal.norwitz | 2006-08-14 02:59:03 +0200 (Mon, 14 Aug 2006) | 4 lines
Can't return NULL from a void function. If there is a memory error,
about the best we can do is call PyErr_WriteUnraisable and go on.
We won't be able to do the call below either, so verify delstr is valid.
........
r51263 | neal.norwitz | 2006-08-14 03:49:54 +0200 (Mon, 14 Aug 2006) | 1 line
Update purify doc some.
........
r51264 | thomas.heller | 2006-08-14 09:13:05 +0200 (Mon, 14 Aug 2006) | 2 lines
Remove unused, buggy test function.
Fixes klockwork issue #207.
........
r51265 | thomas.heller | 2006-08-14 09:14:09 +0200 (Mon, 14 Aug 2006) | 2 lines
Check for NULL return value from new_CArgObject().
Fixes klockwork issues #183, #184, #185.
........
r51266 | thomas.heller | 2006-08-14 09:50:14 +0200 (Mon, 14 Aug 2006) | 2 lines
Check for NULL return value of GenericCData_new().
Fixes klockwork issues #188, #189.
........
r51274 | thomas.heller | 2006-08-14 12:02:24 +0200 (Mon, 14 Aug 2006) | 2 lines
Revert the change that tries to zero out a closure's result storage
area because the size if unknown in source/callproc.c.
........
r51276 | marc-andre.lemburg | 2006-08-14 12:55:19 +0200 (Mon, 14 Aug 2006) | 11 lines
Slightly revised version of patch #1538956:
Replace UnicodeDecodeErrors raised during == and !=
compares of Unicode and other objects with a new
UnicodeWarning.
All other comparisons continue to raise exceptions.
Exceptions other than UnicodeDecodeErrors are also left
untouched.
........
r51277 | thomas.heller | 2006-08-14 13:17:48 +0200 (Mon, 14 Aug 2006) | 13 lines
Apply the patch #1532975 plus ideas from the patch #1533481.
ctypes instances no longer have the internal and undocumented
'_as_parameter_' attribute which was used to adapt them to foreign
function calls; this mechanism is replaced by a function pointer in
the type's stgdict.
In the 'from_param' class methods, try the _as_parameter_ attribute if
other conversions are not possible.
This makes the documented _as_parameter_ mechanism work as intended.
Change the ctypes version number to 1.0.1.
........
r51278 | marc-andre.lemburg | 2006-08-14 13:44:34 +0200 (Mon, 14 Aug 2006) | 3 lines
Readd NEWS items that were accidentally removed by r51276.
........
r51279 | georg.brandl | 2006-08-14 14:36:06 +0200 (Mon, 14 Aug 2006) | 3 lines
Improve markup in PyUnicode_RichCompare.
........
r51280 | marc-andre.lemburg | 2006-08-14 14:57:27 +0200 (Mon, 14 Aug 2006) | 3 lines
Correct an accidentally removed previous patch.
........
r51281 | thomas.heller | 2006-08-14 18:17:41 +0200 (Mon, 14 Aug 2006) | 3 lines
Patch #1536908: Add support for AMD64 / OpenBSD.
Remove the -no-stack-protector compiler flag for OpenBSD
as it has been reported to be unneeded.
........
r51282 | thomas.heller | 2006-08-14 18:20:04 +0200 (Mon, 14 Aug 2006) | 1 line
News item for rev 51281.
........
r51283 | georg.brandl | 2006-08-14 22:25:39 +0200 (Mon, 14 Aug 2006) | 3 lines
Fix refleak introduced in rev. 51248.
........
r51284 | georg.brandl | 2006-08-14 23:34:08 +0200 (Mon, 14 Aug 2006) | 5 lines
Make tabnanny recognize IndentationErrors raised by tokenize.
Add a test to test_inspect to make sure indented source
is recognized correctly. (fixes #1224621)
........
r51285 | georg.brandl | 2006-08-14 23:42:55 +0200 (Mon, 14 Aug 2006) | 3 lines
Patch #1535500: fix segfault in BZ2File.writelines and make sure it
raises the correct exceptions.
........
r51287 | georg.brandl | 2006-08-14 23:45:32 +0200 (Mon, 14 Aug 2006) | 3 lines
Add an additional test: BZ2File write methods should raise IOError
when file is read-only.
........
r51289 | georg.brandl | 2006-08-14 23:55:28 +0200 (Mon, 14 Aug 2006) | 3 lines
Patch #1536071: trace.py should now find the full module name of a
file correctly even on Windows.
........
r51290 | georg.brandl | 2006-08-15 00:01:24 +0200 (Tue, 15 Aug 2006) | 3 lines
Cookie.py shouldn't "bogusly" use string._idmap.
........
r51291 | georg.brandl | 2006-08-15 00:10:24 +0200 (Tue, 15 Aug 2006) | 3 lines
Patch #1511317: don't crash on invalid hostname info
........
r51292 | tim.peters | 2006-08-15 02:25:04 +0200 (Tue, 15 Aug 2006) | 2 lines
Whitespace normalization.
........
r51293 | neal.norwitz | 2006-08-15 06:14:57 +0200 (Tue, 15 Aug 2006) | 3 lines
Georg fixed one of my bugs, so I'll repay him with 2 NEWS entries.
Now we're even. :-)
........
r51295 | neal.norwitz | 2006-08-15 06:58:28 +0200 (Tue, 15 Aug 2006) | 8 lines
Fix the test for SocketServer so it should pass on cygwin and not fail
sporadically on other platforms. This is really a band-aid that doesn't
fix the underlying issue in SocketServer. It's not clear if it's worth
it to fix SocketServer, however, I opened a bug to track it:
http://python.org/sf/1540386
........
r51296 | neal.norwitz | 2006-08-15 06:59:30 +0200 (Tue, 15 Aug 2006) | 3 lines
Update the docstring to use a version a little newer than 1999. This was
taken from a Debian patch. Should we update the version for each release?
........
r51298 | neal.norwitz | 2006-08-15 08:29:03 +0200 (Tue, 15 Aug 2006) | 2 lines
Subclasses of int/long are allowed to define an __index__.
........
r51300 | thomas.heller | 2006-08-15 15:07:21 +0200 (Tue, 15 Aug 2006) | 1 line
Check for NULL return value from new_CArgObject calls.
........
r51303 | kurt.kaiser | 2006-08-16 05:15:26 +0200 (Wed, 16 Aug 2006) | 2 lines
The 'with' statement is now a Code Context block opener
........
r51304 | anthony.baxter | 2006-08-16 05:42:26 +0200 (Wed, 16 Aug 2006) | 1 line
preparing for 2.5c1
........
r51305 | anthony.baxter | 2006-08-16 05:58:37 +0200 (Wed, 16 Aug 2006) | 1 line
preparing for 2.5c1 - no, really this time
........
r51306 | kurt.kaiser | 2006-08-16 07:01:42 +0200 (Wed, 16 Aug 2006) | 9 lines
Patch #1540892: site.py Quitter() class attempts to close sys.stdin
before raising SystemExit, allowing IDLE to honor quit() and exit().
M Lib/site.py
M Lib/idlelib/PyShell.py
M Lib/idlelib/CREDITS.txt
M Lib/idlelib/NEWS.txt
M Misc/NEWS
........
r51307 | ka-ping.yee | 2006-08-16 09:02:50 +0200 (Wed, 16 Aug 2006) | 6 lines
Update code and tests to support the 'bytes_le' attribute (for
little-endian byte order on Windows), and to work around clocks
with low resolution yielding duplicate UUIDs.
Anthony Baxter has approved this change.
........
r51308 | kurt.kaiser | 2006-08-16 09:04:17 +0200 (Wed, 16 Aug 2006) | 2 lines
Get quit() and exit() to work cleanly when not using subprocess.
........
r51309 | marc-andre.lemburg | 2006-08-16 10:13:26 +0200 (Wed, 16 Aug 2006) | 2 lines
Revert to having static version numbers again.
........
r51310 | martin.v.loewis | 2006-08-16 14:55:10 +0200 (Wed, 16 Aug 2006) | 2 lines
Build _hashlib on Windows. Build OpenSSL with masm assembler code.
Fixes #1535502.
........
r51311 | thomas.heller | 2006-08-16 15:03:11 +0200 (Wed, 16 Aug 2006) | 6 lines
Add commented assert statements to check that the result of
PyObject_stgdict() and PyType_stgdict() calls are non-NULL before
dereferencing the result. Hopefully this fixes what klocwork is
complaining about.
Fix a few other nits as well.
........
r51312 | anthony.baxter | 2006-08-16 15:08:25 +0200 (Wed, 16 Aug 2006) | 1 line
news entry for 51307
........
r51313 | andrew.kuchling | 2006-08-16 15:22:20 +0200 (Wed, 16 Aug 2006) | 1 line
Add UnicodeWarning
........
r51314 | andrew.kuchling | 2006-08-16 15:41:52 +0200 (Wed, 16 Aug 2006) | 1 line
Bump document version to 1.0; remove pystone paragraph
........
r51315 | andrew.kuchling | 2006-08-16 15:51:32 +0200 (Wed, 16 Aug 2006) | 1 line
Link to docs; remove an XXX comment
........
r51316 | martin.v.loewis | 2006-08-16 15:58:51 +0200 (Wed, 16 Aug 2006) | 1 line
Make cl build step compile-only (/c). Remove libs from source list.
........
r51317 | thomas.heller | 2006-08-16 16:07:44 +0200 (Wed, 16 Aug 2006) | 5 lines
The __repr__ method of a NULL py_object does no longer raise an
exception. Remove a stray '?' character from the exception text
when the value is retrieved of such an object.
Includes tests.
........
r51318 | andrew.kuchling | 2006-08-16 16:18:23 +0200 (Wed, 16 Aug 2006) | 1 line
Update bug/patch counts
........
r51319 | andrew.kuchling | 2006-08-16 16:21:14 +0200 (Wed, 16 Aug 2006) | 1 line
Wording/typo fixes
........
r51320 | thomas.heller | 2006-08-16 17:10:12 +0200 (Wed, 16 Aug 2006) | 9 lines
Remove the special casing of Py_None when converting the return value
of the Python part of a callback function to C. If it cannot be
converted, call PyErr_WriteUnraisable with the exception we got.
Before, arbitrary data has been passed to the calling C code in this
case.
(I'm not really sure the NEWS entry is understandable, but I cannot
find better words)
........
r51321 | marc-andre.lemburg | 2006-08-16 18:11:01 +0200 (Wed, 16 Aug 2006) | 2 lines
Add NEWS item mentioning the reverted distutils version number patch.
........
r51322 | fredrik.lundh | 2006-08-16 18:47:07 +0200 (Wed, 16 Aug 2006) | 5 lines
SF#1534630
ignore data that arrives before the opening start tag
........
r51324 | andrew.kuchling | 2006-08-16 19:11:18 +0200 (Wed, 16 Aug 2006) | 1 line
Grammar fix
........
r51328 | thomas.heller | 2006-08-16 20:02:11 +0200 (Wed, 16 Aug 2006) | 12 lines
Tutorial:
Clarify somewhat how parameters are passed to functions
(especially explain what integer means).
Correct the table - Python integers and longs can both be used.
Further clarification to the table comparing ctypes types, Python
types, and C types.
Reference:
Replace integer by C ``int`` where it makes sense.
........
r51329 | kurt.kaiser | 2006-08-16 23:45:59 +0200 (Wed, 16 Aug 2006) | 8 lines
File menu hotkeys: there were three 'p' assignments. Reassign the
'Save Copy As' and 'Print' hotkeys to 'y' and 't'. Change the
Shell menu hotkey from 's' to 'l'.
M Bindings.py
M PyShell.py
M NEWS.txt
........
r51330 | neil.schemenauer | 2006-08-17 01:38:05 +0200 (Thu, 17 Aug 2006) | 3 lines
Fix a bug in the ``compiler`` package that caused invalid code to be
generated for generator expressions.
........
r51342 | martin.v.loewis | 2006-08-17 21:19:32 +0200 (Thu, 17 Aug 2006) | 3 lines
Merge 51340 and 51341 from 2.5 branch:
Leave tk build directory to restore original path.
Invoke debug mk1mf.pl after running Configure.
........
r51354 | martin.v.loewis | 2006-08-18 05:47:18 +0200 (Fri, 18 Aug 2006) | 3 lines
Bug #1541863: uuid.uuid1 failed to generate unique identifiers
on systems with low clock resolution.
........
r51355 | neal.norwitz | 2006-08-18 05:57:54 +0200 (Fri, 18 Aug 2006) | 1 line
Add template for 2.6 on HEAD
........
r51356 | neal.norwitz | 2006-08-18 06:01:38 +0200 (Fri, 18 Aug 2006) | 1 line
More post-release wibble
........
r51357 | neal.norwitz | 2006-08-18 06:58:33 +0200 (Fri, 18 Aug 2006) | 1 line
Try to get Windows bots working again
........
r51358 | neal.norwitz | 2006-08-18 07:10:00 +0200 (Fri, 18 Aug 2006) | 1 line
Try to get Windows bots working again. Take 2
........
r51359 | neal.norwitz | 2006-08-18 07:39:20 +0200 (Fri, 18 Aug 2006) | 1 line
Try to get Unix bots install working again.
........
r51360 | neal.norwitz | 2006-08-18 07:41:46 +0200 (Fri, 18 Aug 2006) | 1 line
Set version to 2.6a0, seems more consistent.
........
r51362 | neal.norwitz | 2006-08-18 08:14:52 +0200 (Fri, 18 Aug 2006) | 1 line
More version wibble
........
r51364 | georg.brandl | 2006-08-18 09:27:59 +0200 (Fri, 18 Aug 2006) | 4 lines
Bug #1541682: Fix example in the "Refcount details" API docs.
Additionally, remove a faulty example showing PySequence_SetItem applied
to a newly created list object and add notes that this isn't a good idea.
........
r51366 | anthony.baxter | 2006-08-18 09:29:02 +0200 (Fri, 18 Aug 2006) | 3 lines
Updating IDLE's version number to match Python's (as per python-dev
discussion).
........
r51367 | anthony.baxter | 2006-08-18 09:30:07 +0200 (Fri, 18 Aug 2006) | 1 line
RPM specfile updates
........
r51368 | georg.brandl | 2006-08-18 09:35:47 +0200 (Fri, 18 Aug 2006) | 2 lines
Typo in tp_clear docs.
........
r51378 | andrew.kuchling | 2006-08-18 15:57:13 +0200 (Fri, 18 Aug 2006) | 1 line
Minor edits
........
r51379 | thomas.heller | 2006-08-18 16:38:46 +0200 (Fri, 18 Aug 2006) | 6 lines
Add asserts to check for 'impossible' NULL values, with comments.
In one place where I'n not 1000% sure about the non-NULL, raise
a RuntimeError for safety.
This should fix the klocwork issues that Neal sent me. If so,
it should be applied to the release25-maint branch also.
........
r51400 | neal.norwitz | 2006-08-19 06:22:33 +0200 (Sat, 19 Aug 2006) | 5 lines
Move initialization of interned strings to before allocating the
object so we don't leak op. (Fixes an earlier patch to this code)
Klockwork #350
........
r51401 | neal.norwitz | 2006-08-19 06:23:04 +0200 (Sat, 19 Aug 2006) | 4 lines
Move assert to after NULL check, otherwise we deref NULL in the assert.
Klocwork #307
........
r51402 | neal.norwitz | 2006-08-19 06:25:29 +0200 (Sat, 19 Aug 2006) | 2 lines
SF #1542693: Remove semi-colon at end of PyImport_ImportModuleEx macro
........
r51403 | neal.norwitz | 2006-08-19 06:28:55 +0200 (Sat, 19 Aug 2006) | 6 lines
Move initialization to after the asserts for non-NULL values.
Klocwork 286-287.
(I'm not backporting this, but if someone wants to, feel free.)
........
r51404 | neal.norwitz | 2006-08-19 06:52:03 +0200 (Sat, 19 Aug 2006) | 6 lines
Handle PyString_FromInternedString() failing (unlikely, but possible).
Klocwork #325
(I'm not backporting this, but if someone wants to, feel free.)
........
r51416 | georg.brandl | 2006-08-20 15:15:39 +0200 (Sun, 20 Aug 2006) | 2 lines
Patch #1542948: fix urllib2 header casing issue. With new test.
........
r51428 | jeremy.hylton | 2006-08-21 18:19:37 +0200 (Mon, 21 Aug 2006) | 3 lines
Move peephole optimizer to separate file.
........
r51429 | jeremy.hylton | 2006-08-21 18:20:29 +0200 (Mon, 21 Aug 2006) | 2 lines
Move peephole optimizer to separate file. (Forgot .h in previous checkin.)
........
r51432 | neal.norwitz | 2006-08-21 19:59:46 +0200 (Mon, 21 Aug 2006) | 5 lines
Fix bug #1543303, tarfile adds padding that breaks gunzip.
Patch # 1543897.
Will backport to 2.5
........
r51433 | neal.norwitz | 2006-08-21 20:01:30 +0200 (Mon, 21 Aug 2006) | 2 lines
Add assert to make Klocwork happy (#276)
........
2006-08-21 16:07:27 -03:00
|
|
|
%define config_binsuffix 2.6
|
2003-02-23 21:09:53 -04:00
|
|
|
|
|
|
|
|
# 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 no
|
|
|
|
|
%define config_pymalloc yes
|
|
|
|
|
|
|
|
|
|
# Enable IPV6?
|
|
|
|
|
#WARNING: Commenting out doesn't work. Last line is what's used.
|
|
|
|
|
%define config_ipv6 yes
|
|
|
|
|
%define config_ipv6 no
|
|
|
|
|
|
2004-10-21 20:35:45 -03:00
|
|
|
# Location of the HTML directory.
|
|
|
|
|
%define config_htmldir /var/www/html/python
|
|
|
|
|
|
2003-02-23 21:09:53 -04:00
|
|
|
#################################
|
|
|
|
|
# End of user-modifiable configs
|
|
|
|
|
#################################
|
|
|
|
|
|
|
|
|
|
%define name python
|
2008-04-02 20:33:27 -03:00
|
|
|
#--start constants--
|
2008-08-20 23:39:51 -03:00
|
|
|
%define version 3.0b3
|
2008-04-02 20:33:27 -03:00
|
|
|
%define libver 3.0
|
|
|
|
|
#--end constants--
|
2006-04-21 07:40:58 -03:00
|
|
|
%define release 1pydotorg
|
2003-02-23 21:09:53 -04:00
|
|
|
%define __prefix /usr
|
|
|
|
|
|
|
|
|
|
# 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)
|
|
|
|
|
%define include_tkinter %(if [ \\( "%{config_tkinter}" = auto -a -f /usr/bin/wish \\) -o "%{config_tkinter}" = yes ]; then echo 1; else echo 0; fi)
|
2004-10-21 20:35:45 -03:00
|
|
|
%define libdirname %(( uname -m | egrep -q '_64$' && [ -d /usr/lib64 ] && echo lib64 ) || echo lib)
|
2003-02-23 21:09:53 -04:00
|
|
|
|
2003-10-19 15:34:52 -03:00
|
|
|
# detect if documentation is available
|
|
|
|
|
%define include_docs %(if [ -f "%{_sourcedir}/html-%{version}.tar.bz2" ]; then echo 1; else echo 0; fi)
|
|
|
|
|
|
2003-02-23 21:09:53 -04:00
|
|
|
Summary: An interpreted, interactive, object-oriented programming language.
|
|
|
|
|
Name: %{name}%{binsuffix}
|
|
|
|
|
Version: %{version}
|
|
|
|
|
Release: %{release}
|
|
|
|
|
Copyright: Modified CNRI Open Source License
|
|
|
|
|
Group: Development/Languages
|
2004-10-21 20:35:45 -03:00
|
|
|
Source: Python-%{version}.tar.bz2
|
2003-10-19 15:34:52 -03:00
|
|
|
%if %{include_docs}
|
2003-02-23 21:09:53 -04:00
|
|
|
Source1: html-%{version}.tar.bz2
|
2003-10-19 15:34:52 -03:00
|
|
|
%endif
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
2003-02-23 21:09:53 -04:00
|
|
|
BuildPrereq: expat-devel
|
|
|
|
|
BuildPrereq: db4-devel
|
|
|
|
|
BuildPrereq: gdbm-devel
|
2006-04-21 07:40:58 -03:00
|
|
|
BuildPrereq: sqlite-devel
|
2003-02-23 21:09:53 -04:00
|
|
|
Prefix: %{__prefix}
|
|
|
|
|
Packager: Sean Reifschneider <jafo-rpms@tummy.com>
|
|
|
|
|
|
|
|
|
|
%description
|
|
|
|
|
Python is an interpreted, interactive, object-oriented programming
|
|
|
|
|
language. It incorporates modules, exceptions, dynamic typing, very high
|
|
|
|
|
level dynamic data types, and classes. Python combines remarkable power
|
|
|
|
|
with very clear syntax. It has interfaces to many system calls and
|
|
|
|
|
libraries, as well as to various window systems, and is extensible in C or
|
|
|
|
|
C++. It is also usable as an extension language for applications that need
|
|
|
|
|
a programmable interface. Finally, Python is portable: it runs on many
|
|
|
|
|
brands of UNIX, on PCs under Windows, MS-DOS, and OS/2, and on the
|
|
|
|
|
Mac.
|
|
|
|
|
|
|
|
|
|
%package devel
|
|
|
|
|
Summary: The libraries and header files needed for Python extension development.
|
|
|
|
|
Prereq: python%{binsuffix} = %{PACKAGE_VERSION}
|
|
|
|
|
Group: Development/Libraries
|
|
|
|
|
|
|
|
|
|
%description devel
|
|
|
|
|
The Python programming language's interpreter can be extended with
|
|
|
|
|
dynamically loaded extensions and can be embedded in other programs.
|
|
|
|
|
This package contains the header files and libraries needed to do
|
|
|
|
|
these types of tasks.
|
|
|
|
|
|
|
|
|
|
Install python-devel if you want to develop Python extensions. The
|
|
|
|
|
python package will also need to be installed. You'll probably also
|
|
|
|
|
want to install the python-docs package, which contains Python
|
|
|
|
|
documentation.
|
|
|
|
|
|
|
|
|
|
%if %{include_tkinter}
|
|
|
|
|
%package tkinter
|
|
|
|
|
Summary: A graphical user interface for the Python scripting language.
|
|
|
|
|
Group: Development/Languages
|
|
|
|
|
Prereq: python%{binsuffix} = %{PACKAGE_VERSION}-%{release}
|
|
|
|
|
|
|
|
|
|
%description tkinter
|
|
|
|
|
The Tkinter (Tk interface) program is an graphical user interface for
|
|
|
|
|
the Python scripting language.
|
|
|
|
|
|
|
|
|
|
You should install the tkinter package if you'd like to use a graphical
|
|
|
|
|
user interface for Python programming.
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%package tools
|
|
|
|
|
Summary: A collection of development tools included with Python.
|
|
|
|
|
Group: Development/Tools
|
|
|
|
|
Prereq: python%{binsuffix} = %{PACKAGE_VERSION}-%{release}
|
|
|
|
|
|
|
|
|
|
%description tools
|
|
|
|
|
The Python package includes several development tools that are used
|
|
|
|
|
to build python programs. This package contains a selection of those
|
|
|
|
|
tools, including the IDLE Python IDE.
|
|
|
|
|
|
|
|
|
|
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.
|
|
|
|
|
|
2003-10-19 15:34:52 -03:00
|
|
|
%if %{include_docs}
|
2003-02-23 21:09:53 -04:00
|
|
|
%package docs
|
|
|
|
|
Summary: Python-related documentation.
|
|
|
|
|
Group: Development/Documentation
|
|
|
|
|
|
|
|
|
|
%description docs
|
|
|
|
|
Documentation relating to the Python programming language in HTML and info
|
|
|
|
|
formats.
|
2003-10-19 15:34:52 -03:00
|
|
|
%endif
|
2003-02-23 21:09:53 -04:00
|
|
|
|
|
|
|
|
%changelog
|
2004-12-20 22:22:29 -04:00
|
|
|
* Mon Dec 20 2004 Sean Reifschneider <jafo-rpms@tummy.com> [2.4-2pydotorg]
|
|
|
|
|
- Changing the idle wrapper so that it passes arguments to idle.
|
|
|
|
|
|
2004-10-21 20:35:45 -03:00
|
|
|
* Tue Oct 19 2004 Sean Reifschneider <jafo-rpms@tummy.com> [2.4b1-1pydotorg]
|
|
|
|
|
- Updating to 2.4.
|
|
|
|
|
|
|
|
|
|
* Thu Jul 22 2004 Sean Reifschneider <jafo-rpms@tummy.com> [2.3.4-3pydotorg]
|
|
|
|
|
- Paul Tiemann fixes for %{prefix}.
|
|
|
|
|
- Adding permission changes for directory as suggested by reimeika.ca
|
|
|
|
|
- Adding code to detect when it should be using lib64.
|
|
|
|
|
- Adding a define for the location of /var/www/html for docs.
|
|
|
|
|
|
2004-05-31 16:40:57 -03:00
|
|
|
* Thu May 27 2004 Sean Reifschneider <jafo-rpms@tummy.com> [2.3.4-2pydotorg]
|
|
|
|
|
- Including changes from Ian Holsman to build under Red Hat 7.3.
|
|
|
|
|
- Fixing some problems with the /usr/local path change.
|
|
|
|
|
|
2004-05-17 10:17:38 -03:00
|
|
|
* Sat Mar 27 2004 Sean Reifschneider <jafo-rpms@tummy.com> [2.3.2-3pydotorg]
|
2004-03-31 14:59:04 -04:00
|
|
|
- Being more agressive about finding the paths to fix for
|
|
|
|
|
#!/usr/local/bin/python.
|
|
|
|
|
|
2004-02-15 17:27:03 -04:00
|
|
|
* Sat Feb 07 2004 Sean Reifschneider <jafo-rpms@tummy.com> [2.3.3-2pydotorg]
|
|
|
|
|
- Adding code to remove "#!/usr/local/bin/python" from particular files and
|
|
|
|
|
causing the RPM build to terminate if there are any unexpected files
|
|
|
|
|
which have that line in them.
|
|
|
|
|
|
2003-10-19 15:34:52 -03:00
|
|
|
* Mon Oct 13 2003 Sean Reifschneider <jafo-rpms@tummy.com> [2.3.2-1pydotorg]
|
|
|
|
|
- Adding code to detect wether documentation is available to build.
|
|
|
|
|
|
|
|
|
|
* Fri Sep 19 2003 Sean Reifschneider <jafo-rpms@tummy.com> [2.3.1-1pydotorg]
|
|
|
|
|
- Updating to the 2.3.1 release.
|
|
|
|
|
|
2003-02-24 13:55:37 -04:00
|
|
|
* Mon Feb 24 2003 Sean Reifschneider <jafo-rpms@tummy.com> [2.3b1-1pydotorg]
|
|
|
|
|
- Updating to 2.3b1 release.
|
|
|
|
|
|
2003-02-23 21:09:53 -04:00
|
|
|
* Mon Feb 17 2003 Sean Reifschneider <jafo-rpms@tummy.com> [2.3a1-1]
|
|
|
|
|
- Updating to 2.3 release.
|
|
|
|
|
|
|
|
|
|
* Sun Dec 23 2001 Sean Reifschneider <jafo-rpms@tummy.com>
|
|
|
|
|
[Release 2.2-2]
|
|
|
|
|
- Added -docs package.
|
|
|
|
|
- Added "auto" config_tkinter setting which only enables tk if
|
|
|
|
|
/usr/bin/wish exists.
|
|
|
|
|
|
|
|
|
|
* Sat Dec 22 2001 Sean Reifschneider <jafo-rpms@tummy.com>
|
|
|
|
|
[Release 2.2-1]
|
|
|
|
|
- Updated to 2.2.
|
|
|
|
|
- Changed the extension to "2" from "2.2".
|
|
|
|
|
|
|
|
|
|
* Tue Nov 18 2001 Sean Reifschneider <jafo-rpms@tummy.com>
|
|
|
|
|
[Release 2.2c1-1]
|
|
|
|
|
- Updated to 2.2c1.
|
|
|
|
|
|
|
|
|
|
* Thu Nov 1 2001 Sean Reifschneider <jafo-rpms@tummy.com>
|
|
|
|
|
[Release 2.2b1-3]
|
|
|
|
|
- Changed the way the sed for fixing the #! in pydoc works.
|
|
|
|
|
|
|
|
|
|
* Wed Oct 24 2001 Sean Reifschneider <jafo-rpms@tummy.com>
|
|
|
|
|
[Release 2.2b1-2]
|
|
|
|
|
- Fixed missing "email" package, thanks to anonymous report on sourceforge.
|
|
|
|
|
- Fixed missing "compiler" package.
|
|
|
|
|
|
|
|
|
|
* Mon Oct 22 2001 Sean Reifschneider <jafo-rpms@tummy.com>
|
|
|
|
|
[Release 2.2b1-1]
|
|
|
|
|
- Updated to 2.2b1.
|
|
|
|
|
|
|
|
|
|
* Mon Oct 9 2001 Sean Reifschneider <jafo-rpms@tummy.com>
|
|
|
|
|
[Release 2.2a4-4]
|
|
|
|
|
- otto@balinor.mat.unimi.it mentioned that the license file is missing.
|
|
|
|
|
|
|
|
|
|
* Sun Sep 30 2001 Sean Reifschneider <jafo-rpms@tummy.com>
|
|
|
|
|
[Release 2.2a4-3]
|
|
|
|
|
- Ignacio Vazquez-Abrams pointed out that I had a spruious double-quote in
|
|
|
|
|
the spec files. Thanks.
|
|
|
|
|
|
|
|
|
|
* Wed Jul 25 2001 Sean Reifschneider <jafo-rpms@tummy.com>
|
|
|
|
|
[Release 2.2a1-1]
|
|
|
|
|
- Updated to 2.2a1 release.
|
|
|
|
|
- Changed idle and pydoc to use binsuffix macro
|
|
|
|
|
|
|
|
|
|
#######
|
|
|
|
|
# PREP
|
|
|
|
|
#######
|
|
|
|
|
%prep
|
|
|
|
|
%setup -n Python-%{version}
|
|
|
|
|
|
|
|
|
|
########
|
|
|
|
|
# BUILD
|
|
|
|
|
########
|
|
|
|
|
%build
|
2003-10-19 15:34:52 -03:00
|
|
|
./configure --enable-unicode=ucs4 %{ipv6} %{pymalloc} --prefix=%{__prefix}
|
2003-02-23 21:09:53 -04:00
|
|
|
make
|
|
|
|
|
|
|
|
|
|
##########
|
|
|
|
|
# INSTALL
|
|
|
|
|
##########
|
|
|
|
|
%install
|
|
|
|
|
# set the install path
|
|
|
|
|
echo '[install_scripts]' >setup.cfg
|
2004-10-21 20:35:45 -03:00
|
|
|
echo 'install_dir='"${RPM_BUILD_ROOT}%{__prefix}/bin" >>setup.cfg
|
2003-02-23 21:09:53 -04:00
|
|
|
|
|
|
|
|
[ -d "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
|
2004-10-21 20:35:45 -03:00
|
|
|
mkdir -p $RPM_BUILD_ROOT%{__prefix}/%{libdirname}/python%{libvers}/lib-dynload
|
2003-02-23 21:09:53 -04:00
|
|
|
make prefix=$RPM_BUILD_ROOT%{__prefix} install
|
|
|
|
|
|
|
|
|
|
# REPLACE PATH IN PYDOC
|
|
|
|
|
if [ ! -z "%{binsuffix}" ]
|
|
|
|
|
then
|
|
|
|
|
(
|
|
|
|
|
cd $RPM_BUILD_ROOT%{__prefix}/bin
|
|
|
|
|
mv pydoc pydoc.old
|
2004-10-21 20:35:45 -03:00
|
|
|
sed 's|#!.*|#!%{__prefix}/bin/env python'%{binsuffix}'|' \
|
2003-02-23 21:09:53 -04:00
|
|
|
pydoc.old >pydoc
|
|
|
|
|
chmod 755 pydoc
|
|
|
|
|
rm -f pydoc.old
|
|
|
|
|
)
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# add the binsuffix
|
|
|
|
|
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 )
|
|
|
|
|
( cd $RPM_BUILD_ROOT%{__prefix}/bin; mv -f pydoc pydoc"%{binsuffix}" )
|
|
|
|
|
( cd $RPM_BUILD_ROOT%{__prefix}/bin; mv -f idle idle"%{binsuffix}" )
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
########
|
|
|
|
|
# Tools
|
2004-12-20 22:22:29 -04:00
|
|
|
echo '#!%{__prefix}/bin/env python%{binsuffix}' >${RPM_BUILD_ROOT}%{__prefix}/bin/idle%{binsuffix}
|
|
|
|
|
echo 'import os, sys' >>${RPM_BUILD_ROOT}%{__prefix}/bin/idle%{binsuffix}
|
|
|
|
|
echo 'os.execvp("%{__prefix}/bin/python%{binsuffix}", ["%{__prefix}/bin/python%{binsuffix}", "%{__prefix}/lib/python%{libvers}/idlelib/idle.py"] + sys.argv[1:])' >>${RPM_BUILD_ROOT}%{__prefix}/bin/idle%{binsuffix}
|
|
|
|
|
echo 'print "Failed to exec Idle"' >>${RPM_BUILD_ROOT}%{__prefix}/bin/idle%{binsuffix}
|
|
|
|
|
echo 'sys.exit(1)' >>${RPM_BUILD_ROOT}%{__prefix}/bin/idle%{binsuffix}
|
2004-10-21 20:35:45 -03:00
|
|
|
chmod 755 $RPM_BUILD_ROOT%{__prefix}/bin/idle%{binsuffix}
|
|
|
|
|
cp -a Tools $RPM_BUILD_ROOT%{__prefix}/%{libdirname}/python%{libvers}
|
2003-02-23 21:09:53 -04:00
|
|
|
|
|
|
|
|
# MAKE FILE LISTS
|
|
|
|
|
rm -f mainpkg.files
|
2004-10-21 20:35:45 -03:00
|
|
|
find "$RPM_BUILD_ROOT""%{__prefix}"/%{libdirname}/python%{libvers}/lib-dynload -type f |
|
2003-02-23 21:09:53 -04:00
|
|
|
sed "s|^${RPM_BUILD_ROOT}|/|" |
|
|
|
|
|
grep -v -e '_tkinter.so$' >mainpkg.files
|
|
|
|
|
find "$RPM_BUILD_ROOT""%{__prefix}"/bin -type f |
|
|
|
|
|
sed "s|^${RPM_BUILD_ROOT}|/|" |
|
|
|
|
|
grep -v -e '/bin/idle%{binsuffix}$' >>mainpkg.files
|
|
|
|
|
|
|
|
|
|
rm -f tools.files
|
2004-10-21 20:35:45 -03:00
|
|
|
find "$RPM_BUILD_ROOT""%{__prefix}"/%{libdirname}/python%{libvers}/idlelib \
|
|
|
|
|
"$RPM_BUILD_ROOT""%{__prefix}"/%{libdirname}/python%{libvers}/Tools -type f |
|
2003-10-19 15:34:52 -03:00
|
|
|
sed "s|^${RPM_BUILD_ROOT}|/|" >tools.files
|
2003-02-23 21:09:53 -04:00
|
|
|
echo "%{__prefix}"/bin/idle%{binsuffix} >>tools.files
|
|
|
|
|
|
|
|
|
|
######
|
|
|
|
|
# Docs
|
2003-10-19 15:34:52 -03:00
|
|
|
%if %{include_docs}
|
2004-10-21 20:35:45 -03:00
|
|
|
mkdir -p "$RPM_BUILD_ROOT"%{config_htmldir}
|
2003-02-23 21:09:53 -04:00
|
|
|
(
|
2004-10-21 20:35:45 -03:00
|
|
|
cd "$RPM_BUILD_ROOT"%{config_htmldir}
|
2003-02-23 21:09:53 -04:00
|
|
|
bunzip2 < %{SOURCE1} | tar x
|
|
|
|
|
)
|
2003-10-19 15:34:52 -03:00
|
|
|
%endif
|
2003-02-23 21:09:53 -04:00
|
|
|
|
2004-02-15 17:27:03 -04:00
|
|
|
# fix the #! line in installed files
|
2004-05-31 16:40:57 -03:00
|
|
|
find "$RPM_BUILD_ROOT" -type f -print0 |
|
|
|
|
|
xargs -0 grep -l /usr/local/bin/python | while read file
|
2004-02-15 17:27:03 -04:00
|
|
|
do
|
2004-05-31 16:40:57 -03:00
|
|
|
FIXFILE="$file"
|
2004-10-21 20:35:45 -03:00
|
|
|
sed 's|^#!.*python|#!%{__prefix}/bin/env python'"%{binsuffix}"'|' \
|
2004-05-31 16:40:57 -03:00
|
|
|
"$FIXFILE" >/tmp/fix-python-path.$$
|
|
|
|
|
cat /tmp/fix-python-path.$$ >"$FIXFILE"
|
2004-02-15 17:27:03 -04:00
|
|
|
rm -f /tmp/fix-python-path.$$
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
# check to see if there are any straggling #! lines
|
|
|
|
|
find "$RPM_BUILD_ROOT" -type f | xargs egrep -n '^#! */usr/local/bin/python' \
|
|
|
|
|
| grep ':1:#!' >/tmp/python-rpm-files.$$ || true
|
|
|
|
|
if [ -s /tmp/python-rpm-files.$$ ]
|
|
|
|
|
then
|
|
|
|
|
echo '*****************************************************'
|
|
|
|
|
cat /tmp/python-rpm-files.$$
|
|
|
|
|
cat <<@EOF
|
|
|
|
|
*****************************************************
|
|
|
|
|
There are still files referencing /usr/local/bin/python in the
|
|
|
|
|
install directory. They are listed above. Please fix the .spec
|
|
|
|
|
file and try again. If you are an end-user, you probably want
|
|
|
|
|
to report this to jafo-rpms@tummy.com as well.
|
|
|
|
|
*****************************************************
|
|
|
|
|
@EOF
|
|
|
|
|
rm -f /tmp/python-rpm-files.$$
|
|
|
|
|
exit 1
|
|
|
|
|
fi
|
|
|
|
|
rm -f /tmp/python-rpm-files.$$
|
|
|
|
|
|
2003-02-23 21:09:53 -04:00
|
|
|
########
|
|
|
|
|
# CLEAN
|
|
|
|
|
########
|
|
|
|
|
%clean
|
2003-10-19 15:34:52 -03:00
|
|
|
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
|
2003-02-23 21:09:53 -04:00
|
|
|
rm -f mainpkg.files tools.files
|
|
|
|
|
|
|
|
|
|
########
|
|
|
|
|
# FILES
|
|
|
|
|
########
|
|
|
|
|
%files -f mainpkg.files
|
|
|
|
|
%defattr(-,root,root)
|
|
|
|
|
%doc Misc/README Misc/cheatsheet Misc/Porting
|
|
|
|
|
%doc LICENSE Misc/ACKS Misc/HISTORY Misc/NEWS
|
2004-05-31 16:40:57 -03:00
|
|
|
%{__prefix}/man/man1/python%{binsuffix}.1*
|
2003-02-23 21:09:53 -04:00
|
|
|
|
2004-10-21 20:35:45 -03:00
|
|
|
%attr(755,root,root) %dir %{__prefix}/include/python%{libvers}
|
|
|
|
|
%attr(755,root,root) %dir %{__prefix}/%{libdirname}/python%{libvers}/
|
|
|
|
|
%{__prefix}/%{libdirname}/python%{libvers}/*.txt
|
|
|
|
|
%{__prefix}/%{libdirname}/python%{libvers}/*.py*
|
|
|
|
|
%{__prefix}/%{libdirname}/python%{libvers}/pdb.doc
|
|
|
|
|
%{__prefix}/%{libdirname}/python%{libvers}/profile.doc
|
|
|
|
|
%{__prefix}/%{libdirname}/python%{libvers}/curses
|
|
|
|
|
%{__prefix}/%{libdirname}/python%{libvers}/distutils
|
|
|
|
|
%{__prefix}/%{libdirname}/python%{libvers}/encodings
|
|
|
|
|
%{__prefix}/%{libdirname}/python%{libvers}/plat-linux2
|
|
|
|
|
%{__prefix}/%{libdirname}/python%{libvers}/site-packages
|
|
|
|
|
%{__prefix}/%{libdirname}/python%{libvers}/test
|
|
|
|
|
%{__prefix}/%{libdirname}/python%{libvers}/xml
|
|
|
|
|
%{__prefix}/%{libdirname}/python%{libvers}/email
|
2006-04-21 07:40:58 -03:00
|
|
|
%{__prefix}/%{libdirname}/python%{libvers}/email/mime
|
|
|
|
|
%{__prefix}/%{libdirname}/python%{libvers}/sqlite3
|
2004-10-21 20:35:45 -03:00
|
|
|
%{__prefix}/%{libdirname}/python%{libvers}/compiler
|
|
|
|
|
%{__prefix}/%{libdirname}/python%{libvers}/bsddb
|
|
|
|
|
%{__prefix}/%{libdirname}/python%{libvers}/hotshot
|
|
|
|
|
%{__prefix}/%{libdirname}/python%{libvers}/logging
|
|
|
|
|
%{__prefix}/%{libdirname}/python%{libvers}/lib-old
|
2003-02-23 21:09:53 -04:00
|
|
|
|
|
|
|
|
%files devel
|
|
|
|
|
%defattr(-,root,root)
|
|
|
|
|
%{__prefix}/include/python%{libvers}/*.h
|
2004-10-21 20:35:45 -03:00
|
|
|
%{__prefix}/%{libdirname}/python%{libvers}/config
|
2003-02-23 21:09:53 -04:00
|
|
|
|
|
|
|
|
%files -f tools.files tools
|
|
|
|
|
%defattr(-,root,root)
|
|
|
|
|
|
|
|
|
|
%if %{include_tkinter}
|
|
|
|
|
%files tkinter
|
|
|
|
|
%defattr(-,root,root)
|
2008-05-17 16:15:58 -03:00
|
|
|
%{__prefix}/%{libdirname}/python%{libvers}/tkinter
|
2004-10-21 20:35:45 -03:00
|
|
|
%{__prefix}/%{libdirname}/python%{libvers}/lib-dynload/_tkinter.so*
|
2003-02-23 21:09:53 -04:00
|
|
|
%endif
|
|
|
|
|
|
2003-10-19 15:34:52 -03:00
|
|
|
%if %{include_docs}
|
2003-02-23 21:09:53 -04:00
|
|
|
%files docs
|
|
|
|
|
%defattr(-,root,root)
|
2004-10-21 20:35:45 -03:00
|
|
|
%{config_htmldir}/*
|
2003-10-19 15:34:52 -03:00
|
|
|
%endif
|
