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 38bc7f388b32e497076fc25aa6d38301e94146ec..767f09982eca0db19203037e59e5f4b9253de066 100755 (executable)
--- 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
 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 3ae03f0bda1d17a5d8b3290b52465e3b94d172d2..bf6e6ce26fdf38a87237129938c60ff3f04c5814 100644 (file)
--- 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/*.py
 wxPython/lib/*.txt

+wxPython/lib/sizers/*.py
+wxPython/lib/sizers/*.txt

 
 
 wxPython/src/*.i
 
 
 wxPython/src/*.i


@@ -31,7 +33,7 @@ wxPython/src/gtk/*.cpp
 wxPython/src/gtk/*.h
 wxPython/src/gtk/*.py
 
 wxPython/src/gtk/*.h
 wxPython/src/gtk/*.py
 

-wxPython/src/motif/*.cpp
+wxpython/src/motif/*.cpp

 wxPython/src/motif/*.h
 wxPython/src/motif/*.py
 
 wxPython/src/motif/*.h
 wxPython/src/motif/*.py
 


@@ -40,5 +42,3 @@ wxPython/src/qt/*.h
 wxPython/src/qt/*.py
 
 wxPython/SWIG.patches/*.patch
 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 c4391676747fcc63be16401608ce9ae1c10be29d..2ab380fffea8bce16bbd1005dd07de02267e5cfa 100644 (file)
--- 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__
 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
 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
 #make install
 
 %files

-%doc ../README.txt
+%doc /usr/doc/wxPython-__VERSION__/README.txt

 /usr/lib/python1.5/site-packages/wxPython
 
 /usr/lib/python1.5/site-packages/wxPython
 

diff --git a/utils/wxPython/src/Makefile.pre.in b/utils/wxPython/src/Makefile.pre.in
index affb0aef1bd69aff22712c4f20acd3964f2aa8f0..9fdee4768a019c60f45c8ac8821e58ace94ea222 100644 (file)
--- 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
        -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);      \
        fi
        if [ "$(TARGETDIR)" != ".." ]; then      \
                python $(LIBDEST)/compileall.py $(TARGETDIR);      \