From c4ad8c9c3a0ec554a37c129055a78967c1876c35 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Tue, 25 Apr 2000 17:57:29 +0000
Subject: [PATCH] Some final tweaks prior to release

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 utils/wxPython/distrib/makerpm       | 44 +++++++++++++++++-----------
 utils/wxPython/distrib/wxPython.spec | 12 ++++----
 2 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/utils/wxPython/distrib/makerpm b/utils/wxPython/distrib/makerpm
index c17bcf73e9..80b60d0cf9 100755
--- a/utils/wxPython/distrib/makerpm
+++ b/utils/wxPython/distrib/makerpm
@@ -5,29 +5,39 @@ if [ -z $1 ]; then
     exit 1
 fi
 
-if [ ! -f wxPython.spec.in ]; then
-    echo "Please run this script from the directory containing the wxPython.spec.in file."
+if [ ! -f wxPython.spec ]; then
+    echo "Please run this script from the directory containing the wxPython.spec file."
     exit 1
 fi
 
 
 
-strip /usr/lib/python1.5/site-packages/wxPython/*.so
-strip /usr/lib/libwxPyHelpers.so
+#strip /usr/lib/python1.5/site-packages/wxPython/*.so
+#strip /usr/lib/libwxPyHelpers.so
+#
+#cat wxPython.spec.in | sed s/__VERSION__/$1/g > wxPython.spec
+#
+#mkdir /usr/doc/wxPython-$1
+#cp ../README.txt /usr/doc/wxPython-$1
+#cp ../../../docs/preamble.txt /usr/doc/wxPython-$1
+#cp ../../../docs/licence.txt /usr/doc/wxPython-$1
+#cp ../../../docs/licendoc.txt /usr/doc/wxPython-$1
+#cp ../../../docs/lgpl.txt /usr/doc/wxPython-$1
+#cp ../../../docs/gpl.txt /usr/doc/wxPython-$1
+#
+#rpm -bb wxPython.spec
+#
+#mv /usr/src/redhat/RPMS/*/wxPython*.rpm .
+#chown rd:users wxPython*.rpm
+#
+#rm -r /usr/doc/wxPython-$1
 
-cat wxPython.spec.in | sed s/__VERSION__/$1/g > wxPython.spec
-
-mkdir /usr/doc/wxPython-$1
-cp ../README.txt /usr/doc/wxPython-$1
-cp ../../../docs/preamble.txt /usr/doc/wxPython-$1
-cp ../../../docs/licence.txt /usr/doc/wxPython-$1
-cp ../../../docs/licendoc.txt /usr/doc/wxPython-$1
-cp ../../../docs/lgpl.txt /usr/doc/wxPython-$1
-cp ../../../docs/gpl.txt /usr/doc/wxPython-$1
-
-rpm -bb wxPython.spec
+cp -f  wxPython-$1.tar.gz /usr/src/redhat/SOURCES
+rpm -ba wxPython.spec
 
 mv /usr/src/redhat/RPMS/*/wxPython*.rpm .
+mv /usr/src/redhat/SRPMS/wxPython*.rpm .
 chown rd:users wxPython*.rpm
-
-rm -r /usr/doc/wxPython-$1
\ No newline at end of file
+rm -rf /usr/lib/python1.5/site-packages/wxPython/
+rm -f /usr/lib/libwxPyHelpers.so
+rm -rf rm -rf /usr/doc/wxPython-$1
diff --git a/utils/wxPython/distrib/wxPython.spec b/utils/wxPython/distrib/wxPython.spec
index baa0607837..cf2d735ba5 100644
--- a/utils/wxPython/distrib/wxPython.spec
+++ b/utils/wxPython/distrib/wxPython.spec
@@ -30,17 +30,17 @@ feel (and runtime speed) on the platforms it is supported on.
 
 %build
 cd src
-python ../distrib/build.py -b
+python ../distrib/build.py -b WXPSRCDIR=$PWD
 cd ../modules/html
-python ../../distrib/build.py -b
+python ../../distrib/build.py -b WXPSRCDIR=../../src
 cd ../utils
-python ../../distrib/build.py -b
+python ../../distrib/build.py -b WXPSRCDIR=../../src
 cd ../glcanvas
-python ../../distrib/build.py -b
+python ../../distrib/build.py -b WXPSRCDIR=../../src
 cd ../ogl
-python ../../distrib/build.py -b
+python ../../distrib/build.py -b WXPSRCDIR=../../src
 cd ../stc
-python ../../distrib/build.py -b
+python ../../distrib/build.py -b WXPSRCDIR=../../src
 
 
 %install