rpms/squirrelmail/devel .cvsignore, 1.24, 1.25 sources, 1.24, 1.25 squirrelmail-1.4.6-zenkaku-subject-convert.patch, 1.1, 1.2 squirrelmail.spec, 1.66, 1.67
Michal Hlavinka
mhlavink at fedoraproject.org
Tue May 12 07:55:20 UTC 2009
Author: mhlavink
Update of /cvs/extras/rpms/squirrelmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9553
Modified Files:
.cvsignore sources
squirrelmail-1.4.6-zenkaku-subject-convert.patch
squirrelmail.spec
Log Message:
updated to 1.4.18
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore 4 Dec 2008 14:00:17 -0000 1.24
+++ .cvsignore 12 May 2009 07:54:49 -0000 1.25
@@ -1,2 +1,2 @@
-squirrelmail-1.4.17.tar.bz2
all_locales-1.4.13-20071220.tar.bz2
+squirrelmail-1.4.18.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources 4 Dec 2008 14:00:18 -0000 1.24
+++ sources 12 May 2009 07:54:49 -0000 1.25
@@ -1,2 +1,2 @@
-6ff0df8ae0e7f13418ed37ea1c93f6f3 squirrelmail-1.4.17.tar.bz2
c6463312afcd602ae60fd8f388dfb8c2 all_locales-1.4.13-20071220.tar.bz2
+2df99afc1bc3b121296af65f52fbc5cc squirrelmail-1.4.18.tar.bz2
squirrelmail-1.4.6-zenkaku-subject-convert.patch:
Index: squirrelmail-1.4.6-zenkaku-subject-convert.patch
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/devel/squirrelmail-1.4.6-zenkaku-subject-convert.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- squirrelmail-1.4.6-zenkaku-subject-convert.patch 23 Jun 2006 20:39:43 -0000 1.1
+++ squirrelmail-1.4.6-zenkaku-subject-convert.patch 12 May 2009 07:54:49 -0000 1.2
@@ -4,14 +4,14 @@ kata-kana". Usually, if a user used "han
or header, any mail application would convert it to "zen-kaku kata-kana".
The squirrelmail also should convert.
-diff -urN squirrelmail-1.4.6.orig/functions/i18n.php squirrelmail-1.4.6/functions/i18n.php
---- squirrelmail-1.4.6.orig/functions/i18n.php 2006-02-10 15:30:31.000000000 -0500
-+++ squirrelmail-1.4.6/functions/i18n.php 2006-06-23 15:49:06.000000000 -0400
-@@ -487,6 +487,7 @@
- break;
- case 'encodeheader':
- $result = '';
-+ $ret = mb_convert_kana($ret, "KV");
- if (strlen($ret) > 0) {
- $tmpstr = mb_substr($ret, 0, 1);
- $prevcsize = strlen($tmpstr);
+diff -up squirrelmail-1.4.18/functions/i18n.php.zenkaku squirrelmail-1.4.18/functions/i18n.php
+--- squirrelmail-1.4.18/functions/i18n.php.zenkaku 2009-05-07 23:55:44.000000000 +0200
++++ squirrelmail-1.4.18/functions/i18n.php 2009-05-12 09:24:06.063892916 +0200
+@@ -625,6 +625,7 @@ function japanese_charset_xtra() {
+ $ret = encodeHeaderBase64(mb_convert_encoding($ret,'ISO-2022-JP','EUC-JP'),
+ 'iso-2022-jp');
+ }
++ $ret = mb_convert_kana($ret, "KV");
+ /**
+ * if text is in ascii, we leave it unchanged. If some ASCII
+ * chars must be encoded, add code here in else statement.
Index: squirrelmail.spec
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/devel/squirrelmail.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- squirrelmail.spec 18 Mar 2009 08:58:44 -0000 1.66
+++ squirrelmail.spec 12 May 2009 07:54:49 -0000 1.67
@@ -5,8 +5,8 @@
Summary: SquirrelMail webmail client
Name: squirrelmail
-Version: 1.4.17
-Release: 7%{?dist}
+Version: 1.4.18
+Release: 1%{?dist}
License: GPLv2+
URL: http://www.squirrelmail.org/
Group: Applications/Internet
@@ -33,10 +33,6 @@ Patch4: squirrelmail-1.4.15-tr-fix.patch
# http://sourceforge.net/tracker/index.php?func=detail&aid=1855717&group_id=311&atid=100311
Patch5: squirrelmail-1.4.17-biguid.patch
-# from upstream, for squirrelmail <= 1.4.17, bug #427217
-# don't use white for highlighting = invisible for some color schemas
-Patch6: squirrelmail-1.4.17-highlight.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: gettext
@@ -52,9 +48,9 @@ easy to configure and install.
%prep
%setup -q -n squirrelmail-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch1 -p1 -b .zenkaku
+%patch2 -p1 -b .jpmbtext
+%patch3 -p1 -b .jpmbbody
mkdir locale_tempdir
pushd locale_tempdir
@@ -62,15 +58,13 @@ tar xfj %SOURCE4
%patch4 -p2
popd
-%patch5 -p1
-%patch6 -p3
+%patch5 -p1 -b .biguid
%build
rm -f plugins/make_archive.pl
# Rearrange the documentation
-mv AUTHORS ChangeLog COPYING INSTALL README UPGRADE doc/
-mv ReleaseNotes doc/ReleaseNotes.txt
+mv README doc/
mv themes/README.themes doc/
mkdir -p doc/plugins
mv plugins/demo doc/plugins
@@ -233,8 +227,8 @@ cd ..
rm $RPM_BUILD_ROOT%{_datadir}/squirrelmail/locale/README.locales
#remove '\r' where needed
-sed -i 's/\r//' doc/ReleaseNotes/1.4/Notes-1.4.12.txt
-sed -i 's/\r//' doc/ReleaseNotes/1.4/Notes-1.4.13.txt
+sed -i 's/\r//' doc/release_notes_archive/1.4/Notes-1.4.12.txt
+sed -i 's/\r//' doc/release_notes_archive/1.4/Notes-1.4.13.txt
#remove unwanted files
rm $RPM_BUILD_ROOT%{_datadir}/squirrelmail/plugins/filters/bulkquery/bulkquery.c
@@ -271,6 +265,9 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/cron.daily/squirrelmail.cron
%changelog
+* Tue May 12 2009 Michal Hlavinka <mhlavink at redhat.com> - 1.4.18-1
+- updated to 1.4.18
+
* Wed Mar 18 2009 Michal Hlavinka <mhlavink at redhat.com> - 1.4.17-7
- fix: patch was not applyed
More information about the scm-commits
mailing list