rpms/squirrelmail/F-10 sources, 1.25, 1.26 squirrelmail-1.4.6-zenkaku-subject-convert.patch, 1.1, 1.2 squirrelmail.spec, 1.62, 1.63
Michal Hlavinka
mhlavink at fedoraproject.org
Tue May 12 08:23:33 UTC 2009
Author: mhlavink
Update of /cvs/extras/rpms/squirrelmail/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15551
Modified Files:
sources squirrelmail-1.4.6-zenkaku-subject-convert.patch
squirrelmail.spec
Log Message:
updated to 1.4.18
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/F-10/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources 4 Dec 2008 12:02:03 -0000 1.25
+++ sources 12 May 2009 08:23:02 -0000 1.26
@@ -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/F-10/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 08:23:02 -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/F-10/squirrelmail.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- squirrelmail.spec 18 Mar 2009 08:41:46 -0000 1.62
+++ squirrelmail.spec 12 May 2009 08:23:02 -0000 1.63
@@ -5,8 +5,8 @@
Summary: SquirrelMail webmail client
Name: squirrelmail
-Version: 1.4.17
-Release: 4%{?dist}
+Version: 1.4.18
+Release: 1%{?dist}
License: GPLv2+
URL: http://www.squirrelmail.org/
Group: Applications/Internet
@@ -16,16 +16,22 @@ Source2: squirrelmail-splash-fedora.png
Source3: squirrelmail-splash-rhel.png
Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.13-20071220.tar.bz2
Source5: config_local.php
-Patch1: squirrelmail-1.4.6-zenkaku-subject-convert.patch
-Patch2: squirrelmail-1.4.6-japanese-multibyte-view-text.patch
-Patch3: squirrelmail-1.4.6-japanese-multibyte-view-body.patch
-
-# from upstream, for squirrelmail <= 1.4.17, bug #427217
-# don't use white for highlighting = invisible for some color schemas
-Patch4: squirrelmail-1.4.17-highlight.patch
-# Taken from upstream
-Patch10: squirrelmail-1.4.15-tr-fix.patch
+# bug #196017
+Patch1: squirrelmail-1.4.6-zenkaku-subject-convert.patch
+
+# bug #195452
+Patch2: squirrelmail-1.4.6-japanese-multibyte-view-text.patch
+
+# bug #194457
+Patch3: squirrelmail-1.4.6-japanese-multibyte-view-body.patch
+
+# Taken from upstream - translation with this fix is not released yet
+Patch4: squirrelmail-1.4.15-tr-fix.patch
+
+# bug #450780 - sent upstream, available here:
+# http://sourceforge.net/tracker/index.php?func=detail&aid=1855717&group_id=311&atid=100311
+Patch5: squirrelmail-1.4.17-biguid.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -44,28 +50,28 @@ easy to configure and install.
%prep
%setup -q -n squirrelmail-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p3
+%patch1 -p1 -b .zenkaku
+%patch2 -p1 -b .jpmbtext
+%patch3 -p1 -b .jpmbbody
mkdir locale_tempdir
-cd locale_tempdir
+pushd locale_tempdir
tar xfj %SOURCE4
-%patch10 -p2
+%patch4 -p2
+popd
+
+%patch5 -p1 -b .biguid
%build
rm -f plugins/make_archive.pl
-# Clean up .orig files
-find -name '*.orig' -exec rm -f \{\} \;
-
# 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
for f in `find plugins -name "README*" -or -name INSTALL \
- -or -name CHANGES -or -name HISTORY`; do
+ -or -name CHANGES -or -name HISTORY`; do
mkdir -p doc/`dirname $f`
mv $f $_
done
@@ -80,7 +86,7 @@ perl -pi -e "s{\.\./}{}g" doc/index.html
echo "left_refresh=300" >> data/default_pref
for f in contrib/RPM/squirrelmail.cron contrib/RPM/config.php.redhat; do
perl -pi -e "s|__ATTDIR__|%{_localstatedir}/spool/squirrelmail/attach/|g;"\
- -e "s|__PREFSDIR__|%{_localstatedir}/lib/squirrelmail/prefs/|g;" $f
+ -e "s|__PREFSDIR__|%{_localstatedir}/lib/squirrelmail/prefs/|g;" $f
done
# Fix the version
@@ -120,34 +126,34 @@ cd locale_tempdir
for LOCALE in `ls locale/` ; do
SKIPINVALID=
case $LOCALE in
- ja_JP)
- # ja_JP uses iso2022-jp for email but euc-jp in its interface.
+ ja_JP)
+ # ja_JP uses iso2022-jp for email but euc-jp in its interface.
# But why!?!?
- CHARSET=euc-jp
- ;;
- ko_KR)
- # ko_KR has broken help files in indeterminate charset.
- # Assume it's _mostly_ EUC-KR as it's supposed to be, and let
- # iconv drop invalid characters from the input.
- SKIPINVALID=-c
- CHARSET=`grep CHARSET locale/$LOCALE/setup.php | cut -f6 -d\'`
- ;;
- *)
- CHARSET=`grep CHARSET locale/$LOCALE/setup.php | cut -f6 -d\'`
- ;;
+ CHARSET=euc-jp
+ ;;
+ ko_KR)
+ # ko_KR has broken help files in indeterminate charset.
+ # Assume it's _mostly_ EUC-KR as it's supposed to be, and let
+ # iconv drop invalid characters from the input.
+ SKIPINVALID=-c
+ CHARSET=`grep CHARSET locale/$LOCALE/setup.php | cut -f6 -d\'`
+ ;;
+ *)
+ CHARSET=`grep CHARSET locale/$LOCALE/setup.php | cut -f6 -d\'`
+ ;;
esac
# Check for locales where CHARSET isn't in LOCALE.
grep LOCALE locale/$LOCALE/setup.php | grep -vi $CHARSET || :
if [ "$CHARSET" != "utf-8" -a "$CHARSET" != "UTF-8" ]; then
- for a in `ls help/$LOCALE/ 2>/dev/null` ; do
+ for a in `ls help/$LOCALE/ 2>/dev/null` ; do
if [ "$LOCALE" == "ja_JP" ]; then continue; fi
- iconv $SKIPINVALID -f $CHARSET -t utf-8 help/$LOCALE/$a > $a.new && mv $a.new help/$LOCALE/$a
- done
- sed -e "s/CHARSET..[ ]*= [^;]*;/CHARSET'] = 'utf-8';/" \
- -e "s/LOCALE..[ ]*= [^;]*;/LOCALE'] = '$LOCALE.UTF-8';/" \
- locale/$LOCALE/setup.php > setup.php.new ; mv setup.php.new locale/$LOCALE/setup.php
+ iconv $SKIPINVALID -f $CHARSET -t utf-8 help/$LOCALE/$a > $a.new && mv $a.new help/$LOCALE/$a
+ done
+ sed -e "s/CHARSET..[ ]*= [^;]*;/CHARSET'] = 'utf-8';/" \
+ -e "s/LOCALE..[ ]*= [^;]*;/LOCALE'] = '$LOCALE.UTF-8';/" \
+ locale/$LOCALE/setup.php > setup.php.new ; mv setup.php.new locale/$LOCALE/setup.php
fi
done
@@ -155,7 +161,7 @@ done
for POFILE in `find locale -name \*.po` ; do
CHARSET=`grep charset= $POFILE | cut -f2 -d= | cut -f1 -d\\\\`
if [ "$CHARSET" != "utf-8" -a "$CHARSET" != "UTF-8" ]; then
- sed s/charset=$CHARSET/charset=utf-8/ $POFILE | iconv -f $CHARSET -t utf-8 > $POFILE.new && mv $POFILE.new $POFILE
+ sed s/charset=$CHARSET/charset=utf-8/ $POFILE | iconv -f $CHARSET -t utf-8 > $POFILE.new && mv $POFILE.new $POFILE
fi
done
for POFILE in `find . -name \*.po` ; do
@@ -206,8 +212,7 @@ install -m 0755 contrib/RPM/squirrelmail
# install the config file
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
-install -m 644 $RPM_SOURCE_DIR/squirrelmail.conf \
- $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
# move sqspell plugin config to /etc
rm -f $RPM_BUILD_ROOT%{_datadir}/squirrelmail/plugins/squirrelspell/sqspell_config.php
@@ -223,6 +228,14 @@ cp -r help/* $RPM_BUILD_ROOT%{_datadir}/
cd ..
rm $RPM_BUILD_ROOT%{_datadir}/squirrelmail/locale/README.locales
+#remove '\r' where needed
+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
+rm $RPM_BUILD_ROOT%{_datadir}/squirrelmail/locale/es_ES/LC_MESSAGES/serversidefilter.po.new
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -253,6 +266,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-4
- don't use white text (invisible on white paper) for highlighting
in conf.pl (#427217)
More information about the scm-commits
mailing list