[Commits] (davids) p4 changes.

[commits at osafoundation.org]

Commit by: davids
Modified files:
internal/wxPython-2.5/wxPython/distrib/DIRLIST 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/wxPython/distrib/make_installer.py 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/wxPython/distrib/wxPythonFull.spec.in 2.1.5.1.4.1 2.1.5.1.4.2
internal/wxPython-2.5/wxPython/distrib/msw/MSVCIRT.DLL None 1.1.2.1
internal/wxPython-2.5/wxPython/distrib/msw/MSVCP60.DLL None 1.1.2.1
internal/wxPython-2.5/wxPython/distrib/msw/MSVCRT.DLL None 1.1.2.1
internal/wxPython-2.5/wxPython/distrib/msw/unicows.dll None 1.1.2.1

Log message:
p4 changes.

ViewCVS links:
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/wxPython/distrib/DIRLIST.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/wxPython/distrib/make_installer.py.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/wxPython/distrib/wxPythonFull.spec.in.diff?r1=text&tr1=2.1.5.1.4.1&r2=text&tr2=2.1.5.1.4.2
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/wxPython/distrib/msw/MSVCIRT.DLL?rev=1.1.2.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/wxPython/distrib/msw/MSVCP60.DLL?rev=1.1.2.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/wxPython/distrib/msw/MSVCRT.DLL?rev=1.1.2.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/wxPython-2.5/wxPython/distrib/msw/unicows.dll?rev=1.1.2.1&content-type=text/vnd.viewcvs-markup

Index: internal/wxPython-2.5/wxPython/distrib/DIRLIST
diff -u internal/wxPython-2.5/wxPython/distrib/DIRLIST:2.1.5.1.4.1 internal/wxPython-2.5/wxPython/distrib/DIRLIST:2.1.5.1.4.2
--- internal/wxPython-2.5/wxPython/distrib/DIRLIST:2.1.5.1.4.1	Mon Sep 13 19:12:03 2004
+++ internal/wxPython-2.5/wxPython/distrib/DIRLIST	Tue Sep 14 18:12:31 2004
@@ -51,8 +51,6 @@
 wxPython/distrib/mac/wxPythonOSX
 wxPython/distrib/mac/wxPythonOSX/resources
 wxPython/distrib/msw
-wxPython/distutils
-wxPython/distutils/command
 wxPython/docs
 wxPython/docs/bin
 wxPython/docs/screenshots

Index: internal/wxPython-2.5/wxPython/distrib/make_installer.py
diff -u internal/wxPython-2.5/wxPython/distrib/make_installer.py:2.1.5.1.4.1 internal/wxPython-2.5/wxPython/distrib/make_installer.py:2.1.5.1.4.2
--- internal/wxPython-2.5/wxPython/distrib/make_installer.py:2.1.5.1.4.1	Mon Sep 13 19:12:03 2004
+++ internal/wxPython-2.5/wxPython/distrib/make_installer.py	Tue Sep 14 18:12:31 2004
@@ -6,7 +6,7 @@
 # Author:      Robin Dunn
 #
 # Created:     30-April-2001
-# RCS-ID:      $Id: make_installer.py,v 2.1.5.1.4.1 2004/09/14 02:12:03 heikki Exp $
+# RCS-ID:      $Id: make_installer.py,v 2.1.5.1.4.2 2004/09/15 01:12:31 davids Exp $
 # Copyright:   (c) 2003 by Total Control Software
 # Licence:     wxWindows license
 #----------------------------------------------------------------------

Index: internal/wxPython-2.5/wxPython/distrib/wxPythonFull.spec.in
diff -u internal/wxPython-2.5/wxPython/distrib/wxPythonFull.spec.in:2.1.5.1.4.1 internal/wxPython-2.5/wxPython/distrib/wxPythonFull.spec.in:2.1.5.1.4.2
--- internal/wxPython-2.5/wxPython/distrib/wxPythonFull.spec.in:2.1.5.1.4.1	Mon Sep 13 19:12:03 2004
+++ internal/wxPython-2.5/wxPython/distrib/wxPythonFull.spec.in	Tue Sep 14 18:12:31 2004
@@ -232,7 +232,7 @@
 install -m 644 wx/tools/XRCed/XRCed_32.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/XRCed.png
 
 # install Mandrake menu
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/menu
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/menu
 cat > $RPM_BUILD_ROOT%{_libdir}/menu/%{name} <<EOF
 ?package(%{name}): \\
 	command="%{_bindir}/pyshell" \\
@@ -300,7 +300,7 @@
 %doc docs/preamble.txt docs/licence.txt docs/lgpl.txt docs/readme.txt docs/changes.txt
 %doc wxPython/docs/*
 %{_bindir}/*
-%{_libdir}/python%{pyver}/site-packages/*
+%{pref}/lib*/python%{pyver}/site-packages/*
 %dir %{wxpref}
 %dir %{wxpref}/lib
 %{wxpref}/lib/libwx*