make fsl optional with default yes, as promised for the next release

powerdns/powerdns.spec

@@ -35,7 +35,7 @@ Distribution: OpenPKG [JUNK]
 Group:        DNS
 License:      GPL
 Version:      2.9.8
-Release:      20030614
+Release:      20030623
 
 #   package options
 %option       with_fsl   yes
@@ -52,9 +52,10 @@ Source3:      powerdnssetup
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20021204
+BuildPreReq:  OpenPKG, openpkg >= 20030415
 %if "%{with_fsl}" == "yes"
 BuildPreReq:  fsl
+PreReq:       fsl
 %endif
 %if "%{with_mysql}" == "yes"
 BuildPreReq:  MYSQL
@@ -62,10 +63,7 @@ BuildPreReq:  MYSQL
 %if "%{with_pgsql}" == "yes"
 BuildPreReq:  postgresql, postgresql::with_cxx = yes
 %endif
-PreReq:       OpenPKG, openpkg >= 20021204
-%if "%{with_fsl}" == "yes"
-PreReq:       fsl
-%endif
+PreReq:       OpenPKG, openpkg >= 20030415
 %if "%{with_mysql}" == "yes"
 PreReq:       MYSQL
 %endif
@@ -105,19 +103,13 @@ Conflicts:    bind, bind8
     MODULES="$MODULES gpgsql"
 %endif
     MODULES=`echo "$MODULES" | sed 's;^ ;;'`
-    lf="%{l_ldflags}"
-    li=""
-%if "%{with_fsl}" == "yes"
-    lf="$lf `%{l_prefix}/bin/fsl-config --all --ldflags --libs`"
-    li="$li `%{l_prefix}/bin/fsl-config --all --libs`"
-%endif
     CC="%{l_cc}" \
     CXX="%{l_cxx}" \
     CFLAGS="%{l_cflags -O}" \
     CXXFLAGS="%{l_cxxflags -O} -DDLLIMPORT=" \
     CPPFLAGS="%{l_cppflags} -DDLLIMPORT=" \
-    LDFLAGS="$lf" \
-    LIBS="$li" \
+    LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}"
+    LIBS="%{l_fsl_libs}"
     ./configure \
         --prefix=%{l_prefix} \
         --sysconfdir=%{l_prefix}/etc/powerdns \
@@ -170,18 +162,22 @@ Conflicts:    bind, bind8
     %{l_shtool} install -c -m 755 \
         %{SOURCE powerdnssetup} $RPM_BUILD_ROOT%{l_prefix}/sbin/
 
