rpms/sylpheed/devel sylpheed-2.5.0-svn2029.patch, NONE, 1.1 sylpheed.spec, 1.86, 1.87 sylpheed-2.4.8-enchant.patch, 1.2, NONE
Michael Schwendt (mschwendt)
fedora-extras-commits at redhat.com
Tue Jul 22 20:04:11 UTC 2008
- Previous message: rpms/kernel/F-9 linux-2.6-libata-acpi-fix-invalid-context-acpi.patch, NONE, 1.1 kernel.spec, 1.717, 1.718
- Next message: rpms/sylpheed/F-9 sylpheed-2.5.0-svn2029.patch, NONE, 1.1 sylpheed-2.5.0rc2-gtk-2.13.1.patch, NONE, 1.1 .cvsignore, 1.36, 1.37 sources, 1.36, 1.37 sylpheed.spec, 1.75, 1.76 sylpheed-2.4.8-enchant.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mschwendt
Update of /cvs/pkgs/rpms/sylpheed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16518
Modified Files:
sylpheed.spec
Added Files:
sylpheed-2.5.0-svn2029.patch
Removed Files:
sylpheed-2.4.8-enchant.patch
Log Message:
* Tue Jul 22 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.0-2.2029svn
- update to post-2.5.0 revision 2029
- upstream's IMAP LIST modifications move away from RFC 2683 (test this!)
sylpheed-2.5.0-svn2029.patch:
--- NEW FILE sylpheed-2.5.0-svn2029.patch ---
Index: libsylph/procmime.c
===================================================================
--- libsylph/procmime.c (revision 2012)
+++ libsylph/procmime.c (working copy)
@@ -782,9 +782,11 @@
}
if (mimeinfo->mime_type == MIME_APPLICATION_OCTET_STREAM &&
- mimeinfo->name) {
+ (mimeinfo->filename || mimeinfo->name)) {
const gchar *type;
- type = procmime_get_mime_type(mimeinfo->name);
+ type = procmime_get_mime_type
+ (mimeinfo->filename ? mimeinfo->filename
+ : mimeinfo->name);
if (type)
mimeinfo->mime_type = procmime_scan_mime_type(type);
}
Index: libsylph/codeconv.c
===================================================================
--- libsylph/codeconv.c (revision 2012)
+++ libsylph/codeconv.c (working copy)
@@ -154,6 +154,8 @@
state = JIS_UDC; \
}
+static ConvADType conv_ad_type = C_AD_BY_LOCALE;
+
static gchar *conv_jistoeuc(const gchar *inbuf, gint *error);
static gchar *conv_jistosjis(const gchar *inbuf, gint *error);
static gchar *conv_euctojis(const gchar *inbuf, gint *error);
@@ -1373,7 +1375,8 @@
/* auto detection mode */
if (!src_encoding && !dest_encoding) {
- if (conv_is_ja_locale())
+ if (conv_ad_type == C_AD_JAPANESE ||
+ (conv_ad_type == C_AD_BY_LOCALE && conv_is_ja_locale()))
return conv_anytodisp;
else
return conv_noconv;
@@ -2087,6 +2090,16 @@
return is_ja_locale != 0;
}
+void conv_set_autodetect_type(ConvADType type)
+{
+ conv_ad_type = type;
+}
+
+ConvADType conv_get_autodetect_type(void)
+{
+ return conv_ad_type;
+}
+
gchar *conv_unmime_header(const gchar *str, const gchar *default_encoding)
{
gchar *buf;
@@ -2105,7 +2118,8 @@
}
}
- if (conv_is_ja_locale())
+ if (conv_ad_type == C_AD_JAPANESE ||
+ (conv_ad_type == C_AD_BY_LOCALE && conv_is_ja_locale()))
buf = conv_anytodisp(str, NULL);
else
buf = conv_localetodisp(str, NULL);
Index: libsylph/codeconv.h
===================================================================
--- libsylph/codeconv.h (revision 2012)
+++ libsylph/codeconv.h (working copy)
@@ -95,6 +95,13 @@
C_ISO_8859_16
} CharSet;
+typedef enum
+{
+ C_AD_BY_LOCALE,
+ C_AD_NEVER,
+ C_AD_JAPANESE
+} ConvADType;
+
typedef gchar *(*CodeConvFunc) (const gchar *inbuf, gint *error);
struct _CodeConverter
@@ -224,6 +231,9 @@
const gchar *conv_get_current_locale (void);
gboolean conv_is_ja_locale (void);
+void conv_set_autodetect_type (ConvADType type);
+ConvADType conv_get_autodetect_type (void);
+
gchar *conv_unmime_header (const gchar *str,
const gchar *default_encoding);
void conv_encode_header (gchar *dest,
Index: libsylph/imap.c
===================================================================
--- libsylph/imap.c (revision 2012)
+++ libsylph/imap.c (working copy)
@@ -1,6 +1,6 @@
/*
* LibSylph -- E-Mail client library
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2008 Hiroyuki Yamamoto
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -183,6 +183,8 @@
static GSList *imap_parse_list (IMAPSession *session,
const gchar *real_path,
gchar *separator);
+static GSList *imap_add_inter_folders (GSList *item_list,
+ const gchar *root_path);
static GSList *imap_get_part_folder_list(GSList *item_list,
FolderItem *item);
@@ -1917,6 +1919,7 @@
imap_cmd_gen_send(session, "LIST \"\" \"%s\"", wildcard_path);
item_list = imap_parse_list(session, real_path, NULL);
+ item_list = imap_add_inter_folders(item_list, item->path);
g_free(real_path);
g_free(wildcard_path);
@@ -2013,6 +2016,82 @@
return item_list;
}
+static GSList *imap_add_inter_folders(GSList *item_list, const gchar *root_path)
+{
+ FolderItem *item;
+ GSList *cur;
+ GSList *add_list = NULL;
+ GHashTable *exist;
+ const gchar *p;
+ gint root_path_len = 0;
+
+ if (root_path)
+ root_path_len = strlen(root_path);
+
+ exist = g_hash_table_new(g_str_hash, g_str_equal);
+
+ for (cur = item_list; cur != NULL; cur = cur->next) {
+ item = FOLDER_ITEM(cur->data);
+
+ if (root_path_len > 0 &&
+ strncmp(root_path, item->path, root_path_len) != 0)
+ continue;
+ p = item->path + root_path_len;
+ if (root_path_len > 0 && *p != '/') continue;
+ while (*p == '/') p++;
+ if (*p == '\0') continue;
+ g_hash_table_insert(exist, (gpointer)p, GINT_TO_POINTER(1));
+ }
+
+ for (cur = item_list; cur != NULL; cur = cur->next) {
+ const gchar *q, *r;
+ gchar *parent, *full_parent;
+ FolderItem *new_item;
+
+ item = FOLDER_ITEM(cur->data);
+
+ if (root_path_len > 0 &&
+ strncmp(root_path, item->path, root_path_len) != 0)
+ continue;
+ p = item->path + root_path_len;
+ if (root_path_len > 0 && *p != '/') continue;
+ while (*p == '/') p++;
+ if (*p == '\0') continue;
+
+ q = p;
+ while ((q = strchr(q, '/')) != NULL) {
+ parent = g_strndup(p, q - p);
+ if (!g_hash_table_lookup(exist, parent)) {
+ if (root_path_len > 0)
+ full_parent = g_strconcat
+ (root_path, "/", parent, NULL);
+ else
+ full_parent = g_strdup(parent);
+ new_item = folder_item_new(g_basename(parent),
+ full_parent);
+ new_item->no_select = TRUE;
+ add_list = g_slist_prepend(add_list, new_item);
+ r = new_item->path + root_path_len;
+ while (*r == '/') r++;
+ g_hash_table_insert(exist, (gpointer)r,
+ GINT_TO_POINTER(1));
+ debug_print("intermediate folder '%s' added\n",
+ full_parent);
+ g_free(full_parent);
+ }
+ g_free(parent);
+ while (*q == '/') q++;
+ }
+ }
+
+ g_hash_table_destroy(exist);
+
+ add_list = g_slist_reverse(add_list);
+ item_list = g_slist_concat(item_list, add_list);
+
+ return item_list;
+}
+
static GSList *imap_get_part_folder_list(GSList *item_list, FolderItem *item)
{
FolderItem *cur_item;
Index: src/compose.c
===================================================================
--- src/compose.c (revision 2012)
+++ src/compose.c (working copy)
@@ -69,8 +69,12 @@
#if USE_GTKSPELL
# include <gtk/gtkradiomenuitem.h>
# include <gtkspell/gtkspell.h>
+#if USE_ENCHANT
+# include <enchant/enchant.h>
+#else
# include <aspell.h>
#endif
+#endif
#include <stdio.h>
#include <stdlib.h>
@@ -5296,6 +5300,7 @@
compose->check_spell = prefs_common.check_spell;
compose->spell_lang = g_strdup(prefs_common.spell_lang);
compose->spell_menu = spell_menu;
+ compose->dict_list = NULL;
#endif /* USE_GTKSPELL */
compose->focused_editable = NULL;
@@ -5732,8 +5737,37 @@
}
#if USE_GTKSPELL
+#if USE_ENCHANT
+static void ench_dict_desc_cb(const char *const lang_tag,
+ const char *const provider_name,
+ const char *const provider_desc,
+ const char *const provider_file,
+ void *user_data)
+{
+ GSList **dict_list = (GSList **)user_data;
+ *dict_list = g_slist_append(*dict_list, g_strdup((gchar*)lang_tag));
+}
+
static void compose_set_spell_lang_menu(Compose *compose)
{
+ EnchantBroker *eb;
+ GSList *dict_list = NULL, *menu_list = NULL, *cur;
+ GtkWidget *menu;
+ gboolean lang_set = FALSE;
+
+ eb = enchant_broker_init();
+ enchant_broker_list_dicts(eb, ench_dict_desc_cb, &dict_list);
+ enchant_broker_free(eb);
+
+ for (cur = dict_list; cur != NULL; cur = cur->next) {
+ if (compose->spell_lang != NULL &&
+ g_ascii_strcasecmp(compose->spell_lang,
+ (gchar *)cur->data) == 0)
+ lang_set = TRUE;
+ }
+#else /* !USE_ENCHANT */
+static void compose_set_spell_lang_menu(Compose *compose)
+{
AspellConfig *config;
AspellDictInfoList *dlist;
AspellDictInfoEnumeration *dels;
@@ -5748,13 +5782,16 @@
dels = aspell_dict_info_list_elements(dlist);
while ((entry = aspell_dict_info_enumeration_next(dels)) != 0) {
- dict_list = g_slist_append(dict_list, (gchar *)entry->name);
+ dict_list = g_slist_append(dict_list, g_strdup(entry->name));
if (compose->spell_lang != NULL &&
g_ascii_strcasecmp(compose->spell_lang, entry->name) == 0)
lang_set = TRUE;
}
delete_aspell_dict_info_enumeration(dels);
+#endif /* USE_ENCHANT */
+ compose->dict_list = dict_list;
+
menu = gtk_menu_new();
for (cur = dict_list; cur != NULL; cur = cur->next) {
@@ -5777,15 +5814,18 @@
g_object_set_data(G_OBJECT(item), "spell-lang", dict);
gtk_widget_show(item);
- if (!lang_set && g_ascii_strcasecmp("en", dict) == 0)
+ if (!lang_set && g_ascii_strcasecmp("en", dict) == 0) {
+ g_free(compose->spell_lang);
+ compose->spell_lang = g_strdup("en");
gtk_check_menu_item_set_active
(GTK_CHECK_MENU_ITEM(item), TRUE);
+ }
}
gtk_widget_show(menu);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(compose->spell_menu), menu);
}
-#endif
+#endif /* USE_GTKSPELL */
static void compose_set_template_menu(Compose *compose)
{
@@ -5924,6 +5964,8 @@
address_completion_end(compose->window);
#if USE_GTKSPELL
+ slist_free_strings(compose->dict_list);
+ g_slist_free(compose->dict_list);
g_free(compose->spell_lang);
#endif
@@ -7505,7 +7547,8 @@
GtkSpell *speller;
if (GTK_CHECK_MENU_ITEM(widget)->active) {
- debug_print("Spell checking enabled\n");
+ debug_print("Spell checking enabled: %s\n",
+ compose->spell_lang ? compose->spell_lang : "(none)");
speller = gtkspell_new_attach(GTK_TEXT_VIEW(compose->text),
compose->spell_lang, NULL);
compose->check_spell = TRUE;
Index: src/compose.h
===================================================================
--- src/compose.h (revision 2012)
+++ src/compose.h (working copy)
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2008 Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -133,9 +133,10 @@
GtkWidget *tmpl_menu;
#if USE_GTKSPELL
- GtkWidget *spell_menu;
- gchar *spell_lang;
- gboolean check_spell;
+ GtkWidget *spell_menu;
+ gchar *spell_lang;
+ gboolean check_spell;
+ GSList *dict_list;
#endif
ComposeMode mode;
Index: src/main.c
===================================================================
--- src/main.c (revision 2012)
+++ src/main.c (working copy)
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2008 Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -99,6 +99,10 @@
gchar *prog_version;
+#ifdef G_OS_WIN32
+static gboolean init_console_done = FALSE;
+#endif
+
static gint lock_socket = -1;
static gint lock_socket_tag = 0;
static GIOChannel *lock_ch = NULL;
@@ -130,9 +134,7 @@
static void setup_rc_dir (void);
static void check_gpg (void);
static void set_log_handlers (gboolean enable);
-#ifdef G_OS_WIN32
-static void process_win32_message (void);
-#endif
+static void register_system_events (void);
static gchar *get_socket_name (void);
static gint prohibit_duplicate_launch (void);
@@ -298,10 +300,6 @@
set_log_handlers(TRUE);
-#ifdef G_OS_WIN32
- process_win32_message();
-#endif
-
account_read_config_all();
account_set_menu();
main_window_reflect_prefs_all();
@@ -321,6 +319,8 @@
addressbook_read_file();
+ register_system_events();
+
inc_autocheck_timer_init(mainwin);
remote_command_exec();
@@ -335,7 +335,6 @@
#ifdef G_OS_WIN32
gint fd;
FILE *fp;
- static gboolean init_console_done = FALSE;
if (init_console_done)
return;
@@ -629,11 +628,6 @@
bind_textdomain_codeset(PACKAGE, CS_UTF_8);
textdomain(PACKAGE);
-#ifdef G_OS_UNIX
- /* ignore SIGPIPE signal for preventing sudden death of program */
- signal(SIGPIPE, SIG_IGN);
-#endif
-
#ifdef G_OS_WIN32
read_ini_file();
#endif
@@ -967,6 +961,15 @@
}
#ifdef G_OS_WIN32
+static BOOL WINAPI
+ctrl_handler(DWORD dwctrltype)
+{
+ log_print("ctrl_handler: received %d\n", dwctrltype);
+ app_will_exit(TRUE);
+
+ return TRUE;
+}
+
static LRESULT CALLBACK
wndproc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam)
{
@@ -996,16 +999,26 @@
return DefWindowProc(hwnd, message, wparam, lparam);
}
-static void process_win32_message(void)
+static void register_system_events(void)
{
WNDCLASS wclass;
static HWND hwnd = NULL;
+ static BOOL ctrl_handler_set = FALSE;
ATOM klass;
HINSTANCE hmodule = GetModuleHandle(NULL);
+ if (init_console_done && !ctrl_handler_set) {
+ debug_print("register_system_events(): SetConsoleCtrlHandler\n");
+ ctrl_handler_set = SetConsoleCtrlHandler(ctrl_handler, TRUE);
+ if (!ctrl_handler_set)
+ g_warning("SetConsoleCtrlHandler() failed\n");
+ }
+
if (hwnd)
return;
+ debug_print("register_system_events(): RegisterClass\n");
+
memset(&wclass, 0, sizeof(WNDCLASS));
wclass.lpszClassName = "sylpheed-observer";
wclass.lpfnWndProc = wndproc;
@@ -1020,6 +1033,44 @@
if (!hwnd)
UnregisterClass(MAKEINTRESOURCE(klass), hmodule);
}
+#else /* G_OS_WIN32 */
+static void sig_handler(gint signum)
+{
+ debug_print("signal %d received\n", signum);
+
+ switch (signum) {
+ case SIGHUP:
+ case SIGINT:
+ case SIGTERM:
+ case SIGQUIT:
+ app_will_exit(TRUE);
+ break;
+ default:
+ break;
+ }
+}
+
+static void register_system_events(void)
+{
+ struct sigaction sa;
+
+ memset(&sa, 0, sizeof(sa));
+ sa.sa_handler = sig_handler;
+ sa.sa_flags = SA_RESTART;
+
+ sigemptyset(&sa.sa_mask);
+ sigaddset(&sa.sa_mask, SIGHUP);
+ sigaddset(&sa.sa_mask, SIGINT);
+ sigaddset(&sa.sa_mask, SIGTERM);
+ sigaddset(&sa.sa_mask, SIGQUIT);
+ sigaddset(&sa.sa_mask, SIGPIPE);
+
+ sigaction(SIGHUP, &sa, NULL);
+ sigaction(SIGINT, &sa, NULL);
+ sigaction(SIGTERM, &sa, NULL);
+ sigaction(SIGQUIT, &sa, NULL);
+ sigaction(SIGPIPE, &sa, NULL);
+}
#endif
static gchar *get_socket_name(void)
Index: ChangeLog.ja
===================================================================
--- ChangeLog.ja (revision 2012)
+++ ChangeLog.ja (working copy)
@@ -1,3 +1,57 @@
+2008-07-16
+
+ * src/compose.[ch]: Enchant ¥µ¥Ý¡¼¥È¤ò½¤Àµ¡£
+ ¥æ¡¼¥¶»ØÄê¤Î¸À¸ì¤¬¥Þ¥Ã¥Á¤·¤Ê¤¤¾ì¹ç 'en' ¼½ñ¤ò¶¯À©»ØÄꤹ¤ë¤è¤¦¤Ë
+ ¤·¤¿¡£
+
+2008-07-10
+
+ * libsylph/imap.c: imap_add_inter_folders(): ¥¨¥é¡¼¥Á¥§¥Ã¥¯¤ÎÄɲá£
+
+2008-07-09
+
+ * libsylph/imap.c: imap_get_folder_list(): Ãæ´Ö¥Õ¥©¥ë¥À¤òÄɲ乤ë
+ ¤è¤¦¤Ë¤·¤¿(IMAP ¥µ¡¼¥Ð¤Ë¤è¤Ã¤Æ¤Ï 'LIST "" "*"' ¤Ç \NoSelect ¤Ê
+ ¿Æ¥Õ¥©¥ë¥À¤òÊÖ¤µ¤Ê¤¤¤¿¤á)¡£
+
+2008-07-04
+
+ * src/main.c: win32: console ¤¬½é´ü²½¤µ¤ì¤Æ¤¤¤Æ¤â¥¦¥£¥ó¥É¥¦
+ ¥á¥Ã¥»¡¼¥¸¤ò½èÍý¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+
+2008-07-04
+
+ * src/main.c: win32: console ctrl ¥¤¥Ù¥ó¥È¤ò½èÍý¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+ ¤¹¤Ù¤Æ¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ó¤À¸å¤Ë register_system_events()
+ ¤ò¸Æ¤Ö¤è¤¦¤Ë¤·¤¿¡£
+
+2008-06-27
+
+ * configure.in
+ src/compose.c: GtkSpell 2.0.13 (with Enchant) ¤ËÂбþ
+ (Michael Schwendt ¤µ¤ó thanks)¡£
+ * Makefile.am: ÉÔÍ×¤Ê ACLOCAL_AMFLAGS ¤òºï½ü¡£
+ * config.guess
+ ltmain.sh
+ config.sub: ¹¹¿·¡£
+
+2008-06-20
+
+ * src/main.c: Unix ¤Ç SIGHUP/SIGINT/SIGTERM/SIGQUIT ¥·¥°¥Ê¥ë¤ò½èÍý
+ ¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£´Ø¿ô¤ò Win32 ¤È¶¦Ä̲½¡£
+
+2008-06-19
+
+ * libsylph/codeconv.[ch]:
+ conv_set_autodetect_type()
+ conv_get_autodetect_type(): ʸ»ú¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤Î¼«Æ°È½Ê̤ÎÆ°ºî¤ò
+ Êѹ¹¤¹¤ë´Ø¿ô¤òÄɲá£
+
+2008-06-18
+
+ * libsylph/procmime.c: procmime_scan_mime_header(): ¥Õ¥¡¥¤¥ë¥¿¥¤¥×
+ ¤ò·èÄꤹ¤ë¤Î¤Ë MimeInfo::filename ¤â»ÈÍѤ¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+
2008-06-17
* version 2.5.0
Index: ChangeLog
===================================================================
--- ChangeLog (revision 2012)
+++ ChangeLog (working copy)
@@ -1,3 +1,55 @@
+2008-07-16
+
+ * src/compose.[ch]: fixed Enchant support.
+ Force 'en' dictionary if user-specified language doesn't match.
+
+2008-07-10
+
+ * libsylph/imap.c: imap_add_inter_folders(): more error checks.
+
+2008-07-09
+
+ * libsylph/imap.c: imap_get_folder_list(): add intermediate folders
+ because some IMAP servers don't return \NoSelect parent folders
+ at 'LIST "" "*"'.
+
+2008-07-04
+
+ * src/main.c: win32: handle window messages even if console is
+ initialized.
+
+2008-07-04
+
+ * src/main.c: win32: handle console ctrl events.
+ Call register_system_events() after all config files are read.
+
+2008-06-27
+
+ * configure.in
+ src/compose.c: supported GtkSpell 2.0.13 (with Enchant)
+ (thanks to Michael Schwendt).
+ * Makefile.am: removed unrequired ACLOCAL_AMFLAGS.
+ * config.guess
+ ltmain.sh
+ config.sub: updated.
+
+2008-06-20
+
+ * src/main.c: handle SIGHUP/SIGINT/SIGTERM/SIGQUIT signals on Unix,
+ and unified the function with Win32.
+
+2008-06-19
+
+ * libsylph/codeconv.[ch]:
+ conv_set_autodetect_type()
+ conv_get_autodetect_type(): added function to change the behavior
+ of character encoding auto-detection.
+
+2008-06-18
+
+ * libsylph/procmime.c: procmime_scan_mime_header(): also use
+ MimeInfo::filename to determine file type.
+
2008-06-17
* version 2.5.0
Index: sylpheed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sylpheed/devel/sylpheed.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- sylpheed.spec 17 Jun 2008 11:00:25 -0000 1.86
+++ sylpheed.spec 22 Jul 2008 20:03:24 -0000 1.87
@@ -5,7 +5,7 @@
Summary: GTK+ based, lightweight, and fast email client
Name: sylpheed
Version: 2.5.0
-Release: 1%{?dist}
+Release: 2.2029svn%{?dist}
License: GPLv2+
URL: http://sylpheed.sraoss.jp/
Group: Applications/Internet
@@ -28,10 +28,8 @@
Patch2: sylpheed-2.5.0rc-desktop.patch
Patch3: sylpheed-2.3.1-certsdir.patch
Patch4: sylpheed-2.2.5-prefs_common.patch
-%if 0%{?fedora} > 8
-Patch5: sylpheed-2.4.8-enchant.patch
-%endif
Patch6: sylpheed-2.5.0rc2-gtk-2.13.1.patch
+Patch7: sylpheed-2.5.0-svn2029.patch
# For xdg-open in patch1.
Requires: xdg-utils
@@ -52,15 +50,13 @@
See /usr/share/doc/sylpheed*/README for more information.
%prep
-%setup -q -n sylpheed-2.5.0
+%setup -q -n sylpheed-%{version}
%patch1 -p1 -b .defs.h
%patch2 -p1 -b .desktop
%patch3 -p1 -b .certsdir
%patch4 -p1 -b .prefs_common
-%if 0%{?fedora} > 8
-%patch5 -p1 -b .enchant
-%endif
%patch6 -p1 -b .gtk-2.13.1
+%patch7 -p0 -b .svn2029
%build
%configure --enable-ssl %{!?_without_gpgme:--enable-gpgme} \
@@ -69,6 +65,9 @@
%{?_with_oniguruma:--enable-oniguruma} \
%{?_with_jpilot:--enable-jpilot}
echo "#define LDAP_DEPRECATED 1" >> config.h
+%if 0%{?fedora} > 8
+echo "#define USE_ENCHANT 1" >> config.h
+%endif
make %{?_smp_mflags}
%install
@@ -104,6 +103,10 @@
%{_mandir}/man1/*
%changelog
+* Tue Jul 22 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.0-2.2029svn
+- update to post-2.5.0 revision 2029
+- upstream's IMAP LIST modifications move away from RFC 2683 (test this!)
+
* Tue Jun 17 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 2.5.0-1
- update to 2.5.0 final (a few translation updates)
--- sylpheed-2.4.8-enchant.patch DELETED ---
- Previous message: rpms/kernel/F-9 linux-2.6-libata-acpi-fix-invalid-context-acpi.patch, NONE, 1.1 kernel.spec, 1.717, 1.718
- Next message: rpms/sylpheed/F-9 sylpheed-2.5.0-svn2029.patch, NONE, 1.1 sylpheed-2.5.0rc2-gtk-2.13.1.patch, NONE, 1.1 .cvsignore, 1.36, 1.37 sources, 1.36, 1.37 sylpheed.spec, 1.75, 1.76 sylpheed-2.4.8-enchant.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list