From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Tue, 2 Jul 2024 18:53:12 +0000 (-0600)
Subject: Move definitions to the top of the spec file
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b0a8ae8a363c37a69e4076e52eca17d9350870d;p=thirdparty%2Ffreeradius-server.git

Move definitions to the top of the spec file
---

diff --git a/redhat/freeradius.spec b/redhat/freeradius.spec
index 7c03bab3320..945991f0e3c 100644
--- 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