OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Michael Schloh
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   11-Sep-2002 14:39:11
  Branch: HEAD                             Handle: 2002091113391000

  Added files:
    openpkg-src/petidomo    fsl.petidomo
  Modified files:
    openpkg-src/petidomo    petidomo.spec

  Log:
    Added fsl logic to buildconf, and removed fakesyslog conditional inclusion.

  Summary:
    Revision    Changes     Path
    1.1         +16 -0      openpkg-src/petidomo/fsl.petidomo
    1.24        +14 -18     openpkg-src/petidomo/petidomo.spec
  ____________________________________________________________________________

  Index: openpkg-src/petidomo/fsl.petidomo
  ============================================================
  $ cvs update -p -r1.1 fsl.petidomo
  ##
  ##  fsl.petidomo -- OSSP fsl configuration for petidomo
  ##
  
  ident (petidomo)/.+ q{
      prefix(
          prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
      ) 
      -> {
          debug: file(
              path="@l_prefix@/var/petidomo/petidomo.log",
              append=1, perm=0644
          )
      }
  }
  
  Index: openpkg-src/petidomo/petidomo.spec
  ============================================================
  $ cvs diff -u -r1.23 -r1.24 petidomo.spec
  --- openpkg-src/petidomo/petidomo.spec        26 Aug 2002 09:39:43 -0000      1.23
  +++ openpkg-src/petidomo/petidomo.spec        11 Sep 2002 12:39:10 -0000      1.24
  @@ -33,18 +33,17 @@
   Group:        Mail
   License:      GPL
   Version:      4.0b1
  -Release:      20020625
  +Release:      20020911
   
   #   list of sources
   Source0:      ftp://ftp.ossp.org/pkg/tool/petidomo/petidomo-%{version}.tar.gz
   Source1:      etc.petidomo.tar
  -Source2:      fakesyslog.tar.gz
   
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206, bison, flex
  -PreReq:       OpenPKG, openpkg >= 20020206, MTA
  +BuildPreReq:  OpenPKG, openpkg >= 20020206, fsl, bison, flex
  +PreReq:       OpenPKG, openpkg >= 20020206, fsl, MTA
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -52,27 +51,20 @@
       Petidomo is a mailing list manager very similar to the popular
       package Majordomo. It handles both list un-/subscription and the
       address expansion of list postings. The actual delivery of postings
  -    is still performed by an MTA like Sendmail.
  +    is performed by an MTA like Sendmail.
   
   %prep
       %setup0 -q -c
       %setup1 -q -T -D -a 1
  -    %setup2 -q -T -D -a 2
   
   %build
  -    fakesyslogdir="`pwd`/fakesyslog"
  -    ( cd fakesyslog
  -      CC="%{l_cc}" \
  -      CFLAGS="%{l_cflags -O}" \
  -      ./configure \
  -          --with-logfile=%{l_prefix}/var/petidomo/petidomo.log
  -      %{l_make} %{l_mflags}
  -    )
  +    #   build petidomo
       ( cd petidomo-%{version}
         CC="%{l_cc}" \
  -      CFLAGS="%{l_cflags -O}" \
  -      LDFLAGS="-L$fakesyslogdir -lfakesyslog" \
  -      LIBS="-lfakesyslog" \
  +      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`" \
         ./configure \
             --prefix=%{l_prefix} \
             --sysconfdir=%{l_prefix}/etc/petidomo
  @@ -91,6 +83,8 @@
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/petidomo
       %{l_shtool} install -c -m 644 \
           /dev/null $RPM_BUILD_ROOT%{l_prefix}/var/petidomo/petidomo.log
  +    %{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \
  +        %{SOURCE fsl.petidomo} $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
       ( cd etc.petidomo
         l_hostname=`%{l_shtool} echo -e '%h%d'`
         %{l_shtool} install -c -m - \
  @@ -101,7 +95,9 @@
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
           '%config %{l_prefix}/etc/petidomo/*' \
  -        '%attr(6755,%{l_musr},%{l_mgrp}) %{l_prefix}/bin/petidomo'
  +        '%attr(6755,%{l_musr},%{l_mgrp}) %{l_prefix}/bin/petidomo' \
  +        '%config %{l_prefix}/etc/fsl/fsl.smtpfeed' \
  +        '%not %dir %{l_prefix}/etc/fsl'
   
   %files -f files
   
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to