Allow the release tag to be specified on the rpmbuild command line

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

diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index 82a9a5ab5386678d52ce33ae6d79c12f662eb339..7fff9b7a0ee74d500b4f2ceb733ffb894c13f370 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 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
@@ -107,6 +114,8 @@ cd bld
 %if %{unicode}
        --enable-gtk2 \
        --enable-unicode \
+%else
+       --disable-gtk2 \
 %endif
        --enable-geometry \
        --enable-optimise \