OSSP fsl logic is hard coded into buildconf and no longer conditional.

inn/inn.spec

@@ -27,11 +27,6 @@
 %define       V_inn        2.3.3
 %define       V_cleanfeed  20010805
 
-#   package options
-%ifndef       with_fsl
-%define       with_fsl     no
-%endif
-
 #   package information
 Name:         inn
 Summary:      InterNetNews Usenet Server
@@ -42,24 +37,19 @@ Distribution: OpenPKG [BASE]
 Group:        News
 License:      ISC
 Version:      %{V_inn}
-Release:      20020801
+Release:      20020911
 
 #   list of sources
 Source0:      ftp://ftp.isc.org/isc/inn/inn-%{V_inn}.tar.gz
 Source1:      http://www.bofh.it/~md/cleanfeed/cleanfeed-%{V_cleanfeed}.tgz
-Source2:      ftp://ftp.openpkg.org/DST/inn/fakesyslog.tar.gz
-Source3:      rc.inn
-Source4:      fsl.inn
+Source2:      rc.inn
+Source3:      fsl.inn
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, make, perl, db3, openssl, bison, flex
-PreReq:       OpenPKG, openpkg >= 20020206, perl, perl-crypto, MTA
-%if "%{with_fsl}" == "yes"
-BuildPreReq:  fsl
-PreReq:       fsl
-%endif
+BuildPreReq:  OpenPKG, openpkg >= 20020206, fsl, make, perl, db3, openssl, bison, flex
+PreReq:       OpenPKG, openpkg >= 20020206, fsl, perl, perl-crypto, MTA
 AutoReq:      no
 AutoReqProv:  no
 
@@ -68,29 +58,12 @@ AutoReqProv:  no
     NNTP server, and nnrpd, a newsreading server. INN separates hosts
     that feed you news from those that have users reading news.
 
-    Options
-    with_fsl=%{with_fsl}
-
 %prep
     %setup0 -q -c
     %setup1 -q -T -D -a 1
-%if "%{with_fsl}" != "yes"
-    %setup2 -q -T -D -a 2
-%endif
 
 %build
-    #   build faked syslog(3) library
-%if "%{with_fsl}" != "yes"
-    fakesyslogdir="`pwd`/fakesyslog"
-    ( cd fakesyslog
-      CC="%{l_cc}" \
-      CFLAGS="%{l_cflags -O}" \
-      ./configure \
-          --with-logfile=%{l_prefix}/var/inn/log/news.log
-      %{l_make} %{l_mflags}
-    )
-%endif
-
+    #   build inn
     cd inn-%{V_inn}
 
     #   adjust some too strange INN paths
@@ -111,13 +84,8 @@ AutoReqProv:  no
     #   configure the source tree
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O} -I%{l_prefix}/include/db3 -I%{l_prefix}/include" \
-%if "%{with_fsl}" == "yes"
     LDFLAGS="`%{l_prefix}/bin/fsl-config --ldflags --all`" \
     LIBS="`%{l_prefix}/bin/fsl-config --libs --all`" \
-%else
-    LDFLAGS="-L$fakesyslogdir -L%{l_prefix}/lib" \
-    LIBS="-lfakesyslog" \
-%endif
     ./configure \
         --prefix=%{l_prefix} \
         --bindir=%{l_prefix}/libexec/inn \
@@ -223,14 +191,12 @@ AutoReqProv:  no
           %{SOURCE rc.inn} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 
-      #   optional OSSP fsl support
-%if "%{with_fsl}" == "yes"
+      #   OSSP fsl support
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
       %{l_shtool} install -c -m 644 \
           -e 's;@l_prefix@;%{l_prefix};g' \
           %{SOURCE fsl.inn} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
-%endif
     )
 
     #   install cleanfeed
@@ -261,10 +227,8 @@ AutoReqProv:  no
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
         '%config %{l_prefix}/etc/inn/*' \
-%if "%{with_fsl}" == "yes"
         '%config %{l_prefix}/etc/fsl/fsl.inn' \
         '%not %dir %{l_prefix}/etc/fsl' \
-%endif
         '%attr(4550,root,%{l_mgrp}) %{l_prefix}/bin/rnews' \
         '%attr(4755,root,%{l_mgrp}) %{l_prefix}/libexec/inn/inndstart' \
         '%attr(4755,root,%{l_mgrp}) %{l_prefix}/libexec/inn/startinnfeed' \