X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e83b721d907ddb739116f15b88e87631696a1f6..477550dc0cd5a38bfae7c32e3fe9d8823c13a761:/wxPython/distrib/wxPythonFull.spec.in

diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index d86b656cbc..10de3312dd 100644
--- 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 release 1
 %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
@@ -22,7 +29,9 @@
 # Should --enable-debug_flag be used in release builds?  Using it
 # defines __WXDEBUG__ and gives us runtime diagnostics that are turned
 # into Python exceptions starting with 2.3.4.  (So turning it on is a
-# very helpful thing IMO and is recommended.)
+# very helpful thing IMO and is recommended.)  The code is still
+# compiled with optimization flags and such when this option is used,
+# it simply turns on some extra code.
 %define debug_flag 1
 
 
@@ -105,6 +114,8 @@ cd bld
 %if %{unicode}
 	--enable-gtk2 \
 	--enable-unicode \
+%else
+	--disable-gtk2 \
 %endif
 	--enable-geometry \
 	--enable-optimise \
@@ -135,9 +146,8 @@ cd $WXDIR/wxPython
 	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)
@@ -173,11 +183,6 @@ cd $WXDIR/wxPython
 
 cd $WXDIR/wxPython
 
-# install the wxPython headers
-cp -R include $RPM_BUILD_ROOT%{wxpref}
-mkdir -p $RPM_BUILD_ROOT%{wxpref}/include/wx/wxPython/i_files
-cp src/*.i $RPM_BUILD_ROOT%{wxpref}/include/wx/wxPython/i_files
-
 
 # Since I want this RPM to be as generic as possible I won't let
 # distutils copy the scripts (NO_SCRIPTS=1 above) since it will mangle