rpms/python/FC-6 python-2.4.4-lib64.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 python.spec, 1.90, 1.91 sources, 1.14, 1.15 python-2.4.1-lib64.patch, 1.2, NONE python-2.4.3-unicodeobject.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Oct 23 17:54:19 UTC 2006
- Previous message (by thread): rpms/gstreamer-plugins-base/devel .cvsignore, 1.6, 1.7 gstreamer-plugins-base.spec, 1.18, 1.19 sources, 1.7, 1.8
- Next message (by thread): rpms/python/devel python-2.4.4-lib64.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 python.spec, 1.90, 1.91 sources, 1.14, 1.15 python-2.4.1-lib64.patch, 1.2, NONE python-2.4.3-unicodeobject.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: katzj
Update of /cvs/dist/rpms/python/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv27244
Modified Files:
.cvsignore python.spec sources
Added Files:
python-2.4.4-lib64.patch
Removed Files:
python-2.4.1-lib64.patch python-2.4.3-unicodeobject.patch
Log Message:
* Mon Oct 23 2006 Jeremy Katz <katzj at redhat.com> - 2.4.4-1
- update to 2.4.4
python-2.4.4-lib64.patch:
Lib/distutils/command/install.py | 4 ++--
Lib/distutils/sysconfig.py | 6 +++++-
Lib/site.py | 7 ++++++-
Makefile.pre.in | 4 ++--
Modules/Setup.dist | 4 ++--
Modules/getpath.c | 10 +++++-----
setup.py | 10 +++++-----
7 files changed, 27 insertions(+), 18 deletions(-)
--- NEW FILE python-2.4.4-lib64.patch ---
--- Python-2.4.4/setup.py.lib64 2006-10-08 13:41:25.000000000 -0400
+++ Python-2.4.4/setup.py 2006-10-23 13:23:14.000000000 -0400
@@ -240,7 +240,7 @@
def detect_modules(self):
# Ensure that /usr/local is always used
- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
+ add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
# Add paths to popular package managers on OS X/darwin
@@ -450,7 +450,7 @@
elif self.compiler.find_library_file(lib_dirs, 'curses'):
readline_libs.append('curses')
elif self.compiler.find_library_file(lib_dirs +
- ['/usr/lib/termcap'],
+ ['/usr/lib64/termcap'],
'termcap'):
readline_libs.append('termcap')
@@ -465,7 +465,7 @@
readline_extra_link_args = ()
exts.append( Extension('readline', ['readline.c'],
- library_dirs=['/usr/lib/termcap'],
+ library_dirs=['/usr/lib64/termcap'],
extra_link_args=readline_extra_link_args,
libraries=readline_libs) )
if platform not in ['mac']:
@@ -495,8 +495,8 @@
if krb5_h:
ssl_incs += krb5_h
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
- ['/usr/local/ssl/lib',
- '/usr/contrib/ssl/lib/'
+ ['/usr/local/ssl/lib64',
+ '/usr/contrib/ssl/lib64/'
] )
if (ssl_incs is not None and
--- Python-2.4.4/Modules/getpath.c.lib64 2006-02-20 12:37:39.000000000 -0500
+++ Python-2.4.4/Modules/getpath.c 2006-10-23 13:21:40.000000000 -0400
@@ -112,8 +112,8 @@
#endif
#ifndef PYTHONPATH
-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
+#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \
+ EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload"
#endif
#ifndef LANDMARK
@@ -124,7 +124,7 @@
static char exec_prefix[MAXPATHLEN+1];
static char progpath[MAXPATHLEN+1];
static char *module_search_path = NULL;
-static char lib_python[] = "lib/python" VERSION;
+static char lib_python[] = "lib64/python" VERSION;
static void
reduce(char *dir)
@@ -519,7 +519,7 @@
}
else
strncpy(zip_path, PREFIX, MAXPATHLEN);
- joinpath(zip_path, "lib/python00.zip");
+ joinpath(zip_path, "lib64/python00.zip");
bufsz = strlen(zip_path); /* Replace "00" with version */
zip_path[bufsz - 6] = VERSION[0];
zip_path[bufsz - 5] = VERSION[2];
@@ -529,7 +529,7 @@
fprintf(stderr,
"Could not find platform dependent libraries <exec_prefix>\n");
strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN);
- joinpath(exec_prefix, "lib/lib-dynload");
+ joinpath(exec_prefix, "lib64/lib-dynload");
}
/* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */
--- Python-2.4.4/Modules/Setup.dist.lib64 2006-10-23 13:21:40.000000000 -0400
+++ Python-2.4.4/Modules/Setup.dist 2006-10-23 13:21:40.000000000 -0400
@@ -400,7 +400,7 @@
# and the subdirectory of PORT where you built it.
DBLIBVER=4.3
DBINC=/usr/include/db4
-DBLIB=/usr/lib
+DBLIB=/usr/lib64
_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
# Historical Berkeley DB 1.85
@@ -446,7 +446,7 @@
# Andrew Kuchling's zlib module.
# This require zlib 1.1.3 (or later).
# See http://www.gzip.org/zlib/
-zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
+zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz
# Interface to the Expat XML parser
#
--- Python-2.4.4/Makefile.pre.in.lib64 2006-10-08 13:41:25.000000000 -0400
+++ Python-2.4.4/Makefile.pre.in 2006-10-23 13:21:40.000000000 -0400
@@ -79,11 +79,11 @@
# Expanded directories
BINDIR= $(exec_prefix)/bin
-LIBDIR= $(exec_prefix)/lib
+LIBDIR= $(exec_prefix)/lib64
MANDIR= @mandir@
INCLUDEDIR= @includedir@
CONFINCLUDEDIR= $(exec_prefix)/include
-SCRIPTDIR= $(prefix)/lib
+SCRIPTDIR= $(prefix)/lib64
# Detailed destination directories
BINLIBDEST= $(LIBDIR)/python$(VERSION)
--- Python-2.4.4/Lib/distutils/command/install.py.lib64 2005-01-20 14:15:39.000000000 -0500
+++ Python-2.4.4/Lib/distutils/command/install.py 2006-10-23 13:21:40.000000000 -0400
@@ -39,14 +39,14 @@
INSTALL_SCHEMES = {
'unix_prefix': {
'purelib': '$base/lib/python$py_version_short/site-packages',
- 'platlib': '$platbase/lib/python$py_version_short/site-packages',
+ 'platlib': '$platbase/lib64/python$py_version_short/site-packages',
'headers': '$base/include/python$py_version_short/$dist_name',
'scripts': '$base/bin',
'data' : '$base',
},
'unix_home': {
'purelib': '$base/lib/python',
- 'platlib': '$base/lib/python',
+ 'platlib': '$base/lib64/python',
'headers': '$base/include/python/$dist_name',
'scripts': '$base/bin',
'data' : '$base',
--- Python-2.4.4/Lib/distutils/sysconfig.py.lib64 2006-10-08 13:41:25.000000000 -0400
+++ Python-2.4.4/Lib/distutils/sysconfig.py 2006-10-23 13:21:40.000000000 -0400
@@ -99,8 +99,12 @@
prefix = plat_specific and EXEC_PREFIX or PREFIX
if os.name == "posix":
+ if plat_specific or standard_lib:
+ lib = "lib64"
+ else:
+ lib = "lib"
libpython = os.path.join(prefix,
- "lib", "python" + get_python_version())
+ lib, "python" + get_python_version())
if standard_lib:
return libpython
else:
--- Python-2.4.4/Lib/site.py.lib64 2004-07-19 22:28:28.000000000 -0400
+++ Python-2.4.4/Lib/site.py 2006-10-23 13:21:40.000000000 -0400
@@ -179,9 +179,14 @@
sitedirs = [os.path.join(prefix, "Lib", "site-packages")]
elif os.sep == '/':
sitedirs = [os.path.join(prefix,
- "lib",
+ "lib64",
"python" + sys.version[:3],
"site-packages"),
+ os.path.join(prefix,
+ "lib",
+ "python" + sys.version[:3],
+ "site-packages"),
+ os.path.join(prefix, "lib64", "site-python"),
os.path.join(prefix, "lib", "site-python")]
else:
sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")]
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/python/FC-6/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 8 Apr 2006 03:25:35 -0000 1.14
+++ .cvsignore 23 Oct 2006 17:54:17 -0000 1.15
@@ -2,3 +2,4 @@
JapaneseCodecs-1.4.11.tar.gz
Python-2.4.2.tar.bz2
Python-2.4.3.tar.bz2
+Python-2.4.4.tar.bz2
Index: python.spec
===================================================================
RCS file: /cvs/dist/rpms/python/FC-6/python.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- python.spec 1 Oct 2006 21:18:20 -0000 1.90
+++ python.spec 23 Oct 2006 17:54:17 -0000 1.91
@@ -19,8 +19,8 @@
Summary: An interpreted, interactive, object-oriented programming language.
Name: %{python}
-Version: %{pybasever}.3
-Release: 18%{?dist}
+Version: %{pybasever}.4
+Release: 1%{?dist}
License: PSF - see LICENSE
Group: Development/Languages
Provides: python-abi = %{pybasever}
@@ -36,7 +36,7 @@
Patch0: python-2.4.3-config.patch
Patch3: Python-2.2.1-pydocnogui.patch
Patch7: python-2.3.4-lib64-regex.patch
-Patch8: python-2.4.1-lib64.patch
+Patch8: python-2.4.4-lib64.patch
Patch9: japanese-codecs-lib64.patch
Patch13: python-2.4-distutils-bdist-rpm.patch
Patch14: python-2.3.4-pydocnodoc.patch
@@ -45,7 +45,6 @@
Patch17: python-2.4-webbrowser.patch
Patch18: python-2.4.3-cflags.patch
Patch19: python-2.4.3-locale.patch
-Patch20: python-2.4.3-unicodeobject.patch
%if %{main_python}
Obsoletes: Distutils
@@ -155,7 +154,6 @@
%patch17 -p0 -b .web-browser
%patch18 -p1 -b .cflags
%patch19 -p2 -b .locale
-%patch20 -p3 -b .unicode-repr
# This shouldn't be necesarry, but is right now (2.2a3)
find -name "*~" |xargs rm -f
@@ -401,6 +399,9 @@
%{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
%changelog
+* Mon Oct 23 2006 Jeremy Katz <katzj at redhat.com> - 2.4.4-1
+- update to 2.4.4
+
* Sun Oct 01 2006 Jesse Keating <jkeating at redhat.com> - 2.4.3-18
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/python/FC-6/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 8 Apr 2006 03:25:35 -0000 1.14
+++ sources 23 Oct 2006 17:54:17 -0000 1.15
@@ -1,2 +1,3 @@
e4f2ed866f4ce978fb54bb962eab4fdf JapaneseCodecs-1.4.11.tar.gz
141c683447d5e76be1d2bd4829574f02 Python-2.4.3.tar.bz2
+0ba90c79175c017101100ebf5978e906 Python-2.4.4.tar.bz2
--- python-2.4.1-lib64.patch DELETED ---
--- python-2.4.3-unicodeobject.patch DELETED ---
- Previous message (by thread): rpms/gstreamer-plugins-base/devel .cvsignore, 1.6, 1.7 gstreamer-plugins-base.spec, 1.18, 1.19 sources, 1.7, 1.8
- Next message (by thread): rpms/python/devel python-2.4.4-lib64.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 python.spec, 1.90, 1.91 sources, 1.14, 1.15 python-2.4.1-lib64.patch, 1.2, NONE python-2.4.3-unicodeobject.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list