rpms/cone/F-11 cone-gcc44.patch,1.1,1.2 cone.spec,1.29,1.30

[Miloš Jakubíček]

Author: mjakubicek

Update of /cvs/pkgs/rpms/cone/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13566/F-11

Modified Files:
	cone-gcc44.patch cone.spec 
Log Message:
- Updated cone-gcc44.patch according to upstream wishes.



cone-gcc44.patch:

Index: cone-gcc44.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cone/F-11/cone-gcc44.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cone-gcc44.patch	19 Apr 2009 00:23:26 -0000	1.1
+++ cone-gcc44.patch	19 Apr 2009 18:21:07 -0000	1.2
@@ -1,22 +1,23 @@
---- libmail/maildiradd.C.orig	2009-04-18 20:28:15.000000000 +0200
-+++ libmail/maildiradd.C	2009-04-18 20:28:33.000000000 +0200
-@@ -165,7 +165,7 @@
- 	if (flags.size() > 0)
- 	{
- 		newname = newname + MDIRSEP "2," + flags;
+--- libmail/maildiradd.C    24 May 2008 17:57:42 -0000    1.6
++++ libmail/maildiradd.C    19 Apr 2009 11:54:45 -0000
+@@ -165,7 +165,8 @@
+	if (flags.size() > 0)
+	{
+		newname = newname + MDIRSEP "2," + flags;
 -		memcpy(strrchr(newname.c_str(), '/')-3, "cur", 3);
-+		memcpy((void *) strrchr(newname.c_str(), '/')-3, "cur", 3);
- 		// We go into the cur directory, now
- 	}
- 
---- libmail/qp.C.orig	2009-04-18 21:50:00.000000000 +0200
-+++ libmail/qp.C	2009-04-18 21:50:03.000000000 +0200
++		memcpy(strrchr(const_cast<char *>(newname.c_str()), '/')-3,
++			"cur", 3);
+		// We go into the cur directory, now
+	}
+
+--- libmail/qp.C    27 May 2003 14:09:08 -0000    1.1
++++ libmail/qp.C    19 Apr 2009 11:54:46 -0000
 @@ -16,7 +16,7 @@
  {
- 	static const char xdigits[]="0123456789ABCDEFabcdef";
- 
+	static const char xdigits[]="0123456789ABCDEFabcdef";
+
 -	char *p=strchr(xdigits, c);
-+	char *p=strchr((char *) xdigits, c);
- 
- 	if (p == NULL)
- 		return -1;
++	const char *p=strchr(xdigits, c);
+
+	if (p == NULL)
+		return -1;


Index: cone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cone/F-11/cone.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- cone.spec	19 Apr 2009 00:23:26 -0000	1.29
+++ cone.spec	19 Apr 2009 18:21:07 -0000	1.30
@@ -3,7 +3,7 @@
 Summary:        CONE mail reader
 Name:           cone
 Version:        0.75
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 URL:            http://www.courier-mta.org/cone/
 Source0:        http://dl.sf.net/courier/%{name}-%{version}.tar.bz2
@@ -107,6 +107,9 @@
 %doc cone/html
 
 %changelog
+* Sun Apr 19 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.75-5
+- Updated cone-gcc44.patch according to upstream wishes.
+
 * Sat Apr 18 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.75-4
 - Fix FTBFS: added cone-gcc44.patch