From f387d761a64a98d1358fadbf310f29b59d5221b1 Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Dec 11 2006 23:13:41 +0000 Subject: - cleanups - add patches --- diff --git a/claws-mail-2.6.1cvs15.patch b/claws-mail-2.6.1cvs15.patch new file mode 100644 index 0000000..60300b0 --- /dev/null +++ b/claws-mail-2.6.1cvs15.patch @@ -0,0 +1,17 @@ +--- src/prefs_account.c 2006/12/11 17:23:54 1.105.2.71 ++++ src/prefs_account.c 2006/12/11 17:55:28 1.105.2.72 +@@ -2521,6 +2521,14 @@ + alertpanel_error(_("POP3 server is not entered.")); + return -1; + } ++ if (protocol == A_POP3) { ++ const gchar *mailbox = gtk_entry_get_text(GTK_ENTRY(receive.inbox_entry)); ++ FolderItem *inbox = folder_find_item_from_identifier(mailbox); ++ if (inbox == NULL) { ++ alertpanel_error(_("The default inbox folder doesn't exist.")); ++ return -1; ++ } ++ } + if (protocol == A_IMAP4 && + *gtk_entry_get_text(GTK_ENTRY(basic.recvserv_entry)) == '\0') { + alertpanel_error(_("IMAP4 server is not entered.")); diff --git a/claws-mail-2.6.1cvs16.patch b/claws-mail-2.6.1cvs16.patch new file mode 100644 index 0000000..3f9581d --- /dev/null +++ b/claws-mail-2.6.1cvs16.patch @@ -0,0 +1,80 @@ +--- src/wizard.c 2006/12/05 09:22:12 1.1.2.40 ++++ src/wizard.c 2006/12/11 18:08:08 1.1.2.41 +@@ -545,7 +545,9 @@ + PrefsAccount *prefs_account = prefs_account_new(); + GList *account_list = NULL; + GtkWidget *menu, *menuitem; +- ++ gchar *smtp_server, *recv_server; ++ gint smtp_port, recv_port; ++ + menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(wizard->recv_type)); + menuitem = gtk_menu_get_active(GTK_MENU(menu)); + prefs_account->protocol = GPOINTER_TO_INT +@@ -641,21 +643,42 @@ + prefs_account->account_name = g_strdup_printf("%s", + gtk_entry_get_text(GTK_ENTRY(wizard->recv_server))); + ++ recv_server = g_strdup(gtk_entry_get_text(GTK_ENTRY(wizard->recv_server))); ++ smtp_server = g_strdup(gtk_entry_get_text(GTK_ENTRY(wizard->smtp_server))); ++ ++ if (prefs_account->protocol != A_LOCAL && strstr(recv_server, ":")) { ++ recv_port = atoi(strstr(recv_server, ":")+1); ++ *(strstr(recv_server, ":")) = '\0'; ++ if (prefs_account->protocol == A_IMAP4) { ++ prefs_account->set_imapport = TRUE; ++ prefs_account->imapport = recv_port; ++ } else if (prefs_account->protocol == A_POP3) { ++ prefs_account->set_popport = TRUE; ++ prefs_account->popport = recv_port; ++ } ++ } ++ if (strstr(smtp_server, ":")) { ++ smtp_port = atoi(strstr(smtp_server, ":")+1); ++ *(strstr(smtp_server, ":")) = '\0'; ++ prefs_account->set_smtpport = TRUE; ++ prefs_account->smtpport = smtp_port; ++ } ++ + prefs_account->name = g_strdup( + gtk_entry_get_text(GTK_ENTRY(wizard->full_name))); + prefs_account->address = g_strdup( + gtk_entry_get_text(GTK_ENTRY(wizard->email))); + prefs_account->organization = g_strdup( + gtk_entry_get_text(GTK_ENTRY(wizard->organization))); +- prefs_account->smtp_server = g_strdup( +- gtk_entry_get_text(GTK_ENTRY(wizard->smtp_server))); ++ prefs_account->smtp_server = g_strdup(smtp_server); + + if (prefs_account->protocol != A_LOCAL) +- prefs_account->recv_server = g_strdup( +- gtk_entry_get_text(GTK_ENTRY(wizard->recv_server))); ++ prefs_account->recv_server = g_strdup(recv_server); + else +- prefs_account->local_mbox = g_strdup( +- gtk_entry_get_text(GTK_ENTRY(wizard->recv_server))); ++ prefs_account->local_mbox = g_strdup(recv_server); ++ ++ g_free(recv_server); ++ g_free(smtp_server); + + prefs_account->userid = g_strdup( + gtk_entry_get_text(GTK_ENTRY(wizard->recv_username))); +Index: src/prefs_account.c +=================================================================== +RCS file: /pack/anoncvs/sylpheedclaws/sylpheed-claws/src/prefs_account.c,v +retrieving revision 1.105.2.72 +retrieving revision 1.105.2.73 +diff -u -r1.105.2.72 -r1.105.2.73 +--- src/prefs_account.c 2006/12/11 17:55:28 1.105.2.72 ++++ src/prefs_account.c 2006/12/11 18:08:08 1.105.2.73 +@@ -2521,7 +2521,7 @@ + alertpanel_error(_("POP3 server is not entered.")); + return -1; + } +- if (protocol == A_POP3) { ++ if (protocol == A_POP3 || protocol == A_LOCAL) { + const gchar *mailbox = gtk_entry_get_text(GTK_ENTRY(receive.inbox_entry)); + FolderItem *inbox = folder_find_item_from_identifier(mailbox); + if (inbox == NULL) { + diff --git a/claws-mail.spec b/claws-mail.spec index f0dda72..1d27ac9 100644 --- a/claws-mail.spec +++ b/claws-mail.spec @@ -7,6 +7,8 @@ License: GPL URL: http://claws.sylpheed.org Source0: http://dl.sf.net/sylpheed-claws/claws-mail-2.6.1.tar.bz2 Source1: claws-mail.desktop +Patch0: claws-mail-2.6.1cvs15.patch +Patch1: claws-mail-2.6.1cvs16.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: flex, bison BuildRequires: glib-devel >= 2.6.2 @@ -26,7 +28,8 @@ BuildRequires: pkgconfig BuildRequires: gettext-devel BuildRequires: libetpan-devel >= 0.48 BuildRequires: libgnomeprintui22-devel -Obsoletes: sylpheed-claws +Obsoletes: sylpheed-claws <= 2.6.0 +Provides: sylpheed-claws = %{version}-%{release} %description Claws Mail is an email client (and news reader), based on GTK+, featuring @@ -37,33 +40,37 @@ intuitive operation, abundant features, extensibility Summary: Development package for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Obsoletes: sylpheed-claws-devel <= 2.6.0 %description devel The %{name}-devel package contains the header files and pkgconfig file needed for development with %{name}. %package plugins-clamav -Summary: Clamav antivirus plugin for sylpheed-claws +Summary: Clamav antivirus plugin for claws-mail Group: Applications/Internet Requires: %{name} = %{version}-%{release} +Obsoletes: sylpheed-claws-devel <= 2.6.0 %description plugins-clamav %{summary} %package plugins-dillo -Summary: Dillo HTML viewer plugin for sylpheed-claws +Summary: Dillo HTML viewer plugin for claws-mail Group: Applications/Internet Requires: %{name} = %{version}-%{release} Requires: dillo +Obsoletes: sylpheed-claws-plugins-dillo <= 2.6.0 %description plugins-dillo %{summary} %package plugins-spamassassin -Summary: Spamassassin plugin for sylpheed-claws +Summary: Spamassassin plugin for claws-mail Group: Applications/Internet Requires: %{name} = %{version}-%{release} Requires: spamassassin +Obsoletes: sylpheed-claws-plugins-spamassassin <= 2.6.0 %description plugins-spamassassin %{summary} @@ -72,20 +79,24 @@ Requires: spamassassin Summary: PGP plugin for signing and encrypting mail Group: Applications/Internet Requires: %{name} = %{version}-%{release} +Obsoletes: sylpheed-claws-plugins-pgp <= 2.6.0 %description plugins-pgp %{summary} %package plugins-bogofilter -Summary: Bogofilter plugin for sylpheed-claws +Summary: Bogofilter plugin for claws-mail Group: Applications/Internet Requires: %{name} = %{version}-%{release} +Obsoletes: sylpheed-claws-plugins-bogofilter <= 2.6.0 %description plugins-bogofilter %{summary} %prep %setup -q +%patch0 +%patch1 %build %configure --enable-openssl --enable-ipv6 \ @@ -172,6 +183,7 @@ ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png 2.6.1-1 - version upgrade - package is now named claws-mail instead of sylpheed-claws +- fix #218190, #218187 * Mon Nov 06 2006 Andreas Bierfert 2.6.0-1