more build and distrib stuff

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

wxPython/distrib/wxPython.spec

@@ -1,5 +1,5 @@
 %define pref /usr
-%define ver 2.1.15
+%define ver 2.1.16
 %define rpmver 1
 
 Summary: Cross platform GUI toolkit for use with the Python language.
@@ -12,7 +12,7 @@ Source: wxPython-%{ver}.tar.gz
 Packager: Robin Dunn <robin@alldunn.com>
 URL:http://alldunn.com/wxPython/index.html
 Vendor: Total Control Software
-Requires: python >= 1.5.1
+Requires: python >= 1.5.2
 ##BuildRoot: /tmp/wxPython-build
 ##Prefix: /usr/lib/python1.5/site-packages
 
@@ -24,6 +24,17 @@ wxWindows C++ GUI library.  wxPython provides a large variety of
 window types and controls, all imlemented with a native look and
 feel (and runtime speed) on the platforms it is supported on.
 
+
+%package gl
+Summary: Cross platform GUI toolkit for use with the Python language, OpenGL addon.
+Group: Development/Languages/Python
+Requires: wxPython
+
+%description gl
+OpenGL add on for wxPython.
+
+#----------------------------------------------------------------------
+
 %prep
 
 %setup
@@ -31,10 +42,6 @@ feel (and runtime speed) on the platforms it is supported on.
 %build
 cd src
 python ../distrib/build.py -b WXPSRCDIR=$PWD
-cd ../modules/html
-python ../../distrib/build.py -b WXPSRCDIR=../../src
-cd ../utils
-python ../../distrib/build.py -b WXPSRCDIR=../../src
 cd ../ogl
 python ../../distrib/build.py -b WXPSRCDIR=../../src
 cd ../stc
@@ -44,13 +51,11 @@ if [ ! -z $NOGLCANVAS ]; then
     python ../../distrib/build.py -b WXPSRCDIR=../../src
 fi
 
+#----------------------------------------------------------------------
+
 %install
 cd src
 python ../distrib/build.py -i
-cd ../modules/html
-python ../../distrib/build.py -i
-cd ../utils
-python ../../distrib/build.py -i
 cd ../ogl
 python ../../distrib/build.py -i
 cd ../stc
@@ -60,6 +65,7 @@ if [ ! -z $NOGLCANVAS ]; then
     python ../../distrib/build.py -i
 fi
 
+#----------------------------------------------------------------------
 
 %post
 /sbin/ldconfig
@@ -67,10 +73,24 @@ fi
 %postun
 /sbin/ldconfig
 
+#----------------------------------------------------------------------
+
 %files
 %doc BUILD.txt CHANGES.txt README.txt gpl.txt lgpl.txt licence.txt licendoc.txt preamble.txt
 %{pref}/lib/libwxPyHelpers.so
-%{pref}/lib/python1.5/site-packages/wxPython
+%{pref}/lib/python1.5/site-packages/wxPython/*.py
+%{pref}/lib/python1.5/site-packages/wxPython/*.py?
+%{pref}/lib/python1.5/site-packages/wxPython/lib
+%{pref}/lib/python1.5/site-packages/wxPython/wxcmodule.so
+%{pref}/lib/python1.5/site-packages/wxPython/oglcmodule.so
+%{pref}/lib/python1.5/site-packages/wxPython/stc_cmodule.so
+
+%files gl
+%{pref}/lib/python1.5/site-packages/wxPython/glcanvascmodule.so
+
+
+
+