Rearrainged some bits

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

diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in
index e81db5091cde12876bef12543f61f6c9b1bd20f4..0c4e78f1634f273327fc84db85cfffb0d1cca268 100644 (file)
--- a/wxPython/distrib/wxPythonFull.spec.in
+++ b/wxPython/distrib/wxPythonFull.spec.in
@@ -15,15 +15,14 @@
 # the default value set here will be used instead.
 
 
 # the default value set here will be used instead.
 
 

-# Used to set the Release tag below.  I normally use it to define what
-# distro the RPM was build on and also include the version of Python
-# it was built with.  
-%if %{?release:0}%{!?release:1}
-%define release 1_py%{pyver}
+# Which version of Python to build with.  Used to assemble python
+# binary name so use '2.2', '2.3', etc.
+%if %{?pyver:0}%{!?pyver:1}
+%define pyver 2.3

 %endif
 
 
 %endif
 
 

-# Which wxWidgets port to build and use.  Current acceptable valuse
+# Which wxWidgets port to build and use.  Current acceptable values

 # are 'gtk' and 'gtk2'.
 %if %{?port:0}%{!?port:1}
 %define port gtk2
 # are 'gtk' and 'gtk2'.
 %if %{?port:0}%{!?port:1}
 %define port gtk2


@@ -36,14 +35,6 @@
 %define unicode 1
 %endif
 
 %define unicode 1
 %endif
 

-# Which version of Python to build with.  Used to assemble python
-# binary name so use '2.2', '2.3', etc.
-%if %{?pyver:0}%{!?pyver:1}
-%define pyver 2.3
-%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 the builtin image and etc. libs be used, or system libs?
 # Distro specific RPMs should probably set this to 0, generic ones


@@ -66,6 +57,15 @@
 %endif
 
 
 %endif
 
 

+# Used to set the Release tag below.  I normally use it to define what
+# distro the RPM was build on and also include the version of Python
+# it was built with.  
+%if %{?release:0}%{!?release:1}
+%define release 1_py%{pyver}
+%endif
+
+
+

 #----------------------------------------------------------------------
 # Other variables used below
 
 #----------------------------------------------------------------------
 # Other variables used below