[CVS] OpenPKG: openpkg-src/squirrelmail/ squirrelmail.spec openpkg-web...

2003-06-28 Thread Ralf S. Engelschall
  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 openpkg-web  Date:   28-Jun-2003 15:00:50
  Branch: HEAD Handle: 2003062814004801

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

  Log:
just cosmetics: par(1) %description and add the usual blank line
before comments/blocks

  Summary:
RevisionChanges Path
1.7 +17 -7  openpkg-src/squirrelmail/squirrelmail.spec
1.5044  +1  -0  openpkg-web/news.txt
  

  patch -p0 '@@ .'
  Index: openpkg-src/squirrelmail/squirrelmail.spec
  
  $ cvs diff -u -r1.6 -r1.7 squirrelmail.spec
  --- openpkg-src/squirrelmail/squirrelmail.spec26 Jun 2003 13:21:08 - 
 1.6
  +++ openpkg-src/squirrelmail/squirrelmail.spec28 Jun 2003 13:00:49 - 
 1.7
  @@ -33,7 +33,7 @@
   Group:Mail
   License:  GPL
   Version:  1.4.0
  -Release:  20030626
  +Release:  20030628
   
   #   list of sources
   Source0:  
http://download.sourceforge.net/squirrelmail/squirrelmail-%{version}.tar.bz2
  @@ -50,16 +50,17 @@
   %description
   SquirrelMail is a standards-based webmail package written in
   PHP4. It includes built-in pure PHP support for the IMAP and
  -SMTP protocols, and all pages render in pure HTML 4.0 (with
  -no Javascript) for maximum compatibility across browsers. It
  -has very few requirements and is very easy to configure and
  -install. SquirrelMail has all the functionality you would
  -want from an email client, including strong MIME support,
  -address books, and folder manipulation.
  +SMTP protocols, and all pages render in pure HTML 4.0 (with no
  +Javascript) for maximum compatibility across browsers. It has
  +very few requirements and is very easy to configure and install.
  +SquirrelMail has all the functionality you would want from an email
  +client, including strong MIME support, address books, and folder
  +manipulation.
   
   %prep
   %setup -q
   rm -f plugins/make_archive.pl
  +
   #   rearrange the documentation
   mv AUTHORS ChangeLog COPYING INSTALL README UPGRADE doc/
   mv ReleaseNotes doc/ReleaseNotes.txt
  @@ -74,6 +75,7 @@
   mv plugins/squirrelspell/doc/* doc/plugins/squirrelspell
   rm -f doc/plugins/squirrelspell/index.php
   rm -rf plugins/squirrelspell/doc
  +
   #   fixup various files
   echo left_refresh=300 data/default_pref
   echo hour_format=1data/default_pref
  @@ -83,16 +85,19 @@
   
   %install
   rm -rf $RPM_BUILD_ROOT
  +
   #   create directory structure
   %{l_shtool} mkdir -f -p -m 755 \
   $RPM_BUILD_ROOT%{l_prefix}/bin \
   $RPM_BUILD_ROOT%{l_prefix}/etc/squirrelmail \
   $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}/share/squirrelmail/prefs/
  +
   #   install the config files
   %{l_shtool} install -c -m 644 \
   -e 's;@l_prefix@;%{l_prefix};g' \
  @@ -103,6 +108,7 @@
   %{l_shtool} install -c -m 644 \
   config/config_local.php \
   $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/
  +
   #   install the squirrelmail configuration perl script
   %{l_shtool} install -c -m 755 \
   -e 's;chdir($dir);chdir(%{l_prefix}/etc/squirrelmail);g' \
  @@ -111,14 +117,17 @@
   -e 's;config/config_local.php;config_local.php;g' \
   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 \
   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 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;SM_PATH \. \(.\)config/;\1%{l_prefix}/etc/squirrelmail/;g' \
  @@ -131,6 +140,7 @@
   $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/plugins/message_details/*.php 
\
   $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/plugins/squirrelspell/*.php \
   

[CVS] OpenPKG: openpkg-src/squirrelmail/ squirrelmail.spec openpkg-web...

2003-06-25 Thread Michael Schloh
  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:   25-Jun-2003 17:17:15
  Branch: HEAD Handle: 2003062516171301

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

  Log:
Fix config script with minimal substitutions, but is unfortunately an
incomplete solution

  Summary:
RevisionChanges Path
1.5 +5  -1  openpkg-src/squirrelmail/squirrelmail.spec
1.5013  +1  -0  openpkg-web/news.txt
  

  patch -p0 '@@ .'
  Index: openpkg-src/squirrelmail/squirrelmail.spec
  
  $ cvs diff -u -r1.4 -r1.5 squirrelmail.spec
  --- openpkg-src/squirrelmail/squirrelmail.spec16 Jun 2003 14:23:54 - 
 1.4
  +++ openpkg-src/squirrelmail/squirrelmail.spec25 Jun 2003 15:17:14 - 
 1.5
  @@ -33,7 +33,7 @@
   Group:Mail
   License:  GPL
   Version:  1.4.0
  -Release:  20030616
  +Release:  20030625
   
   #   list of sources
   Source0:  
http://download.sourceforge.net/squirrelmail/squirrelmail-%{version}.tar.bz2
  @@ -105,6 +105,10 @@
   $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/
   #   install the squirrelmail configuration perl script
   %{l_shtool} install -c -m 755 \
  +-e 's;chdir($dir);chdir(%{l_prefix}/etc/squirrelmail);g' \
  +-e 's;\.\./plugins;%{l_prefix}/share/squirrelmail/plugins;g' \
  +-e 's;\.\./themes;%{l_prefix}/share/squirrelmail/themes;g' \
  +-e 's;config/config_local.php;config_local.php;g' \
   config/conf.pl \
   $RPM_BUILD_ROOT%{l_prefix}/bin/squirrelconf
   #   install main index file to view in client browser
  @@ .
  patch -p0 '@@ .'
  Index: openpkg-web/news.txt
  
  $ cvs diff -u -r1.5012 -r1.5013 news.txt
  --- openpkg-web/news.txt  25 Jun 2003 13:36:34 -  1.5012
  +++ openpkg-web/news.txt  25 Jun 2003 15:17:13 -  1.5013
  @@ -1,3 +1,4 @@
  +25-Jun-2003: Upgraded package: Psquirrelmail-1.4.0-20030625
   25-Jun-2003: Upgraded package: Pnagios-1.1-20030625
   25-Jun-2003: Upgraded package: Popenpkg-tool-20030625-20030625
   25-Jun-2003: Upgraded package: Prt-3.0.3-20030625
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]


[CVS] OpenPKG: openpkg-src/squirrelmail/ squirrelmail.spec openpkg-web...

2003-06-16 Thread Michael Schloh
  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:   16-Jun-2003 10:47:39
  Branch: HEAD Handle: 2003061609473801

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

  Log:
Better default prefs, and remove unused redhat config

  Summary:
RevisionChanges Path
1.3 +5  -7  openpkg-src/squirrelmail/squirrelmail.spec
1.4889  +1  -0  openpkg-web/news.txt
  

  patch -p0 '@@ .'
  Index: openpkg-src/squirrelmail/squirrelmail.spec
  
  $ cvs diff -u -r1.2 -r1.3 squirrelmail.spec
  --- openpkg-src/squirrelmail/squirrelmail.spec15 Jun 2003 18:00:35 - 
 1.2
  +++ openpkg-src/squirrelmail/squirrelmail.spec16 Jun 2003 08:47:39 - 
 1.3
  @@ -27,13 +27,13 @@
   Name: squirrelmail
   Summary:  SquirrelMail Webmail Client
   URL:  http://www.squirrelmail.org/
  -Vendor:   Squirrelmail Organization
  +Vendor:   Squirrelmail Developers
   Packager: The OpenPKG Project
   Distribution: OpenPKG [EVAL]
   Group:Mail
   License:  GPL
   Version:  1.4.0
  -Release:  20030615
  +Release:  20030616
   
   #   list of sources
   Source0:  
http://download.sourceforge.net/squirrelmail/squirrelmail-%{version}.tar.bz2
  @@ -75,11 +75,9 @@
   rm -f doc/plugins/squirrelspell/index.php
   rm -rf plugins/squirrelspell/doc
   #   fixup various files
  -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}/share/squirrelmail/prefs/;g \
  -contrib/RPM/config.php.redhat
  +echo left_refresh=300 data/default_pref
  +echo hour_format=1data/default_pref
  +echo reply_citation_style=author_said data/default_pref
   
   %build
   
  @@ .
  patch -p0 '@@ .'
  Index: openpkg-web/news.txt
  
  $ cvs diff -u -r1.4888 -r1.4889 news.txt
  --- openpkg-web/news.txt  16 Jun 2003 06:32:16 -  1.4888
  +++ openpkg-web/news.txt  16 Jun 2003 08:47:38 -  1.4889
  @@ -1,3 +1,4 @@
  +16-Jun-2003: Upgraded package: Psquirrelmail-1.4.0-20030616
   16-Jun-2003: Upgraded package: Pscribus-0.9.11-20030616
   16-Jun-2003: Upgraded package: Pnetpbm-10.11.10-20030616
   16-Jun-2003: Upgraded package: Pdoxygen-1.3.2-20030616
  @@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]


[CVS] OpenPKG: openpkg-src/squirrelmail/ squirrelmail.spec openpkg-web...

2003-06-15 Thread Michael Schloh
  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:
RevisionChanges 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.spec15 Jun 2003 11:55:49 - 
 1.1
  +++ openpkg-src/squirrelmail/squirrelmail.spec15 Jun 2003 18:00:35 - 
 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/