Change how the tool scripts are installed

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

diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index 5864b5a0fd49ccbf0bb17d77477238e376c428db..8dbf5154b6dc14f61b6842821e2cdc8a3b44ab1a 100644 (file)
--- a/wxPython/distrib/wxPythonFull.spec.in
+++ b/wxPython/distrib/wxPythonFull.spec.in
@@ -135,6 +135,7 @@ make prefix=$RPM_BUILD_ROOT%{wxpref} install
 cd ../wxPython
 %{python} setup.py \
        IN_CVS_TREE=1 \
 cd ../wxPython
 %{python} setup.py \
        IN_CVS_TREE=1 \

+       NO_SCRIPTS=1 \

        WX_CONFIG="$RPM_BUILD_ROOT%{wxpref}/bin/wx-config --prefix=$RPM_BUILD_ROOT%{wxpref}" \
        build
 
        WX_CONFIG="$RPM_BUILD_ROOT%{wxpref}/bin/wx-config --prefix=$RPM_BUILD_ROOT%{wxpref}" \
        build
 


@@ -145,10 +146,30 @@ cd ../wxPython
 cd wxPython
 %{python} setup.py \
        IN_CVS_TREE=1 \
 cd wxPython
 %{python} setup.py \
        IN_CVS_TREE=1 \

+       NO_SCRIPTS=1 \

        WX_CONFIG="$RPM_BUILD_ROOT%{wxpref}/bin/wx-config --prefix=$RPM_BUILD_ROOT%{wxpref}" \
        install \
        --root=$RPM_BUILD_ROOT
 
        WX_CONFIG="$RPM_BUILD_ROOT%{wxpref}/bin/wx-config --prefix=$RPM_BUILD_ROOT%{wxpref}" \
        install \
        --root=$RPM_BUILD_ROOT
 

+# Since I want this RPM to be as generic as possible I won't let
+# distutils copy the scripts, since it will mangle the #! line
+# to use the real python pathname.  Since some distros install
+# python 2.2 as python2 and others as python, then I can't let
+# it do that otherwise the dependencies will be fouled up.  Copy
+# them manually instead:
+
+mkdir -p $RPM_BUILD_ROOT/usr/bin
+for s in \
+       img2png \
+       img2py \
+       img2xpm \
+       pycrust \
+       pyshell \
+       xrced; do
+    cp scripts/$s $RPM_BUILD_ROOT/usr/bin
+done
+
+

 
 
 #----------------------------------------------------------------
 
 
 #----------------------------------------------------------------