[xulrunner] Clean up our macro usage a little bit

[Christopher Aillon]

commit d0255b10f13d603b47391a015ba5df7f9ea4d1d0
Author: Christopher Aillon <caillon at redhat.com>
Date:   Mon Jan 31 19:41:07 2011 -0800

    Clean up our macro usage a little bit
    
    - Use %global instead of %define
    - Move items that change less frequently further down in the specfile
    - Rename a few items to better reflect reality
    - Update a few versions (pointed out by Jory A. Pratt)

 xulrunner.spec |   44 ++++++++++++++++++++------------------------
 1 files changed, 20 insertions(+), 24 deletions(-)
---
diff --git a/xulrunner.spec b/xulrunner.spec
index 9ccea3f..7d524ea 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -1,32 +1,28 @@
-# Separated plugins are supported on x86(64) only
-%ifarch i386 i686 x86_64
-%define separated_plugins 1
-%else
-%define separated_plugins 0
-%endif
-
 # Minimal required versions
-%define nspr_version 4.8
-%define nss_version 3.12.8
-%define cairo_version 1.6.0
-%define freetype_version 2.1.9
-%define sqlite_version 3.7.1
-%define notify_version 0.7.0
-%define tarballdir mozilla-central
-# build crash reporter only on x86/x86_64 for now
+%global nspr_version 4.8.7
+%global nss_version 3.12.9
+%global cairo_version 1.6.0
+%global freetype_version 2.1.9
+%global sqlite_version 3.7.4
+%global libnotify_version 0.7.0
+
+%global version_internal  2
+%global pretag            b10
+%global mozappdir         %{_libdir}/%{name}-%{version_internal}
+%global tarballdir        mozilla-central
+
+# crash reporter and out-of-process-plugins work only on x86/x86_64
 %ifarch %{ix86} x86_64
-%define enable_mozilla_crashreporter       1
+%global enable_mozilla_crashreporter 1
+%global moz_out_of_process_plugins   1
 %else
-%define enable_mozilla_crashreporter       0
+%global enable_mozilla_crashreporter 0
+%global moz_out_of_process_plugins   0
 %endif
 
 # The actual sqlite version (see #480989):
 %global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536)
 
-%define version_internal  2
-%define mozappdir         %{_libdir}/%{name}-%{version_internal}
-%define pretag            b10
-
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        2.0
@@ -86,7 +82,7 @@ BuildRequires:  hunspell-devel
 BuildRequires:  sqlite-devel >= %{sqlite_version}
 BuildRequires:  startup-notification-devel
 BuildRequires:  alsa-lib-devel
-BuildRequires:  libnotify-devel >= %{notify_version}
+BuildRequires:  libnotify-devel >= %{libnotify_version}
 BuildRequires:  autoconf213
 BuildRequires:  mesa-libGL-devel
 BuildRequires:  yasm
@@ -175,7 +171,7 @@ autoconf-2.13
 %{__cat} %{SOURCE11} >> .mozconfig
 %endif
 
-%if !%{?separated_plugins}
+%if !%{?moz_out_of_process_plugins}
 echo "ac_add_options --disable-ipc" >> .mozconfig
 %endif
 
@@ -441,7 +437,7 @@ fi
 %{mozappdir}/dependentlibs.list
 %{mozappdir}/greprefs.js
 %{_sysconfdir}/ld.so.conf.d/xulrunner*.conf
-%if %{?separated_plugins}
+%if %{?moz_out_of_process_plugins}
 %{mozappdir}/plugin-container
 %endif