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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   07-May-2004 21:33:31
  Branch: HEAD                             Handle: 2004050720333100

  Modified files:
    openpkg-src/postfix     postfix.spec

  Log:
    qshape is now distributed with Postfix 2.1

  Summary:
    Revision    Changes     Path
    1.200       +14 -19     openpkg-src/postfix/postfix.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/postfix/postfix.spec
  ============================================================================
  $ cvs diff -u -r1.199 -r1.200 postfix.spec
  --- openpkg-src/postfix/postfix.spec  4 May 2004 05:59:30 -0000       1.199
  +++ openpkg-src/postfix/postfix.spec  7 May 2004 19:33:31 -0000       1.200
  @@ -40,7 +40,7 @@
   Group:        Mail
   License:      IPL
   Version:      %{V_postfix}
  -Release:      20040504
  +Release:      20040507
   
   #   package options
   %option       with_fsl       yes
  @@ -55,10 +55,9 @@
   Source0:      
ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-%{V_postfix}.tar.gz
   Source1:      ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/pfixtls-%{V_tls}.tar.gz
   Source2:      http://jimsun.linxnet.com/downloads/pflogsumm-%{V_pflogsumm}.tar.gz
  -Source3:      http://sbserv.stahl.bau.tu-bs.de/~hildeb/postfix/scripts/qshape
  -Source4:      etc.tar
  -Source5:      fsl.postfix
  -Source6:      rc.postfix
  +Source3:      etc.tar
  +Source4:      fsl.postfix
  +Source5:      rc.postfix
   Patch0:       postfix.patch
   Patch1:       postfix.patch.pfls
   Patch2:       
ftp://victor.teaser.fr/pub/lwa/postfix/postfix-%{V_whoson}-whoson.patch
  @@ -130,12 +129,6 @@
           url       = http://jimsun.linxnet.com/postfix_contrib.html
           regex     = pflogsumm-(__VER__)\.tar\.gz
       }
  -    prog postfix:qshape = {
  -        disabled
  -        comment   = "cs: no tracking possible"
  -        url       = http://sbserv.stahl.bau.tu-bs.de/~hildeb/postfix/scripts/
  -        regex     = qshape
  -    }
       prog postfix:whoson = {
           version   = %{V_whoson}
           url       = ftp://victor.teaser.fr/pub/lwa/postfix/
  @@ -149,7 +142,7 @@
       %setup -q -T -D -a 1
   %endif
       %setup -q -T -D -a 2
  -    %setup -q -T -D -a 4
  +    %setup -q -T -D -a 3
   
       #   apply vendor SSL/TLS patch
   %if "%{with_ssl}" == "yes"
  @@ -249,9 +242,6 @@
           manpage_directory=%{l_prefix}/man \
           mail_user=%{l_musr} \
           setgid_group=%{l_rgrp}
  -    %{l_shtool} install -c -m 755 \
  -        -e 's;/usr/sbin/sendmail;%{l_prefix}/sbin/sendmail;g' \
  -        auxiliary/rmail/rmail $RPM_BUILD_ROOT%{l_prefix}/sbin/rmail
   
       #   post-adjust binaries
       rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/mailq
  @@ -298,6 +288,15 @@
       ) || exit $?
   
       #   install addons
  +    %{l_shtool} install -c -m 755 \
  +        -e 's;/usr/sbin/sendmail;%{l_prefix}/sbin/sendmail;g' \
  +        auxiliary/rmail/rmail $RPM_BUILD_ROOT%{l_prefix}/sbin/rmail
  +    %{l_shtool} install -c -m 755 \
  +        -e 's;/usr/bin/perl;%{l_prefix}/bin/perl;g' \
  +        -e 's;postconf -h;%{l_prefix}/sbin/postconf -h;' \
  +        auxiliary/qshape/qshape.pl $RPM_BUILD_ROOT%{l_prefix}/sbin/qshape
  +    %{l_shtool} install -c -m 644 \
  +        man/man1/qshape.1 $RPM_BUILD_ROOT%{l_prefix}/man/man8/qshape.8
       ( cd pflogsumm-%{V_pflogsumm}
         %{l_shtool} install -c -m 755 \
             -e 's;/usr/bin/perl;%{l_prefix}/bin/perl;g' \
  @@ -305,10 +304,6 @@
         %{l_shtool} install -c -m 644 \
             pflogsumm.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
       ) || exit $?
  -    %{l_shtool} install -c -m 755 \
  -        -e 's;^#!/usr/bin/perl;#!%{l_prefix}/bin/perl;' \
  -        -e 's;/usr/sbin/postconf;%{l_prefix}/sbin/postconf;' \
  -        %{SOURCE qshape} $RPM_BUILD_ROOT%{l_prefix}/sbin/
   
       #   install run-command script
       %{l_shtool} mkdir -f -p -m 755 \
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to