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

  Server: cvs.openpkg.org                  Name:   Michael Schloh
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web          Date:   15-Jun-2003 20:00:36
  Branch: HEAD                             Handle: 2003061519003401

  Modified files:
    openpkg-src/squirrelmail
                            squirrelmail.spec
    openpkg-web             news.txt

  Log:
    modifying package: squirrelmail-1.4.0 20030615 again

  Summary:
    Revision    Changes     Path
    1.2         +35 -27     openpkg-src/squirrelmail/squirrelmail.spec
    1.4883      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/squirrelmail/squirrelmail.spec
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 squirrelmail.spec
  --- openpkg-src/squirrelmail/squirrelmail.spec        15 Jun 2003 11:55:49 -0000     
 1.1
  +++ openpkg-src/squirrelmail/squirrelmail.spec        15 Jun 2003 18:00:35 -0000     
 1.2
  @@ -23,15 +23,13 @@
   ##  SUCH DAMAGE.
   ##
   
  -#   ms: JUNK status, because package is totally untested.
  -
   #   package information
   Name:         squirrelmail
   Summary:      SquirrelMail Webmail Client
   URL:          http://www.squirrelmail.org/
   Vendor:       Squirrelmail Organization
   Packager:     The OpenPKG Project
  -Distribution: OpenPKG [JUNK]
  +Distribution: OpenPKG [EVAL]
   Group:        Mail
   License:      GPL
   Version:      1.4.0
  @@ -39,12 +37,13 @@
   
   #   list of sources
   Source0:      
http://download.sourceforge.net/squirrelmail/squirrelmail-%{version}.tar.bz2
  +Source1:      config.php
   
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20030103, perl, imapd, apache, 
apache::with_mod_php = yes
  -PreReq:       OpenPKG, openpkg >= 20030103, perl, imapd, apache, 
apache::with_mod_php = yes
  +BuildPreReq:  OpenPKG, openpkg >= 20030103
  +PreReq:       OpenPKG, openpkg >= 20030103, IMAP, MTA, apache, apache::with_mod_php 
= yes
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -79,7 +78,7 @@
       echo "left_refresh=300" >>data/default_pref
       %{l_shtool} subst \
           -e 
"s;__ATTDIR__;$RPM_BUILD_ROOT%{l_prefix}/var/squirrelmail/spool/attach/;g" \
  -        -e "s;__PREFSDIR__;$RPM_BUILD_ROOT%{l_prefix}/lib/squirrelmail/prefs/;g" \
  +        -e "s;__PREFSDIR__;$RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/prefs/;g" \
           contrib/RPM/config.php.redhat
   
   %build
  @@ -89,44 +88,53 @@
       #   create directory structure
       %{l_shtool} mkdir -f -p -m 755 \
           $RPM_BUILD_ROOT%{l_prefix}/bin \
  -        $RPM_BUILD_ROOT%{l_prefix}/etc/fsl \
  -        $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
           $RPM_BUILD_ROOT%{l_prefix}/etc/squirrelmail \
  -        $RPM_BUILD_ROOT%{l_prefix}/lib/squirrelmail/prefs \
  -        $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/config \
  +        $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/prefs \
           $RPM_BUILD_ROOT%{l_prefix}/var/squirrelmail/spool/attach
       #   install default_pref
       %{l_shtool} install -c -m 644 \
           data/default_pref \
  -        $RPM_BUILD_ROOT%{l_prefix}/lib/squirrelmail/prefs/
  +        $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/prefs/
       #   install the config files
       %{l_shtool} install -c -m 644 \
  -        config/*.pl \
  -        config/*.php \
  -        contrib/RPM/config.php.redhat \
  -        $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/config/
  -    #   rename default configuration
  -    mv -f \
  -        $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/config/config.php.redhat \
  -        $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/config/config.php
  -    #   install local config to both config and datadirs
  -    #   and install main index and contributed conf file
  +        -e 's;@l_prefix@;%{l_prefix};g' \
  +        -e "s;@l_fqdm@;`%{l_shtool} echo -e %h%d`;g" \
  +        %{SOURCE config.php} \
  +        config/config_default.php \
  +        $RPM_BUILD_ROOT%{l_prefix}/etc/squirrelmail/
       %{l_shtool} install -c -m 644 \
  -        index.php \
           config/config_local.php \
           $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/
  +    #   install the squirrelmail configuration perl script
  +    %{l_shtool} install -c -m 755 \
  +        config/conf.pl \
  +        $RPM_BUILD_ROOT%{l_prefix}/bin/squirrelconf
  +    #   install main index file to view in client browser
       %{l_shtool} install -c -m 644 \
  -        config/config_local.php \
  -        contrib/RPM/squirrelmail.conf \
  -        $RPM_BUILD_ROOT%{l_prefix}/etc/squirrelmail/
  +        index.php \
  +        $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/
       #   copy over the rest, a lot of stuff
  -    for dir in class functions help images include plugins src themes; do
  +    for dir in class functions help images include locale plugins src themes; do
           cp -rp $dir $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/
       done
  +    #   replace false config paths throught
  +    %{l_shtool} subst \
  +        -e "s;config/config.php;%{l_prefix}/etc/squirrelmail/config.php;g" \
  +        -e "s;require_once(SM_PATH \. 
\(.*\)%{l_prefix};require_once(\1%{l_prefix};g" \
  +        $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/functions/*.php \
  +        $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/include/*.php \
  +        $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/plugins/abook_take/*.php \
  +        $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/plugins/administrator/*.php \
  +        $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/plugins/calendar/*.php \
  +        $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/plugins/message_details/*.php 
\
  +        $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/plugins/squirrelspell/*.php \
  +        $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/src/*.php
       #   determine package ingredients and tag config files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
  -        '%config %{l_prefix}/etc/squirrelmail/*'
  +        '%config %{l_prefix}/etc/squirrelmail/*' \
  +        '%attr(755,%{l_nusr},%{l_ngrp}) %{l_prefix}/share/squirrelmail/prefs' \
  +        '%attr(755,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/squirrelmail/spool/attach'
   
   %files -f files
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.4882 -r1.4883 news.txt
  --- openpkg-web/news.txt      15 Jun 2003 11:55:48 -0000      1.4882
  +++ openpkg-web/news.txt      15 Jun 2003 18:00:34 -0000      1.4883
  @@ -1,3 +1,4 @@
  +15-Jun-2003: Upgraded package: P<squirrelmail-1.4.0-20030615>
   15-Jun-2003: New package: P<squirrelmail-1.4.0-20030615>
   15-Jun-2003: Upgraded package: P<minicom-2.1-20030615>
   15-Jun-2003: Upgraded package: P<gimp-1.2.5-20030615>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to