This commit was manufactured by cvs2git to create tag 'AC-STABLE'.

Sprout from master 2006-08-14 21:17:06 UTC shadzik <shadzik@pld-linux.org> '- updated for 1.4.8'
Cherrypick from unlabeled-1.154.2 2007-03-19 23:27:54 UTC hawk <hawk@pld-linux.org> '- updated to 1.4.9a':
    squirrelmail.spec -> 1.154.2.1
Delete:
    squirrelmail-mail_fwd-Makefile.patch
    squirrelmail-retrieveuserdata-passwd.patch
    squirrelmail-ri_once.patch

diff --git a/squirrelmail-mail_fwd-Makefile.patch b/squirrelmail-mail_fwd-Makefile.patch
deleted file mode 100644 (file)
index a09f3ef..0000000
--- a/squirrelmail-mail_fwd-Makefile.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- squirrelmail-1.4.4-rc1.orig/plugins/mail_fwd/fwdfile/Makefile      2002-10-15 21:39:28.000000000 +0200
-+++ squirrelmail-1.4.4-rc1/plugins/mail_fwd/fwdfile/Makefile   2005-01-08 23:18:29.859102144 +0100
-@@ -1,4 +1,4 @@
--include config.mk
-+#include config.mk
- 
- OBJECTS = wfwd.o
- LIBS =

diff --git a/squirrelmail-retrieveuserdata-passwd.patch b/squirrelmail-retrieveuserdata-passwd.patch
deleted file mode 100644 (file)
index 1d7bc06..0000000
--- a/squirrelmail-retrieveuserdata-passwd.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- squirrelmail-1.4.5/plugins/retrieveuserdata/passwd.php~    2003-02-03 01:03:58.000000000 +0100
-+++ squirrelmail-1.4.5/plugins/retrieveuserdata/passwd.php     2005-08-09 16:53:30.683819224 +0200
-@@ -10,7 +10,9 @@
-    */
- 
-   function retrieve_data ($uid, $passwd) {
--  
-+
-+    global $domain;
-+
-     $error = 0;
-     
-     $result = posix_getpwnam( $uid );
-@@ -21,7 +23,7 @@
-        $error = 1;
-     }
-       
--    return array('error'=>$error, 'common_name'=>$common_name, 'mail_address'=>'');
-+    return array('error'=>$error, 'common_name'=>$common_name, 'mail_address'=>$uid . '@' . $domain);
- 
-   }
-    

