Move definitions to the top of the spec file

diff --git a/redhat/freeradius.spec b/redhat/freeradius.spec
index 7c03bab332092f48200809b4f28a209c182cbcb6..945991f0e3c0e44e187b02eb5928b31ef1bde09e 100644 (file)
--- a/redhat/freeradius.spec
+++ b/redhat/freeradius.spec
@@ -6,7 +6,22 @@
 %bcond_with rlm_opendirectory
 %bcond_with rlm_securid
 %bcond_with rlm_sigtran
+
+# Oracle conditions and definitions
+# Pass in --with rlm_sql_oracle to build with Oracle support
+# Specify the version of Oracle you're using with _oracle_version
+# Specify the include and lib directories for Oracle with _oracle_include_dir and _oracle_lib_dir
 %bcond_with rlm_sql_oracle
+%global _oracle_version 11.2
+%ifarch x86_64
+%global _oracle_include_dir /usr/include/oracle/%{_oracle_version}/client64
+%global _oracle_lib_dir %{_prefix}/lib/oracle/%{_oracle_version}/client64/lib
+%endif
+%ifarch i386
+%global _oracle_include_dir /usr/include/oracle/${_oracle_version}/client
+%global _oracle_lib_dir %{_prefix}/lib/oracle/%{_oracle_version}/client/lib
+%endif
+
 %bcond_with rlm_yubikey
 
 # Build all experimental modules
@@ -423,17 +438,6 @@ BuildRequires: freetds-devel
 This plugin provides FreeTDS support for the FreeRADIUS server project.
 
 %if %{with rlm_sql_oracle}
-%global _oracle_version 11.2
-%ifarch x86_64
-%global _oracle_include_dir /usr/include/oracle/%{_oracle_version}/client64
-%global _oracle_lib_dir %{_prefix}/lib/oracle/%{_oracle_version}/client64/lib
-%endif
-%ifarch i386
-%global _oracle_include_dir /usr/include/oracle/${_oracle_version}/client
-%global _oracle_lib_dir %{_prefix}/lib/oracle/%{_oracle_version}/client/lib
-%endif
-%endif
-
 %package oracle
 Summary: Oracle support for FreeRADIUS
 Group: System Environment/Daemons
@@ -442,6 +446,7 @@ Requires: oracle-instantclient%{_oracle_version}
 BuildRequires: oracle-instantclient%{_oracle_version}-devel
 %description oracle
 This plugin provides Oracle support for the FreeRADIUS server project.
+%endif
 
 %package redis
 Summary: Redis support for FreeRADIUS