corrected code to not suppose that Write() always writes all the data it was given

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

diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index cc1ccfedd136aa6c6c10ac479c3028d5896d0c9b..10de3312dd8714ad224a348ad2e61e9109ede005 100644 (file)
--- a/wxPython/distrib/wxPythonFull.spec.in
+++ b/wxPython/distrib/wxPythonFull.spec.in
@@ -7,12 +7,19 @@
 %define tarname @TARNAME@
 %define version @VERSION@
 %define ver2    @VER2@
 %define tarname @TARNAME@
 %define version @VERSION@
 %define ver2    @VER2@

-%define release 1

 %define wxprefbase %{pref}/lib/wxPython
 %define wxpref  %{wxprefbase}-%{version}
 %define name    wxPython%{port}-py%{pyver}
 
 
 %define wxprefbase %{pref}/lib/wxPython
 %define wxpref  %{wxprefbase}-%{version}
 %define name    wxPython%{port}-py%{pyver}
 
 

+# Allow the release tag to be specified on the rpmbuild command 
+# line with --define 'release SOMETHING'  If no such definition is 
+# used then the release number is 1.
+%if %{?release:0}%{!?release:1}
+%define release 1
+%endif
+
+

 # Should the builtin image and etc. libs be used, or system libs?
 # Distro specific RPMs should probably set this to 0, generic ones
 # should use 1
 # Should the builtin image and etc. libs be used, or system libs?
 # Distro specific RPMs should probably set this to 0, generic ones
 # should use 1


@@ -107,6 +114,8 @@ cd bld
 %if %{unicode}
        --enable-gtk2 \
        --enable-unicode \
 %if %{unicode}
        --enable-gtk2 \
        --enable-unicode \

+%else
+       --disable-gtk2 \

 %endif
        --enable-geometry \
        --enable-optimise \
 %endif
        --enable-geometry \
        --enable-optimise \


@@ -137,9 +146,8 @@ cd $WXDIR/wxPython
        NO_SCRIPTS=1 \
        WXPORT=%{lcport} \
        UNICODE=%{unicode} \
        NO_SCRIPTS=1 \
        WXPORT=%{lcport} \
        UNICODE=%{unicode} \

-       WX_CONFIG="$WXDIR/bld/wx-config --prefix=$WXDIR --exec-prefix=$WXDIR/bld" \
-       CONTRIBS_INC="$WXDIR/contrib/include" \
-       build
+       WX_CONFIG="$WXDIR/bld/wx-config --inplace" \
+               build

 
 
 # Build wxrc (XRC resource tool)
 
 
 # Build wxrc (XRC resource tool)