-    #   Creating fsl directory
-    %{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.powerdns} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+    #   OSSP fake syslog library
+    %{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.%{name}} \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
 
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/*  >/dev/null 2>&1 || true
     strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
-    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
-        '%config %attr(0600,root,%{l_mgrp}) %{l_prefix}/etc/powerdns/*' \
-        '%config %{l_prefix}/etc/fsl/fsl.powerdns' \
-        '%not %dir %{l_prefix}/etc/fsl'
+
+    #   determine installation files
+    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+        %{l_files_std} \
+        '%not %dir %{l_prefix}/etc/fsl' \
+        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
+        '%config %attr(0600,root,%{l_mgrp}) %{l_prefix}/etc/powerdns/*'
 
 %files -f files
 

qpopper/qpopper.spec

@@ -33,9 +33,10 @@ Distribution: OpenPKG [BASE]
 Group:        Mail
 License:      GPL
 Version:      4.0.5
-Release:      20030530
+Release:      20030623
 
 #   package options
+%option       with_fsl  yes
 %option       with_pam  no
 
 #   list of sources
@@ -47,8 +48,12 @@ Patch0:       qpopper.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030103, MTA, openssl, fsl
-PreReq:       OpenPKG, openpkg >= 20030103, MTA, openssl, fsl
+BuildPreReq:  OpenPKG, openpkg >= 20030415, MTA, openssl
+PreReq:       OpenPKG, openpkg >= 20030415, MTA, openssl
+%if "%{with_fsl}" == "yes"
+BuildPreReq:  fsl
+PreReq:       fsl
+%endif
 %if "%{with_pam}" == "yes"
 BuildPreReq:  PAM
 PreReq:       PAM
@@ -69,8 +74,8 @@ Provides:     POP
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags}" \
     CPPFLAGS="%{l_cppflags}" \
-    LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/fsl-config --all --ldflags`" \
-    LIBS="`%{l_prefix}/bin/fsl-config --all --libs`" \
+    LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
+    LIBS="%{l_fsl_libs}" \
 %if "%{with_pam}" == "yes"
     CFLAGS="$CFLAGS -I`%{l_prefix}/etc/rc --query pam_incdir`" \
     CPPFLAGS="$CPPFLAGS -I`%{l_prefix}/etc/rc --query pam_incdir`" \
@@ -105,8 +110,7 @@ Provides:     POP
         $RPM_BUILD_ROOT%{l_prefix}/sbin \
         $RPM_BUILD_ROOT%{l_prefix}/man/man8 \
         $RPM_BUILD_ROOT%{l_prefix}/var/qpopper \
-        $RPM_BUILD_ROOT%{l_prefix}/etc/qpopper \
-        $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
+        $RPM_BUILD_ROOT%{l_prefix}/etc/qpopper
 
     #   install qpopper
     %{l_shtool} install -c -m 644 \
@@ -126,13 +130,20 @@ Provides:     POP
         -e 's;@l_musr@;%{l_musr};g' \
         -e 's;@l_mgrp@;%{l_mgrp};g' \
         %{SOURCE rc.qpopper} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
-    %{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \
-        %{SOURCE fsl.qpopper} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
 
-    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
-        '%config %{l_prefix}/etc/qpopper/qpopper.config' \
-        '%config %{l_prefix}/etc/fsl/fsl.qpopper' \
-        '%not %dir %{l_prefix}/etc/fsl'
+    #   OSSP fake syslog library
+    %{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.%{name}} \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+
+    #   determine installation files
+    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+        %{l_files_std} \
+        '%not %dir %{l_prefix}/etc/fsl' \
+        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
+        '%config %{l_prefix}/etc/qpopper/qpopper.config'
 
 %files -f files
 

sasl/sasl.spec

@@ -33,9 +33,10 @@ Distribution: OpenPKG [PLUS]
 Group:        Cryptography
 License:      BSD
 Version:      2.1.13
-Release:      20030530
+Release:      20030623
 
 #   package options
+%option       with_fsl    yes
 %option       with_pam    no
 %option       with_login  no
 %option       with_ldap   no
@@ -51,8 +52,12 @@ Patch0:       sasl.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030103, db >= 4.1.24, fsl, gcc, openssl
-PreReq:       OpenPKG, openpkg >= 20030103, db >= 4.1.24, fsl
+BuildPreReq:  OpenPKG, openpkg >= 20030415, db >= 4.1.24, gcc, openssl
+PreReq:       OpenPKG, openpkg >= 20030415, db >= 4.1.24
+%if "%{with_fsl}" == "yes"
+BuildPreReq:  fsl
+PreReq:       fsl
+%endif
 %if "%{with_pam}" == "yes"
 BuildPreReq:  PAM
 PreReq:       PAM
@@ -103,8 +108,8 @@ AutoReqProv:  no
 
     #   determine build flags
     cflags="%{l_cflags -O} %{l_cppflags}"
-    ldflags="%{l_ldflags} `%{l_prefix}/bin/fsl-config --all --ldflags`"
-    libs="-ldb `%{l_prefix}/bin/fsl-config --all --libs`"
+    ldflags="%{l_ldflags} %{l_fsl_ldflags}"
+    libs="-ldb %{l_fsl_libs}"
 %if "%{with_ldap}" == "yes"
     cflags="$cflags -DAUTH_LDAP"
 %endif
@@ -247,19 +252,18 @@ AutoReqProv:  no
         %{SOURCE rc.sasl} \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 
-    #   install OSSP fsl configuration
-    %{l_shtool} mkdir -f -p -m 755 \
-        $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
+    #   OSSP fake syslog library
+    %{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.sasl} \
+        %{SOURCE fsl.%{name}} \
         $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
 
     #   determine installation files
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
-        '%config %{l_prefix}/etc/fsl/fsl.sasl' \
         '%not %dir %{l_prefix}/etc/fsl' \
+        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
         '%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' \

sendmail/sendmail.spec

@@ -33,9 +33,10 @@ Distribution: OpenPKG [PLUS]
 Group:        Mail
 License:      BSD
 Version:      8.12.9
-Release:      20030612
+Release:      20030623
 
 #   package options
+%option       with_fsl      yes
 %option       with_tls      no
 %option       with_sasl     no
 %option       with_milter   no
@@ -53,8 +54,12 @@ Patch0:       sendmail-8.12.0-mysqlmap.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030516, m4, fsl, gcc, make, db >= 4.1.25
-PreReq:       OpenPKG, openpkg >= 20030516, m4, fsl, make, perl, procmail
+BuildPreReq:  OpenPKG, openpkg >= 20030516, m4, gcc, make, db >= 4.1.25
+PreReq:       OpenPKG, openpkg >= 20030516, m4, make, perl, procmail
+%if "%{with_fsl}" == "yes"
+BuildPreReq:  fsl
+PreReq:       fsl
+%endif
 %if "%{with_tls}" == "yes"
 BuildPreReq:  openssl
 %endif
@@ -155,7 +160,7 @@ Conflicts:    ssmtp, exim, postfix
           echo "APPENDDEF(\`confENVDEF', \`-DNEWDB')dnl"
           echo "APPENDDEF(\`confINCDIRS', \`-I%{l_prefix}/include')dnl"
           echo "APPENDDEF(\`confLIBDIRS', \`-L%{l_prefix}/lib')dnl"
-          echo "APPENDDEF(\`confLIBS', \`-lfsl -ldb')dnl"
+          echo "APPENDDEF(\`confLIBS', \`%{l_fsl_libs} -ldb')dnl"
           echo "define(\`confSTDIO_TYPE', \`portable')dnl"
           echo "APPENDDEF(\`confENVDEF', \`-DDNSMAP')dnl"
 %if "%{with_tls}" == "yes"
@@ -237,13 +242,6 @@ Conflicts:    ssmtp, exim, postfix
           $RPM_BUILD_ROOT%{l_prefix}/lib/
 %endif
 
-      #   install 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.sendmail} \
-          $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
-
       #   remember the Sendmail M4 stuff for re-configuration
       (%{l_tar} cf $RPM_BUILD_ROOT%{l_prefix}/etc/sendmail/cf.tar cf)
       compress $RPM_BUILD_ROOT%{l_prefix}/etc/sendmail/cf.tar
@@ -300,6 +298,13 @@ Conflicts:    ssmtp, exim, postfix
         $RPM_BUILD_ROOT%{l_prefix}/var/sendmail/clientmqueue/.hoststat
     touch $RPM_BUILD_ROOT%{l_prefix}/var/sendmail/sendmail.log
 
+    #   OSSP fake syslog library
+    %{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.%{name}} \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+
     #   adjust installation tree
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/man/cat*
     rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/sendmail/submit.cf
@@ -307,9 +312,11 @@ Conflicts:    ssmtp, exim, postfix
     strip $RPM_BUILD_ROOT%{l_prefix}/sbin/*             2>/dev/null || true
     strip $RPM_BUILD_ROOT%{l_prefix}/libexec/sendmail/* 2>/dev/null || true
 
-    #   determine file list
+    #   determine installation files
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
+        '%not %dir %{l_prefix}/etc/fsl' \
+        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
         '%attr(2755,%{l_susr},%{l_rgrp})        %{l_prefix}/sbin/sendmail' \
         '%attr(4755,%{l_susr},%{l_mgrp})        %{l_prefix}/bin/hoststat' \
         '%attr(4755,%{l_susr},%{l_mgrp})        %{l_prefix}/bin/mailq' \
@@ -322,8 +329,6 @@ Conflicts:    ssmtp, exim, postfix
         '%config %attr(644,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/sendmail/ca.crt' \
         '%config %attr(644,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/sendmail/sendmail.crt' \
         '%config %attr(600,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/sendmail/sendmail.key' \
-        '%config %{l_prefix}/etc/fsl/fsl.sendmail' \
-        '%not %dir %{l_prefix}/etc/fsl' \
         '%attr(700,%{l_susr},%{l_mgrp})         %{l_prefix}/var/sendmail/mqueue' \
         '%attr(700,%{l_susr},%{l_mgrp})         %{l_prefix}/var/sendmail/mqueue/.hoststat' \
         '%attr(770,%{l_rusr},%{l_rgrp})         %{l_prefix}/var/sendmail/clientmqueue' \

smtpfeed/smtpfeed.spec

@@ -33,7 +33,10 @@ Distribution: OpenPKG [BASE]
 Group:        Mail
 License:      GPL
 Version:      1.18
-Release:      20030530
+Release:      20030623
+
+#   package options
+%option       with_fsl yes
 
 #   list of sources
 Source0:      ftp://ftp.kyoto.wide.ad.jp/pub/mail/smtpfeed/smtpfeed-%{version}.tar.gz
@@ -44,8 +47,12 @@ Source3:      fsl.smtpfeed
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030516, fsl
-PreReq:       OpenPKG, openpkg >= 20030516, fsl
+BuildPreReq:  OpenPKG, openpkg >= 20030516
+PreReq:       OpenPKG, openpkg >= 20030516
+%if "%{with_fsl}" == "yes"
+BuildPreReq:  fsl
+PreReq:       fsl
+%endif
 AutoReq:      no
 AutoReqProv:  no
 
@@ -67,8 +74,8 @@ AutoReqProv:  no
           version.c
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags}" \
-      LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/fsl-config --all --ldflags`" \
-      LIBS="`%{l_prefix}/bin/fsl-config --all --libs`" \
+      LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
+      LIBS="%{l_fsl_libs}" \
       ./configure \
           --prefix=%{l_prefix}
       %{l_make} %{l_mflags -O}
@@ -77,9 +84,8 @@ AutoReqProv:  no
     #   build smtpfeed daemon
     ( cd smtpfeedd
       CC="%{l_cc}" \
-      CFLAGS="`%{l_prefix}/bin/fsl-config --cflags`" \
-      LDFLAGS="`%{l_prefix}/bin/fsl-config --all --ldflags`" \
-      LIBS="`%{l_prefix}/bin/fsl-config --all --libs`" \
+      LDFLAGS="%{l_fsl_ldflags}" \
+      LIBS="%{l_fsl_libs}" \
       ./configure
       %{l_make} %{l_mflags}
     )
@@ -88,7 +94,6 @@ AutoReqProv:  no
     rm -rf $RPM_BUILD_ROOT
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
-        $RPM_BUILD_ROOT%{l_prefix}/etc/fsl \
         $RPM_BUILD_ROOT%{l_prefix}/sbin \
         $RPM_BUILD_ROOT%{l_prefix}/man/man8 \
         $RPM_BUILD_ROOT%{l_prefix}/var/smtpfeed
@@ -104,11 +109,19 @@ AutoReqProv:  no
         smtpfeedd/smtpfeedd $RPM_BUILD_ROOT%{l_prefix}/sbin/
     %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
         %{SOURCE rc.smtpfeed} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
-    %{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \
-        %{SOURCE fsl.smtpfeed} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
-    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
-        '%config %{l_prefix}/etc/fsl/fsl.smtpfeed' \
-        '%not %dir %{l_prefix}/etc/fsl'
+
+    #   OSSP fake syslog library
+    %{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.%{name}} \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+
+    #   determine installation files
+    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+        %{l_files_std} \
+        '%not %dir %{l_prefix}/etc/fsl' \
+        '%config %{l_prefix}/etc/fsl/fsl.%{name}'
 
 %files -f files
 

teapop/teapop.spec

@@ -23,6 +23,8 @@
 ##  SUCH DAMAGE.
 ##
 
+#   FIXME thl fsl version requirement should disappear before release
+
 #   package information
 Name:         teapop
 Summary:      Teapop POP3-Server
@@ -33,7 +35,10 @@ Distribution: OpenPKG [PLUS]
 Group:        Mail
 License:      BSD
 Version:      0.3.5
-Release:      20030530
+Release:      20030623
+
+#   package options
+%option       with_fsl yes
 
 #   list of sources
 Source0:      http://www.toontown.org/pub/teapop/teapop-%{version}.tar.gz
@@ -43,8 +48,12 @@ Source2:      fsl.teapop
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030516, fsl >= 1.0.6, gcc, make
-PreReq:       OpenPKG, openpkg >= 20030516, fsl >= 1.0.6
+BuildPreReq:  OpenPKG, openpkg >= 20030516, gcc, make
+PreReq:       OpenPKG, openpkg >= 20030516
+%if "%{with_fsl}" == "yes"
+BuildPreReq:  fsl >= 1.0.6
+PreReq:       fsl >= 1.0.6
+%endif
 AutoReq:      no
 AutoReqProv:  no
 Provides:     POP
@@ -70,12 +79,11 @@ Provides:     POP
         teapop/teapop.c
 
 %build
-    #   Building Teapop with OSSP fsl
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags}" \
     CPPFLAGS="%{l_cppflags}" \
-    LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/fsl-config --all --ldflags`" \
-    LIBS="`%{l_prefix}/bin/fsl-config --all --libs`" \
+    LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
+    LIBS="%{l_fsl_libs}" \
     ./configure \
         --prefix=%{l_prefix} \
         --sysconfdir=%{l_prefix}/etc/teapop \
@@ -99,21 +107,23 @@ Provides:     POP
         -e 's;@l_susr@;%{l_susr};g' -e 's;@l_sgrp@;%{l_sgrp};g' \
         %{SOURCE rc.teapop} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 
-    #   Creating fsl directory
-    %{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.teapop} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+    #   OSSP fake syslog library
+    %{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.%{name}} \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
 
     #   Stripping installation
     rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/cronpopauth.pl \
         >/dev/null 2>&1 || true
 
-    #   Determining installation tree files
-    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
-        '%config %attr(0600,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/teapop/*' \
-        '%config %{l_prefix}/etc/fsl/fsl.teapop' \
-        '%not %dir %{l_prefix}/etc/fsl'
+    #   determine installation files
+    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+        %{l_files_std} \
+        '%not %dir %{l_prefix}/etc/fsl' \
+        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
+        '%config %attr(0600,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/teapop/*'
 
 %files -f files
 

vrrpd/vrrpd.spec

@@ -35,7 +35,10 @@ Distribution: OpenPKG [JUNK]
 Group:        Networking
 License:      BSD
 Version:      0.8.7
-Release:      20030525
+Release:      20030623
+
+#   package options
+%option       with_fsl  yes
 
 #   list of sources
 Source0:      http://www.bsdshell.net/download/freevrrpd-%{version}.tar.gz
@@ -46,8 +49,12 @@ Source3:      fsl.vrrpd
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030103, fsl
-PreReq:       OpenPKG, openpkg >= 20030103, fsl
+BuildPreReq:  OpenPKG, openpkg >= 20030415
+PreReq:       OpenPKG, openpkg >= 20030415
+%if "%{with_fsl}" == "yes"
+BuildPreReq:  fsl
+PreReq:       fsl
+%endif
 AutoReq:      no
 AutoReqProv:  no
 
@@ -67,7 +74,7 @@ AutoReqProv:  no
         -e 's;/usr/local/etc/freevrrpd.conf;%{l_prefix}/etc/vrrpd/vrrpd.conf;' \
         vrrp_define.h
     %{l_shtool} subst \
-        -e "s;^\\(LDADD=.*\\);\\1 `%{l_prefix}/bin/fsl-config --ldflags --libs`;" \
+        -e "s;^\\(LDADD=.*\\);\\1 %{l_fsl_ldflags} %{l_fsl_libs};" \
         Makefile
     case "%{l_target}" in
         *-freebsd* ) ;;
@@ -82,7 +89,6 @@ AutoReqProv:  no
         $RPM_BUILD_ROOT%{l_prefix}/sbin \
         $RPM_BUILD_ROOT%{l_prefix}/man/man8 \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
-        $RPM_BUILD_ROOT%{l_prefix}/etc/fsl \
         $RPM_BUILD_ROOT%{l_prefix}/etc/vrrpd \
         $RPM_BUILD_ROOT%{l_prefix}/var/vrrpd
     %{l_shtool} install -c -s -m 755 \
@@ -96,11 +102,19 @@ AutoReqProv:  no
         -e 's;@l_prefix@;%{l_prefix};' \
         -e 's;@l_susr@;%{l_susr};g' \
         %{SOURCE rc.vrrpd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+
+    #   OSSP fake syslog library
+    %{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};' \
-        %{SOURCE fsl.vrrpd} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+        -e 's;@l_prefix@;%{l_prefix};g' \
+        %{SOURCE fsl.%{name}} \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+
+    #   determine installation files
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
+        '%not %dir %{l_prefix}/etc/fsl' \
+        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
         '%config %{l_prefix}/etc/vrrpd/vrrpd.conf'
 
 %files -f files

whoson/whoson.spec

@@ -33,9 +33,10 @@ Distribution: OpenPKG [EVAL]
 Group:        Mail
 License:      GPL
 Version:      2.02a
-Release:      20030415
+Release:      20030623
 
 #   package options
+%option       with_fsl  yes
 %option       with_perl no
 
 #   list of sources
@@ -47,8 +48,12 @@ Patch0:       whoson.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030103, fsl
-PreReq:       OpenPKG, openpkg >= 20030103, fsl
+BuildPreReq:  OpenPKG, openpkg >= 20030415
+PreReq:       OpenPKG, openpkg >= 20030415
+%if "%{with_fsl}" == "yes"
+BuildPreReq:  fsl
+PreReq:       fsl
+%endif
 %if "%{with_perl}" == "yes"
 BuildPreReq:  perl, perl-openpkg
 PreReq:       perl, perl-openpkg
@@ -76,8 +81,8 @@ AutoReqProv:  no
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O}" \
     CPPFLAGS="%{l_cppflags}" \
-    LDFLAGS="%{l_ldflags} `%{l_prefix}/bin/fsl-config --all --ldflags`" \
-    LIBS="`%{l_prefix}/bin/fsl-config --all --libs`" \
+    LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
+    LIBS="%{l_fsl_libs}" \
     ./configure \
         --prefix="%{l_prefix}" \
         --with-config="%{l_prefix}/etc/whoson/whoson.conf" \
@@ -98,7 +103,6 @@ AutoReqProv:  no
 
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
-        $RPM_BUILD_ROOT%{l_prefix}/etc/fsl \
         $RPM_BUILD_ROOT%{l_prefix}/etc/whoson \
         $RPM_BUILD_ROOT%{l_prefix}/var/whoson/run \
         $RPM_BUILD_ROOT%{l_prefix}/var/whoson/log \
@@ -117,13 +121,18 @@ AutoReqProv:  no
         %{SOURCE rc.whoson} \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 
-    #   add fsl configuration
-    %{l_shtool} install -c -m 755 \
+    #   OSSP fake syslog library
+    %{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.whoson} \
+        %{SOURCE fsl.%{name}} \
         $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
 
-    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
+    #   determine installation files
+    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+        %{l_files_std} \
+        '%not %dir %{l_prefix}/etc/fsl' \
+        '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
         '%attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/whoson' \
         '%attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/whoson/run' \
         '%attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/whoson/log' \