From: Robin Dunn <robin@alldunn.com>
Date: Wed, 23 Jun 1999 05:28:10 +0000 (+0000)
Subject: Updates to the wxPython distribution builders
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2d9f55970b235a2d9d4957c7cbd8e84c20c2665b?ds=sidebyside;hp=f96b60aa86807f84399dce2fec7d4b68832182d8

Updates to the wxPython distribution builders


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/utils/wxPython/distrib/makerpm b/utils/wxPython/distrib/makerpm
index 38bc7f388b..767f09982e 100755
--- a/utils/wxPython/distrib/makerpm
+++ b/utils/wxPython/distrib/makerpm
@@ -12,11 +12,15 @@ fi
 
 
 
-mkdir i386
 strip /usr/lib/python1.5/site-packages/wxPython/wxcmodule.so
 
 cat wxPython.spec.in | sed s/__VERSION__/$1/g > wxPython.spec
-rpm --rcfile .rpmrc -bb wxPython.spec
 
-mv i386/*.rpm .
-rm -rf i386
+mkdir /usr/doc/wxPython-$1
+cp ../README.txt /usr/doc/wxPython-$1
+
+rpm -bb wxPython.spec
+
+mv /usr/src/redhat/RPMS/*/wxPython*.rpm .
+
+rm -r /usr/doc/wxPython-$1
\ No newline at end of file
diff --git a/utils/wxPython/distrib/wxPython.rsp b/utils/wxPython/distrib/wxPython.rsp
index 3ae03f0bda..bf6e6ce26f 100644
--- a/utils/wxPython/distrib/wxPython.rsp
+++ b/utils/wxPython/distrib/wxPython.rsp
@@ -10,6 +10,8 @@ wxPython/demo/README.txt
 
 wxPython/lib/*.py
 wxPython/lib/*.txt
+wxPython/lib/sizers/*.py
+wxPython/lib/sizers/*.txt
 
 
 wxPython/src/*.i
@@ -31,7 +33,7 @@ wxPython/src/gtk/*.cpp
 wxPython/src/gtk/*.h
 wxPython/src/gtk/*.py
 
-wxPython/src/motif/*.cpp
+wxpython/src/motif/*.cpp
 wxPython/src/motif/*.h
 wxPython/src/motif/*.py
 
@@ -40,5 +42,3 @@ wxPython/src/qt/*.h
 wxPython/src/qt/*.py
 
 wxPython/SWIG.patches/*.patch
-
-
diff --git a/utils/wxPython/distrib/wxPython.spec.in b/utils/wxPython/distrib/wxPython.spec.in
index c439167674..2ab380fffe 100644
--- a/utils/wxPython/distrib/wxPython.spec.in
+++ b/utils/wxPython/distrib/wxPython.spec.in
@@ -1,7 +1,7 @@
 Summary: Cross platform GUI toolkit for use with the Python language.
 Name: wxPython
 Version: __VERSION__
-Release: 3
+Release: 1
 Copyright: wxWindows
 Group: Development/Languages/Python
 Source: http://alldunn.com/wxPython/wxPython-__VERSION__.tar.gz
@@ -36,6 +36,6 @@ extension language for applications that need a programmable interface.
 #make install
 
 %files
-%doc ../README.txt
+%doc /usr/doc/wxPython-__VERSION__/README.txt
 /usr/lib/python1.5/site-packages/wxPython
 
diff --git a/utils/wxPython/src/Makefile.pre.in b/utils/wxPython/src/Makefile.pre.in
index affb0aef1b..9fdee4768a 100644
--- a/utils/wxPython/src/Makefile.pre.in
+++ b/utils/wxPython/src/Makefile.pre.in
@@ -390,13 +390,18 @@ wxInstall :	sharedmods $(PYMODULES)
 	-for i in $(PYMODULES); do \
 		cp $$i $(TARGETDIR); \
 	done
-	if [ "$(TARGETDIR)" != ".." ]; then        \
-		mkdir $(TARGETDIR)/lib;            \
-		mkdir $(TARGETDIR)/demo;           \
-		cp ../lib/*.py $(TARGETDIR)/lib;   \
-		cp ../demo/*.py $(TARGETDIR)/demo; \
-		cp ../lib/*.txt $(TARGETDIR)/lib;  \
-		cp ../demo/*.txt $(TARGETDIR)/demo;\
+	if [ "$(TARGETDIR)" != ".." ]; then        		\
+		mkdir $(TARGETDIR)/lib;            		\
+		mkdir $(TARGETDIR)/lib/sizers;     		\
+		mkdir $(TARGETDIR)/demo;           		\
+		mkdir $(TARGETDIR)/demo/bitmaps;      		\
+		cp ../lib/*.py $(TARGETDIR)/lib;   		\
+		cp ../lib/sizers/*.py $(TARGETDIR)/lib/sizers;	\
+		cp ../demo/*.py $(TARGETDIR)/demo; 		\
+		cp ../lib/*.txt $(TARGETDIR)/lib;  		\
+		cp ../lib/sizers/*.txt $(TARGETDIR)/lib/sizers;	\
+		cp ../demo/*.txt $(TARGETDIR)/demo;		\
+		cp ../demo/bitmaps/[a-z]* $(TARGETDIR)/demo/bitmaps;	\
 	fi
 	if [ "$(TARGETDIR)" != ".." ]; then      \
 		python $(LIBDEST)/compileall.py $(TARGETDIR);      \