diff --git a/squirrelmail-ri_once.patch b/squirrelmail-ri_once.patch
deleted file mode 100644 (file)
index b664d70..0000000
--- a/squirrelmail-ri_once.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ru squirrelmail-1.2.6/plugins/motd/setup.php plugins.AX/motd/setup.php
---- squirrelmail-1.2.6/plugins/motd/setup.php  Sat Apr 21 03:06:07 2001
-+++ plugins.AX/motd/setup.php  Fri May 24 11:17:08 2002
-@@ -1,3 +1,4 @@
-+<?php /* Modified at 1 places by ri_once */ ?>
- <?php
-    /*
-     *  motd v1.2
-@@ -21,7 +22,7 @@
-       $motd_file = "../config/motd.php";
- 
-       if(file_exists($motd_file)) {
--        include($motd_file);
-+        /* '_once' Added by ri_once */ include_once($motd_file);
-       }
-       else {
-       print "<hr width=\"50%\">";

diff --git a/squirrelmail.spec b/squirrelmail.spec
index 4bba782a7033f0838bc2321aabb40224e8f7f6a1..ef2b87b24f0198f72cf897b99c050d12c6bfd246 100644 (file)
--- a/squirrelmail.spec
+++ b/squirrelmail.spec
@@ -1,17 +1,17 @@
-#
 Summary:       The SquirrelMail, a WebMail package
 Summary(pl):   Wiewiórcza Poczta, Poczta przez WWW
 Summary(pt_BR):        O SquirrelMail é um webmail
 Name:          squirrelmail
-Version:       1.4.8
+Version:       1.4.9a
 Release:       1
 License:       GPL
 Group:         Applications/Mail
 Source0:       http://dl.sourceforge.net/squirrelmail/%{name}-%{version}.tar.bz2
-# Source0-md5: ba3306e4790bbdb10eaccb00195f5107
-%define                _all_locales_date       20060811
-Source1:       http://dl.sourceforge.net/squirrelmail/all_locales-%{version}-%{_all_locales_date}.tar.bz2
-# Source1-md5: 83774a3cd782bd2bd91f7f92f54c3e37
+# Source0-md5: 3adf66bfe2e816ba8375cf811d8ef3f6
+%define                _all_locales_version    1.4.9
+%define                _all_locales_date       20070106
+Source1:       http://dl.sourceforge.net/squirrelmail/all_locales-%{_all_locales_version}-%{_all_locales_date}.tar.bz2
+# Source1-md5: eaa0e8835b8d7d451500aad907c22e24
 %define                _compatibility_version  2.0.4
 Source2:       http://www.squirrelmail.org/plugins/compatibility-%{_compatibility_version}.tar.gz
 # Source2-md5: cfc3279a613b917fcba8200c596dadb0
@@ -26,12 +26,12 @@ URL:                http://www.squirrelmail.org/
 BuildRequires: bind-devel
 BuildRequires: gettext-devel
 BuildRequires: rpmbuild(macros) >= 1.264
-Requires:      php
-Requires:      php-gettext
-Requires:      php-pcre
-Requires:      php-posix
+Requires:      php(gettext)
+Requires:      php(pcre)
+Requires:      php(posix)
 Requires:      webapps
 Requires:      webserver
+Requires:      webserver(php)
 Provides:      squirrelmail-compatibility-%{_compatibility_version}
 Provides:      webmail
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -76,6 +76,7 @@ Summary:      A squirrel interface for various filters
 Summary(pl):   Wiewiórczy interfejs do ró¿nych filterów
 Group:         Applications/Mail
 Requires:      %{name} = %{version}-%{release}
+Provides:      squirremail-filters
 Provides:      webmail-filters
 Obsoletes:     squirremail-filters
 
@@ -91,6 +92,7 @@ Summary(pl):  Wiewi
 Group:         Applications/Mail
 Requires:      %{name} = %{version}-%{release}
 Requires:      ispell
+Provides:      squirrelmail-ispell
 Provides:      webmail-spellcheck
 Obsoletes:     squirrelmail-ispell
 
@@ -107,6 +109,7 @@ Summary:    A squirrel pop3 plug-in
 Summary(pl):   Wiewiórcza wtyczka pop3
 Group:         Applications/Mail
 Requires:      %{name} = %{version}-%{release}
+Provides:      squirrelmail-mailfetch
 Obsoletes:     squirrelmail-mailfetch
 
 %description -n %{name}-plugin-mailfetch
@@ -123,6 +126,8 @@ Summary(pl):        Wtyczka informuj
 Group:         Applications/Mail
 Requires:      %{name} = %{version}-%{release}
 Requires:      %{name}-plugin-ispell = %{version}-%{release}
+Provides:      squirrelmail-newmail
+Obsoletes:     squirrelmail-newmail
 
 %description -n %{name}-plugin-newmail
 A Squirrel new mail notify plug-in.
@@ -193,10 +198,10 @@ mv $RPM_BUILD_ROOT%{_squirreldir}/plugins/filters/bulkquery/INSTALL $RPM_BUILD_R
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%triggerin -- apache1
+%triggerin -- apache1 < 1.3.37-3, apache1-base
 %webapp_register apache %{_webapp}
 
-%triggerun -- apache1
+%triggerun -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
 %triggerin -- apache < 2.2.0, apache-base
@@ -295,6 +300,7 @@ fi
 %lang(sr) %{_squirreldir}/help/sr_YU
 %lang(sv) %{_squirreldir}/help/sv_SE
 #%lang(th) %{_squirreldir}/help/th_TH
+%lang(uk) %{_squirreldir}/help/uk_UA
 %lang(zh_CN) %{_squirreldir}/help/zh_CN
 %{_squirreldir}/images
 %{_squirreldir}/include
@@ -342,6 +348,7 @@ fi
 %lang(sk) %{_squirreldir}/locale/sk_SK
 %lang(sl) %{_squirreldir}/locale/sl_SI
 %lang(tr) %{_squirreldir}/locale/tr_TR
+%lang(uk) %{_squirreldir}/locale/uk_UA
 %lang(ug) %{_squirreldir}/locale/ug
 %lang(zh_CN) %{_squirreldir}/locale/zh_CN
 %lang(zh_TW) %{_squirreldir}/locale/zh_TW