added wxCLOSE and fixed wxSYSTEM_MENU on Unix

[wxWidgets.git] / wxPython / distrib / wxPythonFull.spec.in

diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index fd59fa9fc95fe6d1cb116a2a6944a215f8d16d19..8dbf5154b6dc14f61b6842821e2cdc8a3b44ab1a 100644 (file)
--- a/wxPython/distrib/wxPythonFull.spec.in
+++ b/wxPython/distrib/wxPythonFull.spec.in
@@ -38,7 +38,7 @@ Release:   %{release}
 Source0:   %{tarname}-%{version}.tar.gz
 License:   wxWindows Library Licence, Version 3
 URL:       http://wxPython.org/
-Packager:  Robin Dunn <robind@alldunn.com>
+Packager:  Robin Dunn <robin@alldunn.com>
 Group:     Development/Python
 BuildRoot: %{_tmppath}/%{name}-buildroot
 Prefix:    %{pref}
@@ -135,6 +135,7 @@ make prefix=$RPM_BUILD_ROOT%{wxpref} install
 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
 
@@ -145,15 +146,35 @@ cd ../wxPython
 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
 
+# 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
+
+
 
 
 #----------------------------------------------------------------
 %clean
-#[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 
 #----------------------------------------------------------------