From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Tue, 2 Jul 2024 20:16:21 +0000 (-0600)
Subject: Don't set the oracle version by default
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=553a52a135d8c68e7948478afcca728fe7f067fc;p=thirdparty%2Ffreeradius-server.git

Don't set the oracle version by default
---

diff --git a/redhat/freeradius.spec b/redhat/freeradius.spec
index 945991f0e3c..48273f76241 100644
--- a/redhat/freeradius.spec
+++ b/redhat/freeradius.spec
@@ -12,14 +12,15 @@
 # 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
+%if %{with rlm_sql_oracle}
+  %ifarch x86_64
+    %{!?_oracle_include_dir:%define _oracle_include_dir /usr/include/oracle%{?_oracle_version:/%{_oracle_version}}/client64}
+    %{!?_oracle_lib_dir:%define _oracle_lib_dir %{_prefix}/lib/oracle/%{?_oracle_version:/%{_oracle_version}}/client64/lib}
+  %endif
+  %ifarch i386
+    %{!?_oracle_include_dir:%define _oracle_include_dir /usr/include/oracle%{?_oracle_version:/%{_oracle_version}}/client}
+    %{!?_oracle_lib_dir:%define _oracle_lib_dir %{_prefix}/lib/oracle/%{?_oracle_version:/%{_oracle_version}}/client/lib}
+  %endif
 %endif
 
 %bcond_with rlm_yubikey
@@ -442,8 +443,8 @@ This plugin provides FreeTDS support for the FreeRADIUS server project.
 Summary: Oracle support for FreeRADIUS
 Group: System Environment/Daemons
 Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: oracle-instantclient%{_oracle_version}
-BuildRequires: oracle-instantclient%{_oracle_version}-devel
+Requires: oracle-instantclient%{?_oracle_version}
+BuildRequires: oracle-instantclient%{?_oracle_version}-devel
 %description oracle
 This plugin provides Oracle support for the FreeRADIUS server project.
 %endif