rlm_sql_freetds is now stable, remove conditions from redhat spec file

diff --git a/redhat/freeradius.spec b/redhat/freeradius.spec
index dcd5c41..a3dc6b0 100644 (file)
--- a/redhat/freeradius.spec
+++ b/redhat/freeradius.spec
@@ -9,13 +9,11 @@
 # experimental modules
 %bcond_with rlm_idn
 %bcond_with rlm_ruby
-%bcond_with rlm_sql_freetds
 %bcond_with rlm_sql_oracle
 %{?_with_rlm_idn: %global _with_experimental_modules --with-experimental-modules}
 %{?_with_rlm_opendirectory: %global _with_experimental_modules --with-experimental-modules}
 %{?_with_rlm_ruby: %global _with_experimental_modules --with-experimental-modules}
 %{?_with_rlm_securid: %global _with_experimental_modules --with-experimental-modules}
-%{?_with_rlm_sql_freetds: %global _with_experimental_modules --with-experimental-modules}
 %{?_with_rlm_sql_oracle: %global _with_experimental_modules --with-experimental-modules}
 
 %if %{?_with_experimental_modules:1}%{!?_with_experimental_modules:0}
@@ -23,7 +21,6 @@
 %{!?_with_rlm_opendirectory: %global _without_rlm_opendirectory --without-rlm_opendirectory}
 %{!?_with_rlm_ruby: %global _without_rlm_ruby --without-rlm_ruby}
 %{!?_with_rlm_securid: %global _without_rlm_securid --without-rlm_securid}
-%{!?_with_rlm_sql_freetds: %global _without_rlm_sql_freetds --without-rlm_sql_freetds}
 %{!?_with_rlm_sql_oracle: %global _without_rlm_sql_oracle --without-rlm_sql_oracle}
 %endif
 
@@ -224,7 +221,6 @@ BuildRequires: unixODBC-devel
 %description unixODBC
 This plugin provides unixODBC support for the FreeRADIUS server project.
 
-%if %{?_with_rlm_sql_freetds:1}%{!?_with_rlm_sql_freetds:0}
 %package freetds
 Summary: FreeTDS support for FreeRADIUS
 Group: System Environment/Daemons
@@ -234,7 +230,6 @@ BuildRequires: freetds-devel
 
 %description freetds
 This plugin provides FreeTDS support for the FreeRADIUS server project.
-%endif
 
 %if %{?_with_rlm_sql_oracle:1}%{!?_with_rlm_sql_oracle:0}
 %package oracle
@@ -357,8 +352,6 @@ export LDFLAGS="-Wl,--build-id"
         %{?_without_rlm_opendirectory} \
         %{?_with_rlm_securid} \
         %{?_without_rlm_securid} \
-        %{?_with_rlm_sql_freetds} \
-        %{?_without_rlm_sql_freetds} \
         %{?_with_rlm_ruby} \
         %{?_without_rlm_ruby} \
         %{?_with_rlm_cache_memcached} \
@@ -411,9 +404,6 @@ rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/raddb/mods-available/idn
 %if %{?_with_rlm_ruby:0}%{!?_with_rlm_ruby:1}
 rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/raddb/mods-config/ruby
 %endif
-%if %{?_with_rlm_sql_freetds:0}%{!?_with_rlm_sql_freetds:1}
-rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/raddb/mods-config/sql/main/mssql
-%endif
 %if %{?_with_rlm_sql_oracle:0}%{!?_with_rlm_sql_oracle:1}
 rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/raddb/mods-config/sql/ippool/oracle
 rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/raddb/mods-config/sql/ippool-dhcp/oracle
@@ -701,10 +691,8 @@ fi
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-config/ruby/*
 %endif
 # freetds
-%if %{?_with_rlm_sql_freetds:1}%{!?_with_rlm_sql_freetds:0}
 %dir %attr(750,root,radiusd) /etc/raddb/mods-config/sql/main/mssql
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-config/sql/main/mssql/*
-%endif
 # oracle
 %if %{?_with_rlm_sql_oracle:1}%{!?_with_rlm_sql_oracle:0}
 %dir %attr(750,root,radiusd) /etc/raddb/mods-config/sql
@@ -785,11 +773,9 @@ fi
 %{_libdir}/freeradius/rlm_ruby.so
 %endif
 
-%if %{?_with_rlm_sql_freetds:1}%{!?_with_rlm_sql_freetds:0}
 %files freetds
 %defattr(-,root,root)
 %{_libdir}/freeradius/rlm_sql_freetds.so
-%endif
 
 %if %{?_with_rlm_sql_oracle:1}%{!?_with_rlm_sql_oracle:0}
 %files oracle