rpms/balsa/devel balsa-2.3.28-gmime.patch, NONE, 1.1 balsa.spec, 1.49, 1.50

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/balsa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14513

Modified Files:
	balsa.spec 
Added Files:
	balsa-2.3.28-gmime.patch 
Log Message:
* Thu Mar 19 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.3.28-4
- Patch for newer gmime
- Fix BRs


balsa-2.3.28-gmime.patch:

--- NEW FILE balsa-2.3.28-gmime.patch ---
Adjust for newer gmime (2.4.3)

Lubomir Rintel <lkundrak at v3.sk>

diff -up balsa-2.3.28/libbalsa/body.c.gmime balsa-2.3.28/libbalsa/body.c
--- balsa-2.3.28/libbalsa/body.c.gmime	2009-03-19 20:14:29.370533523 +0100
+++ balsa-2.3.28/libbalsa/body.c	2009-03-19 20:32:28.567533343 +0100
@@ -437,7 +437,7 @@ libbalsa_message_body_get_stream(LibBals
 
     if (body->message->mailbox) {
         GMimeDataWrapper *wrapper;
-        GMimePartEncodingType encoding;
+        GMimeContentEncoding encoding;
         if(!libbalsa_mailbox_get_message_part(body->message, body, err))
             return NULL;
 	
@@ -474,21 +474,21 @@ libbalsa_message_body_get_stream(LibBals
         encoding = g_mime_data_wrapper_get_encoding(wrapper);
 
         switch (encoding) {
-        case GMIME_PART_ENCODING_BASE64:
+        case GMIME_CONTENT_ENCODING_BASE64:
             filter =
-                g_mime_filter_basic_new_type(GMIME_CONTENT_ENCODING_BASE64,
+                g_mime_filter_basic_new(GMIME_CONTENT_ENCODING_BASE64,
 					     FALSE);
             stream =
                 libbalsa_message_body_stream_add_filter(stream, filter);
             break;
-        case GMIME_PART_ENCODING_QUOTEDPRINTABLE:
+        case GMIME_CONTENT_ENCODING_QUOTEDPRINTABLE:
             filter =
                 g_mime_filter_basic_new(GMIME_CONTENT_ENCODING_QUOTEDPRINTABLE,
 					FALSE);
             stream =
                 libbalsa_message_body_stream_add_filter(stream, filter);
             break;
-        case GMIME_PART_ENCODING_UUENCODE:
+        case GMIME_CONTENT_ENCODING_UUENCODE:
             filter =
                 g_mime_filter_basic_new(GMIME_CONTENT_ENCODING_UUENCODE, FALSE);
             stream =
@@ -643,7 +643,7 @@ libbalsa_message_body_save_stream(LibBal
 
             if (!GMIME_IS_STREAM_FILTER(stream)) {
                 GMimeStream *stream_filter =
-                    g_mime_stream_filter_new_with_stream(stream);
+                    g_mime_stream_filter_new(stream);
                 g_object_unref(stream);
                 stream = stream_filter;
             }
diff -up balsa-2.3.28/libbalsa/send.c.gmime balsa-2.3.28/libbalsa/send.c
--- balsa-2.3.28/libbalsa/send.c.gmime	2009-03-19 20:17:57.933534878 +0100
+++ balsa-2.3.28/libbalsa/send.c	2009-03-19 20:27:17.364534221 +0100
@@ -1771,13 +1771,13 @@ libbalsa_message_create_mime_message(Lib
 		mime_part =
 		    GMIME_OBJECT(g_mime_part_new_with_type(mime_type[0],
 				                           mime_type[1]));
-		g_mime_part_set_content_disposition(GMIME_PART(mime_part),
+		g_mime_object_set_disposition(mime_part,
 			body->attach_mode == LIBBALSA_ATTACH_AS_INLINE ?
 			GMIME_DISPOSITION_INLINE : GMIME_DISPOSITION_ATTACHMENT);
 		if(strcasecmp(mime_type[0],"text") != 0)
 		{
-		    g_mime_part_set_encoding(GMIME_PART(mime_part),
-			    GMIME_PART_ENCODING_BASE64);
+		    g_mime_part_set_content_encoding(GMIME_PART(mime_part),
+			    GMIME_CONTENT_ENCODING_BASE64);
 		} else {
 		    /* is text */
 		    g_mime_object_set_content_type_parameter(mime_part,


Index: balsa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/balsa/devel/balsa.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- balsa.spec	2 Mar 2009 22:12:14 -0000	1.49
+++ balsa.spec	19 Mar 2009 21:24:14 -0000	1.50
@@ -2,7 +2,7 @@
 
 Name:           balsa
 Version:        2.3.28
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Mail Client
 
 Group:          Applications/Internet
@@ -10,10 +10,12 @@
 URL:            http://balsa.gnome.org/
 Source0:        http://balsa.gnome.org/%{name}-%{version}.tar.bz2
 Patch1: 	balsa-gmime-537507.patch
+Patch2:         balsa-2.3.28-gmime.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: libesmtp >= 1.0.4
 Requires: scrollkeeper
+BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -28,6 +30,7 @@
 BuildRequires: libgnome-devel
 BuildRequires: libgnomeui-devel
 BuildRequires: libnotify-devel
+BuildRequires: libtool
 BuildRequires: openssl-devel
 BuildRequires: scrollkeeper
 
@@ -43,12 +46,13 @@
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 
 perl -pi -e 's,-DGTK_DISABLE_DEPRECATED,,g' libbalsa/Makefile* libinit_balsa/Makefile* src/Makefile*
 
 %build
 
-autoreconf
+autoreconf -f -i
 %configure %{config_opts}
 
 make %{?_smp_mflags}
@@ -108,6 +112,10 @@
 
 
 %changelog
+* Thu Mar 19 2009 Lubomir Rintel <lkundrak at v3.sk> - 2.3.28-4
+- Patch for newer gmime
+- Fix BRs
+
 * Mon Mar  2 2009 Pawel Salek <pawsa at theochem.kth.se> - 2.3.28-3
 - Add autoreconf, mock on devel does not work right now.