commit mail-notification for openSUSE:Factory
Hello community, here is the log from the commit of package mail-notification for openSUSE:Factory checked in at Mon Aug 30 12:40:39 CEST 2010. -------- --- GNOME/mail-notification/mail-notification.changes 2010-08-09 23:59:04.000000000 +0200 +++ mail-notification/mail-notification.changes 2010-08-24 19:32:13.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Aug 24 12:32:26 UTC 2010 - fcrozat@novell.com + +- Patch to build mail-notification against gmime 2.4 (lp#297094). + Use gmime-2_4-devel BuildRequires instead of gmime-devel on + openSUSE 11.2 and later. +- Fix build on SLED11 SP1 and old versions of openSUSE by correctly + applying patches when needed. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- mail-notification-5.4-gmime.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mail-notification.spec ++++++ --- /var/tmp/diff_new_pack.ioL0uq/_old 2010-08-30 12:39:51.000000000 +0200 +++ /var/tmp/diff_new_pack.ioL0uq/_new 2010-08-30 12:39:51.000000000 +0200 @@ -20,7 +20,7 @@ Name: mail-notification Version: 5.4 -Release: 1 +Release: 2 License: GPL Summary: Status icon checking for new mail Url: http://www.nongnu.org/mailnotify/ @@ -30,10 +30,16 @@ Patch1: mail-notification-5.4-evo2.29.patch # PATCH-FIX-UPSTREAM mail-notification-5.4-missing-icons.patch lp557137 fcrozat@novell.com -- fix incorrect stock icons being used Patch2: mail-notification-5.4-missing-icons.patch +# PATCH-FIX-UPSTREAM mail-notification-5.4-gmime.patch lp297094 fcrozat@novell.com -- Fix build with gmime 2.4 +Patch3: mail-notification-5.4-gmime.patch BuildRequires: evolution-data-server-devel BuildRequires: evolution-devel BuildRequires: gconf2-devel +%if 0%{?suse_version} <= 1110 && ! 0%{?sles_version} BuildRequires: gmime-devel +%else +BuildRequires: gmime-2_4-devel +%endif BuildRequires: gnome-vfs2-devel BuildRequires: gtk2-devel BuildRequires: intltool @@ -69,10 +75,15 @@ %lang_package %prep %setup -q +%if %suse_version >= 1120 %patch1 -p1 -b .evolution-2.29 +%endif %if %suse_version >= 1130 %patch2 -p1 -b .incorrect-icons %endif +%if 0%{?suse_version} > 1110 || 0%{?sles_version} +%patch3 -p1 -b .gmime24 +%endif %build # See http://en.opensuse.org/Packaging/Fixing. @@ -81,7 +92,7 @@ %endif ./jb configure prefix=%{_prefix} \ -%if %suse_version == 1110 +%if %suse_version < 1130 cflags="$(pkg-config --cflags libgtkhtml-3.14 gtkhtml-editor)" \ %endif sysconfdir=%{_sysconfdir} \ ++++++ mail-notification-5.4-gmime.patch ++++++ diff -Nrbu mail-notification-5.4/build/src/mn-base-mbox-mailbox-backend.c mail-notification-5.4-OK/build/src/mn-base-mbox-mailbox-backend.c --- mail-notification-5.4/build/src/mn-base-mbox-mailbox-backend.c 2008-12-23 14:48:49.000000000 +0300 +++ mail-notification-5.4-OK/build/src/mn-base-mbox-mailbox-backend.c 2008-12-23 14:48:28.000000000 +0300 @@ -265,7 +265,7 @@ mime_message = g_mime_parser_construct_message(parser); if (mime_message) { - if (g_mime_message_get_header(mime_message, "X-Mozilla-Status")) + if (g_mime_object_get_header(mime_message, "X-Mozilla-Status")) { #if WITH_MOZILLA type = MN_TYPE_MOZILLA_MAILBOX_BACKEND; diff -Nrbu mail-notification-5.4/build/src/mn-mozilla-mailbox-backend.c mail-notification-5.4-OK/build/src/mn-mozilla-mailbox-backend.c --- mail-notification-5.4/build/src/mn-mozilla-mailbox-backend.c 2008-12-23 14:48:49.000000000 +0300 +++ mail-notification-5.4-OK/build/src/mn-mozilla-mailbox-backend.c 2008-12-23 14:46:47.000000000 +0300 @@ -167,7 +167,7 @@ const char *header; - header = g_mime_message_get_header(mime_message, header_name); + header = g_mime_object_get_header(mime_message, header_name); if (header && mn_str_ishex(header)) return strtol(header, NULL, 16); else diff -Nrbu mail-notification-5.4/jbsrc/jb.c mail-notification-5.4-OK/jbsrc/jb.c --- mail-notification-5.4/jbsrc/jb.c 2008-05-22 19:47:04.000000000 +0400 +++ mail-notification-5.4-OK/jbsrc/jb.c 2008-12-23 14:43:09.000000000 +0300 @@ -166,7 +166,7 @@ jb_require_packages("GNOME", "gnome", "glib-2.0 >= 2.14 gthread-2.0 gconf-2.0 >= 2.4.0 gtk+-2.0 >= 2.12 libgnomeui-2.0 >= 2.14.0 gnome-vfs-2.0 libglade-2.0 libxml-2.0 libnotify >= 0.4.1"); jb_require_packages("D-Bus", "dbus", "dbus-glib-1"); - jb_check_packages_for_options("GMime", "gmime", "gmime-2.0 >= 2.2.7", + jb_check_packages_for_options("GMime", "gmime", "gmime-2.4", "hotmail", "imap", "maildir", diff -Nrbu mail-notification-5.4/src/mn-message-mime.c mail-notification-5.4-OK/src/mn-message-mime.c --- mail-notification-5.4/src/mn-message-mime.c 2008-05-22 19:45:35.000000000 +0400 +++ mail-notification-5.4-OK/src/mn-message-mime.c 2008-12-23 14:46:35.000000000 +0300 @@ -33,12 +33,12 @@ g_return_val_if_fail(GMIME_IS_MESSAGE(mime_message), FALSE); /* SpamAssassin */ - spam = g_mime_message_get_header(mime_message, "X-Spam-Status"); + spam = g_mime_object_get_header(mime_message, "X-Spam-Status"); if (spam && mn_ascii_str_case_has_prefix(spam, "yes")) return TRUE; /* bogofilter */ - spam = g_mime_message_get_header(mime_message, "X-Bogosity"); + spam = g_mime_object_get_header(mime_message, "X-Bogosity"); if (spam && mn_ascii_str_case_has_prefix(spam, "yes")) return TRUE; @@ -89,7 +89,7 @@ { const char *status; - status = g_mime_message_get_header(mime_message, "Status"); + status = g_mime_object_get_header(mime_message, "Status"); if (status && strchr(status, 'R')) return NULL; /* the message was read */ else if (status && strchr(status, 'O')) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de