Added fsl logic to buildconf and removed old fakesyslog conditional inclusion.

qpopper/fsl.qpopper

@@ -0,0 +1,16 @@
+##
+##  fsl.qpopper -- OSSP fsl configuration for qpopper
+##
+
+ident (qpopper)/.+ q{
+    prefix(
+        prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+    ) 
+    -> {
+        debug: file(
+            path="@l_prefix@/var/qpopper/qpopper.log",
+            append=1, perm=0644
+        )
+    }
+}
+

qpopper/qpopper.spec

@@ -38,19 +38,19 @@ Distribution: OpenPKG [BASE]
 Group:        Mail
 License:      GPL
 Version:      4.0.4
-Release:      20020425
+Release:      20020911
 
 #   list of sources
 Source0:      ftp://ftp.qualcomm.com/eudora/servers/unix/popper/qpopper%{version}.tar.gz
-Source1:      fakesyslog.tar.gz
-Source2:      rc.qpopper
+Source1:      rc.qpopper
+Source2:      fsl.qpopper
 Patch0:       qpopper.patch
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, MTA, openssl
-PreReq:       OpenPKG, openpkg >= 20020206, MTA, openssl
+BuildPreReq:  OpenPKG, openpkg >= 20020206, MTA, openssl, fsl
+PreReq:       OpenPKG, openpkg >= 20020206, MTA, openssl, fsl
 %if "%{with_pam}" == "yes"
 BuildPreReq:  PAM
 PreReq:       PAM
@@ -66,31 +66,23 @@ Provides:     POP
 
 %prep
     %setup0 -q -c
-    %setup1 -q -T -D -a 1
     cd qpopper%{version}
     %patch0 -p0
 
 %build
-    #   build faked syslog(3) library
-    fakesyslogdir="`pwd`/fakesyslog"
-    ( cd fakesyslog
-      CC="%{l_cc}" \
-      CFLAGS="%{l_cflags -O}" \
-      ./configure \
-          --with-logfile=%{l_prefix}/var/qpopper/qpopper.log
-      %{l_make} %{l_mflags}
-    )
-
     #   build qpopper
     ( cd qpopper%{version}
       CC="%{l_cc}" \
-      CFLAGS="%{l_cflags -O}" \
+      CFLAGS="`%{l_prefix}/bin/fsl-config --all --cflags`" \
+      CPPFLAGS="`%{l_prefix}/bin/fsl-config --all --cflags`" \
+      LDFLAGS="`%{l_prefix}/bin/fsl-config --all --ldflags`" \
+      LIBS="`%{l_prefix}/bin/fsl-config --all --libs`" \
 %if "%{with_pam}" == "yes"
-      CPPFLAGS="-I`%{l_prefix}/etc/rc --query pam_incdir`" \
-      LDFLAGS="-L`%{l_prefix}/etc/rc --query pam_libdir`" \
+      CFLAGS="$CFLAGS -I`%{l_prefix}/etc/rc --query pam_incdir`" \
+      CPPFLAGS="$CPPFLAGS -I`%{l_prefix}/etc/rc --query pam_incdir`" \
+      LDFLAGS="$LDFLAGS -L`%{l_prefix}/etc/rc --query pam_libdir`" \
 %endif
       OS_DEFS="-DPIDFILE=\\\"%{l_prefix}/var/qpopper/qpopper.pid\\\"" \
-      LIBS="-L$fakesyslogdir -lfakesyslog" \
       ./configure \
           --prefix=%{l_prefix} \
           --sbindir=%{l_prefix}/sbin \