rpms/sylpheed/F-9 sylpheed-2.5.0rc-desktop.patch, NONE, 1.1 sylpheed-2.5.0rc-summaryview.patch, NONE, 1.1 sylpheed-2.5.0rc-utf8.patch, NONE, 1.1 sylpheed.spec, 1.71, 1.72 sylpheed-2.4.7-desktop.patch, 1.1, NONE

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/pkgs/rpms/sylpheed/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23959

Modified Files:
	sylpheed.spec 
Added Files:
	sylpheed-2.5.0rc-desktop.patch 
	sylpheed-2.5.0rc-summaryview.patch sylpheed-2.5.0rc-utf8.patch 
Removed Files:
	sylpheed-2.4.7-desktop.patch 
Log Message:
sync with rawhide

sylpheed-2.5.0rc-desktop.patch:

--- NEW FILE sylpheed-2.5.0rc-desktop.patch ---
diff -Nur sylpheed-2.5.0rc-orig/sylpheed.desktop sylpheed-2.5.0rc/sylpheed.desktop
--- sylpheed-2.5.0rc-orig/sylpheed.desktop	2008-04-30 10:32:43.000000000 +0200
+++ sylpheed-2.5.0rc/sylpheed.desktop	2008-05-20 15:38:37.000000000 +0200
@@ -11,3 +11,4 @@
 Terminal=false
 Type=Application
 Categories=GTK;Network;Email;News;
+StartupWMClass=sylpheed

sylpheed-2.5.0rc-summaryview.patch:

--- NEW FILE sylpheed-2.5.0rc-summaryview.patch ---
diff -Nur sylpheed-2.5.0rc-orig/src/summaryview.c sylpheed-2.5.0rc/src/summaryview.c
--- sylpheed-2.5.0rc-orig/src/summaryview.c	2008-05-14 04:09:05.000000000 +0200
+++ sylpheed-2.5.0rc/src/summaryview.c	2008-05-22 11:04:27.000000000 +0200
@@ -5667,7 +5667,7 @@
 	if (path) {
 		gtk_tree_model_get_iter(GTK_TREE_MODEL(summaryview->store),
 					&iter, path);
-		g_free(path);
+		gtk_tree_path_free(path);
 		summary_display_msg(summaryview, &iter);
 	}
 

sylpheed-2.5.0rc-utf8.patch:

--- NEW FILE sylpheed-2.5.0rc-utf8.patch ---
diff -Nur sylpheed-2.5.0rc-orig/libsylph/codeconv.c sylpheed-2.5.0rc/libsylph/codeconv.c
--- sylpheed-2.5.0rc-orig/libsylph/codeconv.c	2007-12-07 09:33:36.000000000 +0100
+++ sylpheed-2.5.0rc/libsylph/codeconv.c	2008-06-05 09:51:18.000000000 +0200
@@ -1898,7 +1898,7 @@
 		return cur_charset;
 	}
 
-	if (strcasestr(cur_locale, "UTF-8")) {
+	if (strcasestr(cur_locale, "UTF-8") || strcasestr(cur_locale, "utf8")) {
 		cur_charset = C_UTF_8;
 		return cur_charset;
 	}


Index: sylpheed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sylpheed/F-9/sylpheed.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- sylpheed.spec	14 Apr 2008 09:59:52 -0000	1.71
+++ sylpheed.spec	5 Jun 2008 08:21:07 -0000	1.72
@@ -5,7 +5,7 @@
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
 Version: 2.5.0
-Release: 0.1.beta2
+Release: 0.5.rc
 License: GPLv2+
 URL: http://sylpheed.sraoss.jp/
 Group: Applications/Internet
@@ -17,15 +17,17 @@
 %{!?_without_ldap:BuildRequires: openldap-devel}
 %{?_with_jpilot:BuildRequires: jpilot-devel}
 BuildRequires: gtkspell-devel enchant-devel
-Source0: http://sylpheed.sraoss.jp/sylpheed/v2.5beta/sylpheed-2.5.0beta2.tar.bz2
+Source0: http://sylpheed.sraoss.jp/sylpheed/v2.5beta/sylpheed-2.5.0rc.tar.bz2
 #Source0: http://sylpheed.sraoss.jp/sylpheed/v2.4/%{name}-%{version}.tar.bz2
 Source1: sylpheed.1
 
 Patch1: sylpheed-2.4.6-defs.h.patch
-Patch2: sylpheed-2.4.7-desktop.patch
+Patch2: sylpheed-2.5.0rc-desktop.patch
 Patch3: sylpheed-2.3.1-certsdir.patch
 Patch4: sylpheed-2.2.5-prefs_common.patch
 Patch5: sylpheed-2.4.8-enchant.patch
+Patch6: sylpheed-2.5.0rc-summaryview.patch
+Patch7: sylpheed-2.5.0rc-utf8.patch
 
 # For xdg-open in patch1.
 Requires: xdg-utils
@@ -46,12 +48,14 @@
 See /usr/share/doc/sylpheed*/README for more information.
 
 %prep
-%setup -q -n sylpheed-2.5.0beta2
+%setup -q -n sylpheed-2.5.0rc
 %patch1 -p1 -b .defs.h
 %patch2 -p1 -b .desktop
 %patch3 -p1 -b .certsdir
 %patch4 -p1 -b .prefs_common
 %patch5 -p1 -b .enchant
+%patch6 -p1 -b .summaryview
+%patch7 -p1 -b .utf8
 
 %build
 %configure --enable-ssl %{!?_without_gpgme:--enable-gpgme} \
@@ -92,6 +96,23 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Jun  5 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.0-0.5.rc
+- Fix codeconv.c to support "utf8" locales and not just "UTF-8"
+  (fixes #450063).
+
+* Thu May 22 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.0-0.4.rc
+- Fix glibc double-free/invalidptr in src/summaryview.c
+  (assumably also fixes #447815).
+
+* Tue May 20 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.0-0.3.rc
+- Update to 2.5.0rc (bug-fixes, enhancements).
+
+* Thu May 15 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.0-0.2.beta3
+- desktop-file: validate for F9+
+
+* Fri Apr 25 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.0-0.1.beta3
+- Update to 2.5.0beta3 (two minor features added).
+
 * Mon Apr 14 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.0-0.1.beta2
 - Update to 2.5.0beta2 (several added features, few bug-fixes).
 


--- sylpheed-2.4.7-desktop.patch DELETED ---