rpms/squirrelmail/FC-3 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 squirrelmail.spec, 1.18, 1.19 squirrelmail-1.4.0-docs.patch, 1.1, NONE squirrelmail-1.4.3a-CAN-2004-1036-xss.patch, 1.1, NONE squirrelmail-1.4.3a-CAN-2005-0103-0104.patch, 1.1, NONE squirrelmail-1.4.3a-ja-20041014.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/squirrelmail/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv16540/FC-3

Modified Files:
	.cvsignore sources squirrelmail.spec 
Removed Files:
	squirrelmail-1.4.0-docs.patch 
	squirrelmail-1.4.3a-CAN-2004-1036-xss.patch 
	squirrelmail-1.4.3a-CAN-2005-0103-0104.patch 
	squirrelmail-1.4.3a-ja-20041014.patch 
Log Message:
auto-import squirrelmail-1.4.4-1.FC3 on branch FC-3 from squirrelmail-1.4.4-1.FC3.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/FC-3/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	14 Oct 2004 10:40:21 -0000	1.9
+++ .cvsignore	24 Mar 2005 23:24:12 -0000	1.10
@@ -1,2 +1,2 @@
-squirrelmail-1.4.3.tar.bz2
-squirrelmail-1.4.3a.tar.bz2
+all_locales-1.4.4-20050122.tar.bz2
+squirrelmail-1.4.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/FC-3/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	14 Oct 2004 10:40:21 -0000	1.9
+++ sources	24 Mar 2005 23:24:12 -0000	1.10
@@ -1 +1,2 @@
-9564fed8b8dc6fc75d5ac31825569a77  squirrelmail-1.4.3a.tar.bz2
+ec7f97d77c706135571732ac7accf961  all_locales-1.4.4-20050122.tar.bz2
+285b42bec8967b88ef3c083fcad18634  squirrelmail-1.4.4.tar.bz2


Index: squirrelmail.spec
===================================================================
RCS file: /cvs/dist/rpms/squirrelmail/FC-3/squirrelmail.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- squirrelmail.spec	1 Feb 2005 06:43:13 -0000	1.18
+++ squirrelmail.spec	24 Mar 2005 23:24:12 -0000	1.19
@@ -5,8 +5,8 @@
 
 Summary: SquirrelMail webmail client
 Name: squirrelmail
-Version: 1.4.3a
-Release: 8.FC3
+Version: 1.4.4
+Release: 1.FC3
 License: GPL
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -14,16 +14,14 @@
 Source1: squirrelmail.conf
 Source2: squirrelmail-splash-fedora.png
 Source3: squirrelmail-splash-rhel.png
-Patch1: squirrelmail-1.4.0-docs.patch
+Source4: all_locales-1.4.4-20050122.tar.bz2
 Patch2: squirrelmail-1.4.3-config.patch
-Patch4: squirrelmail-1.4.3a-ja-20041014.patch
-Patch5: squirrelmail-1.4.3a-CAN-2004-1036-xss.patch
-Patch6: squirrelmail-1.4.3a-CAN-2005-0103-0104.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
 Requires: httpd, php >= 4.0.4, perl, tmpwatch >= 2.8, aspell
 Requires: /usr/sbin/sendmail
 Prereq: httpd, perl
+Provides: squirrelmail-i18n
 
 %description
 SquirrelMail is a standards-based webmail package written in PHP4. It
@@ -36,11 +34,7 @@
 
 %prep
 %setup -q
-%patch1 -p0
 %patch2 -p0
-%patch4 -p1
-%patch5 -p0
-%patch6 -p2
 rm -f plugins/make_archive.pl
 
 # Rearrange the documentation
@@ -57,6 +51,7 @@
 mv plugins/squirrelspell/doc/* doc/plugins/squirrelspell
 rm -f doc/plugins/squirrelspell/index.php
 rmdir plugins/squirrelspell/doc
+perl -pi -e "s/\.\.//g" doc/index.html
 
 # Fixup various files
 echo "left_refresh=300" >> data/default_pref
@@ -76,11 +71,6 @@
 cp %{SOURCE3} images/sm_logo.png
 %endif
 
-# Compile ja_JP local po file updated by Masato's patch.
-cd po/
-./compilepo ja_JP
-cd -
-
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p -m0755 $RPM_BUILD_ROOT%{_sysconfdir}/squirrelmail
@@ -130,11 +120,20 @@
 install -m 644 $RPM_SOURCE_DIR/squirrelmail.conf \
    $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
 
+# install locales
+mkdir locale_tempdir
+cd locale_tempdir
+tar xfj %SOURCE4
+find -name '*.po' |xargs rm
+cp -r locale/* $RPM_BUILD_ROOT%{_datadir}/squirrelmail/locale/
+cp -r images/* $RPM_BUILD_ROOT%{_datadir}/squirrelmail/images/
+cp -r help/* $RPM_BUILD_ROOT%{_datadir}/squirrelmail/help/
+cd -
+rm $RPM_BUILD_ROOT%{_datadir}/squirrelmail/locale/README.locales
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-,root,root)
 %config %dir %{_sysconfdir}/squirrelmail
@@ -162,12 +161,12 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
-* Mon Jan 31 2005 Warren Togami <wtogami at redhat.com> 1.4.3a-8.FC3
-- CAN-2005-0103 for cross site scripting
-- CAN-2005-0104 for code injectian via unsanitised integer variable
-
-* Fri Nov 19 2004 Warren Togami <wtogami at redhat.com> 1.4.3a-6.FC3
-- FC3
+* Thu Jan 27 2005 Warren Togami <wtogami at redhat.com> 1.4.4-2
+- 1.4.4
+- re-include translations and Provide squirrelmail-i18n
+  better compatible with upstream, but we cannot split sub-package
+  due to support of existing distributions
+- remove unnecessary .po files
 
 * Fri Nov 19 2004 Warren Togami <wtogami at redhat.com> 1.4.3a-7
 - CAN-2004-1036 Cross Site Scripting in encoded text


--- squirrelmail-1.4.0-docs.patch DELETED ---


--- squirrelmail-1.4.3a-CAN-2004-1036-xss.patch DELETED ---


--- squirrelmail-1.4.3a-CAN-2005-0103-0104.patch DELETED ---


--- squirrelmail-1.4.3a-ja-20041014.patch DELETED ---