wxPython distrib changes

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

Makefile.in

@@ -1450,19 +1450,22 @@ PYTHON_DIST:
 		wxPython/demo/bmp_source \
 		wxPython/demo/data \
 		wxPython/demo/dllwidget \
+		wxPython/distrib \
+		wxPython/distutils \
+		wxPython/distutils/command \
+		wxPython/docs \
+		wxPython/docs/screenshots \
 		wxPython/samples/StyleEditor \
 		wxPython/samples/doodle \
 		wxPython/samples/embedded \
 		wxPython/samples/frogedit \
+		wxPython/samples/hangman \
 		wxPython/samples/pySketch \
 		wxPython/samples/pySketch/images \
 		wxPython/samples/wxProject \
 		wxPython/samples/wx_examples \
 		wxPython/samples/wx_examples/basic \
 		wxPython/samples/wx_examples/hello \
-		wxPython/samples/wx_examples/screenshots \
-		wxPython/distutils \
-		wxPython/distutils/command \
 		wxPython/scripts \
 		wxPython/src \
 		wxPython/src/gtk \
@@ -1472,6 +1475,8 @@ PYTHON_DIST:
 		wxPython/wx/lib/editor \
 		wxPython/wx/lib/mixins \
 		wxPython/wx/py \
+		wxPython/wx/tools \
+		wxPython/wx/tools/XRCed \
 		wxPython/wxPython \
 		wxPython/wxPython/lib \
 		wxPython/wxPython/lib/PyCrust \

wxPython/distrib/makerpm

@@ -136,14 +136,16 @@ if [ -z "${skipcopy}" ]; then
     cp -pf --link ${wxdir}/* ${tarver} > /dev/null 2>&1
 
     # copy all top dirs except CVS, build, demos, utils, samples, and wxPython
-    for d in art contrib debian distrib docs include lib locale misc src; do
+    for d in art contrib debian distrib docs include lib locale misc patches src; do
-	cp -Rpf --link ${wxdir}/$d ${tarver} #> /dev/null 2>&1
+	if [ -e ${wxdir}/$d ]; then
+	    cp -Rpf --link ${wxdir}/$d ${tarver} #> /dev/null 2>&1
+	fi
     done
 
     # now do the same thing for wxPython, skipping it's build dirs and such
     mkdir ${tarver}/wxPython
     cp -pf --link ${wxdir}/wxPython/* ${tarver}/wxPython > /dev/null 2>&1
-    for d in contrib demo distrib distutils samples scripts src wxPython; do
+    for d in contrib demo distrib distutils docs licence samples scripts src wx wxPython; do
 	cp -Rpf --link ${wxdir}/wxPython/$d ${tarver}/wxPython #> /dev/null 2>&1
     done
 

wxPython/distrib/wxPythonFull.spec.in

@@ -28,8 +28,12 @@
 # build the name of the real wx-config from the port, flags, etc.
 %define dbgflg %(if [ "%{debug_flag}" = "1" ]; then echo d; fi)
 %define uniflg %(if [ "%{unicode}" = "1" ]; then echo u; fi)
+%define DBGFLG %(if [ "%{debug_flag}" = "1" ]; then echo D; fi)
+%define UNIFLG %(if [ "%{unicode}" = "1" ]; then echo U; fi)
 %define wxconfigname %{wxpref}/bin/wx%{lcport}%{uniflg}%{dbgflg}-%{ver2}-config
 
+# turn off the generation of debuginfo rpm  (RH9)
+%define debug_package %{nil}
 
 #----------------------------------------------------------------
 Summary:   Cross platform GUI toolkit for Python using wx%{port}
@@ -48,8 +52,15 @@ Prefix:    %{pref}
 Provides: wxPython  = %{version}
 Provides: wxPython%{port}  = %{version}
 
+Provides: libwx_%{lcport}%{uniflg}%{dbgflg}-%{ver2}.so
+Provides: libwx_%{lcport}%{uniflg}%{dbgflg}-%{ver2}.so(WX%{port}%{UNIFLG}%{DBGFLG}_%{ver2})
+Provides: libwx_%{lcport}%{uniflg}%{dbgflg}_gl-%{ver2}.so
+Provides: libwx_%{lcport}%{uniflg}%{dbgflg}_gl-%{ver2}.so(WX%{port}%{UNIFLG}%{DBGFLG}_%{ver2})
+
+
+
 # old wxPython packages
-Obsoletes: wxPython
+Obsoletes: wxPython wxPython%{port}
 
 
 %description
@@ -189,8 +200,10 @@ for s in \
 	img2png \
 	img2py \
 	img2xpm \
+	pyalacarte \
+	pyalamode \
 	pycrust \
-	pycwrap \
+	pywrap \
 	pyshell \
 	xrced; do
     cp scripts/$s $RPM_BUILD_ROOT/%{pref}/bin
@@ -228,7 +241,7 @@ $GFL    $RPM_BUILD_ROOT %{wxpref}/bin/wx-config    >> DEVELLIST
 
 #----------------------------------------------------------------
 %clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+##[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 
 #----------------------------------------------------------------
@@ -237,7 +250,7 @@ $GFL    $RPM_BUILD_ROOT %{wxpref}/bin/wx-config    >> DEVELLIST
 %defattr(-,root,root)
 %doc docs/preamble.txt docs/licence.txt docs/readme.txt docs/changes.txt
 %doc wxPython/README.txt wxPython/CHANGES.txt
-
+%doc wxPython/docs/*
 
 %files -n wxPython%{port}-devel -f DEVELLIST
 %defattr(-,root,root)

wxPython/setup.py

@@ -1205,8 +1205,8 @@ if __name__ == "__main__":
                           'wx.lib.editor',
                           'wx.lib.mixins',
                           'wx.py',
-                          #'wx.tools',            ???
+                          'wx.tools',
-                          #'wx.tools.XRCed',      ???
+                          'wx.tools.XRCed',
                           ],
 
               ext_package = PKGDIR,