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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   07-Aug-2007 16:29:00
  Branch: HEAD                             Handle: 2007080715285900

  Modified files:
    openpkg-src/squirrelmail
                            squirrelmail.spec

  Log:
    package cosmetics and cleanups

  Summary:
    Revision    Changes     Path
    1.60        +13 -13     openpkg-src/squirrelmail/squirrelmail.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/squirrelmail/squirrelmail.spec
  ============================================================================
  $ cvs diff -u -r1.59 -r1.60 squirrelmail.spec
  --- openpkg-src/squirrelmail/squirrelmail.spec        22 Jun 2007 11:01:44 
-0000      1.59
  +++ openpkg-src/squirrelmail/squirrelmail.spec        7 Aug 2007 14:28:59 
-0000       1.60
  @@ -23,7 +23,7 @@
   ##
   
   #   package version
  -%define       V_sqmail              1.4.10a
  +%define       V_squirrelmail        1.4.10a
   %define       V_locale              1.4.9-20070106
   %define       V_plugin_compat       2.0.7-1.0
   %define       V_plugin_logger       1.4.0-1.0.6
  @@ -50,14 +50,14 @@
   Class:        EVAL
   Group:        Mail
   License:      GPL
  -Version:      %{V_sqmail}
  -Release:      20070622
  +Version:      %{V_squirrelmail}
  +Release:      20070807
   
   #   package options
   %option       with_plugins  no
   
   #   list of sources
  -Source0:      
http://switch.dl.sourceforge.net/squirrelmail/squirrelmail-%{version}.tar.bz2
  +Source0:      
http://switch.dl.sourceforge.net/squirrelmail/squirrelmail-%{V_squirrelmail}.tar.bz2
   Source1:      
http://switch.dl.sourceforge.net/squirrelmail/all_locales-%{V_locale}.tar.bz2
   Source2:      
http://www.squirrelmail.org/plugins/compatibility-%{V_plugin_compat}.tar.gz
   Source3:      
http://www.squeaksoft.com/products/SquirrelLogger/squirrel_logger.%{V_plugin_logger}.tar.gz
  @@ -85,8 +85,8 @@
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
   BuildPreReq:  OpenPKG, openpkg >= 20060823
  -PreReq:       OpenPKG, openpkg >= 20060823, imapd, MTA, apache
  -PreReq:       apache-php, apache-php::with_xml = yes
  +PreReq:       OpenPKG, openpkg >= 20060823
  +PreReq:       MTA, apache, apache-php, apache-php::with_xml = yes
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -102,7 +102,7 @@
   
   %track
       prog squirrelmail = {
  -        version   = %{V_sqmail}
  +        version   = %{V_squirrelmail}
           url       = http://prdownloads.sourceforge.net/squirrelmail/
           regex     = squirrelmail-(\d+\.[02468]\.\d+[a-z]?)\.tar\.bz2
       }
  @@ -187,8 +187,8 @@
       %setup -q -D -T -a 1 -c -n squirrelmail/all_locales-%{V_locale}
       %setup -q -D -T -a 2 -n squirrelmail
       %setup -q -D -T -a 3 -n squirrelmail
  -    mv compatibility squirrelmail-%{V_sqmail}/plugins
  -    mv squirrel_logger squirrelmail-%{V_sqmail}/plugins
  +    mv compatibility squirrelmail-%{V_squirrelmail}/plugins
  +    mv squirrel_logger squirrelmail-%{V_squirrelmail}/plugins
   %if "%{with_plugins}" == "yes"
       %setup -q -D -T -a 4 -n squirrelmail
       %setup -q -D -T -a 5 -n squirrelmail
  @@ -207,17 +207,17 @@
       for plug in addgraphics avelsieve check_quota chg_sasl_passwd \
                   folder_sizes gpg ldifimport pupdate show_user_and_ip \
                   smallcal vkeyboard username; do
  -        mv $plug squirrelmail-%{V_sqmail}/plugins
  +        mv $plug squirrelmail-%{V_squirrelmail}/plugins
       done
   %endif
   
       #   clean up login screen of distractions
  -    ( cd squirrelmail-%{V_sqmail}
  +    ( cd squirrelmail-%{V_squirrelmail}
         %patch -p0
       ) || exit $?
   
       #   rearrange documentation and remove archive script
  -    ( cd squirrelmail-%{V_sqmail}
  +    ( cd squirrelmail-%{V_squirrelmail}
         mv AUTHORS ChangeLog COPYING INSTALL README UPGRADE doc/
         mv ReleaseNotes doc/ReleaseNotes.txt
         mv themes/README.themes doc/
  @@ -264,7 +264,7 @@
       ) || exit $?
   
       #   install program
  -    ( cd squirrelmail-%{V_sqmail}
  +    ( cd squirrelmail-%{V_squirrelmail}
   
         #   install default_pref
         %{l_shtool} install -c -m 644 \
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to