Align to OpenPKG fsl policy, thus removing optional use

sasl/sasl.spec

@@ -36,7 +36,6 @@ Version:      2.1.12
 Release:      20030407
 
 #   package options
-%option       with_fsl    no
 %option       with_pam    no
 %option       with_login  no
 %option       with_ldap   no
@@ -52,12 +51,8 @@ Patch0:       sasl.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030103, db >= 4.1.24, openssl, gcc
-PreReq:       OpenPKG, openpkg >= 20030103, db >= 4.1.24
-%if "%{with_fsl}" == "yes"
-BuildPreReq:  fsl
-PreReq:       fsl
-%endif
+BuildPreReq:  OpenPKG, openpkg >= 20030103, db >= 4.1.24, fsl, gcc, openssl
+PreReq:       OpenPKG, openpkg >= 20030103, db >= 4.1.24, fsl
 %if "%{with_pam}" == "yes"
 BuildPreReq:  PAM
 PreReq:       PAM
@@ -108,12 +103,8 @@ AutoReqProv:  no
 
     #   determine build flags
     cflags="%{l_cflags -O} %{l_cppflags}"
-    ldflags="%{l_ldflags}"
-    libs="-ldb"
-%if "%{with_fsl}" == "yes"
-    ldflags="$ldflags `%{l_prefix}/bin/fsl-config --all --ldflags`"
-    libs="$libs `%{l_prefix}/bin/fsl-config --all --libs`"
-%endif
+    ldflags="%{l_ldflags} `%{l_prefix}/bin/fsl-config --all --ldflags`"
+    libs="-ldb `%{l_prefix}/bin/fsl-config --all --libs`"
 %if "%{with_ldap}" == "yes"
     cflags="$cflags -DAUTH_LDAP"
 %endif
@@ -257,22 +248,18 @@ AutoReqProv:  no
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 
     #   install OSSP fsl configuration
-%if "%{with_fsl}" == "yes"
     %{l_shtool} mkdir -f -p -m 755 \
-        $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+        $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
     %{l_shtool} install -c -m 644 \
         -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE fsl.sasl} \
         $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
-%endif
 
     #   determine installation files
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
-%if "%{with_fsl}" == "yes"
         '%config %{l_prefix}/etc/fsl/fsl.sasl' \
         '%not %dir %{l_prefix}/etc/fsl' \
-%endif
         '%config %{l_prefix}/etc/sasl/saslauthd.conf' \
         '%dir %attr(0750,%{l_musr},%{l_rgrp}) %{l_prefix}/var/sasl' \
         '%dir %attr(0750,%{l_musr},%{l_rgrp}) %{l_prefix}/var/sasl/saslauthd' \