rpms/squirrelmail/devel squirrelmail.spec,1.60,1.61

[Michal Hlavinka]

Author: mhlavink

Update of /cvs/extras/rpms/squirrelmail/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12562

Modified Files:
	squirrelmail.spec 
Log Message:
fix handling of big UIDs on 32bit systems
move plugins/demo to doc/



Index: squirrelmail.spec
===================================================================
RCS file: /cvs/extras/rpms/squirrelmail/devel/squirrelmail.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- squirrelmail.spec	20 Jan 2009 15:31:01 -0000	1.60
+++ squirrelmail.spec	23 Feb 2009 11:49:57 -0000	1.61
@@ -6,7 +6,7 @@
 Summary: SquirrelMail webmail client
 Name: squirrelmail
 Version: 1.4.17
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -16,13 +16,23 @@
 Source3: squirrelmail-splash-rhel.png
 Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.13-20071220.tar.bz2
 Source5: config_local.php
+
+# 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
+# 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
 BuildRequires: gettext
@@ -43,20 +53,22 @@
 %patch3 -p1
 
 mkdir locale_tempdir
-cd locale_tempdir
+pushd locale_tempdir
 tar xfj %SOURCE4
 %patch4 -p2
+popd
+
+%patch5 -p1
 
 %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 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
     mkdir -p doc/`dirname $f`
@@ -254,6 +266,10 @@
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Mon Feb 23 2009 Michal Hlavinka <mhlavink at redgat.com> - 1.4.17-2
+- fix: sm. can't handle big UIDs sent from dovecot on 32bit machines
+- move plugins/demo to doc directory
+
 * Thu Dec 04 2008 Michal Hlavinka <mhlavink at redhat.com> - 1.4.17-1
 - update to 1.4.17 (fixes CVE-2008-2379)