rpms/cone/devel cone-0.60-gcc34.patch,NONE,1.1 cone.spec,1.2,1.3

[Michael Schwendt (mschwendt)]

Changeset from: mschwendt

Update of /cvs/extras/rpms/cone/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv12096

Modified Files:
	cone.spec 
Added Files:
	cone-0.60-gcc34.patch 
Log Message:
Fix build for FC3/GCC 3.4.

cone-0.60-gcc34.patch:

--- NEW FILE cone-0.60-gcc34.patch ---
diff -Nur cone-0.60-orig/libmail/addressbookget.C cone-0.60/libmail/addressbookget.C
--- cone-0.60-orig/libmail/addressbookget.C	2004-05-30 04:43:00.000000000 +0200
+++ cone-0.60/libmail/addressbookget.C	2004-11-12 18:12:55.000000000 +0100
@@ -260,5 +260,5 @@
 	addressBookLineMap.insert(make_pair(hdr, text));
 }
 
-template mail::addressbook::GetAddressList<mail::address>;
-template mail::addressbook::GetAddressList<mail::emailAddress>;
+template class mail::addressbook::GetAddressList<mail::address>;
+template class mail::addressbook::GetAddressList<mail::emailAddress>;


Index: cone.spec
===================================================================
RCS file: /cvs/extras/rpms/cone/devel/cone.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cone.spec	8 Nov 2004 04:10:07 -0000	1.2
+++ cone.spec	12 Nov 2004 17:52:46 -0000	1.3
@@ -3,10 +3,10 @@
 Summary: CONE mail reader
 Name: cone
 Version: 0.60
-Release: 0.fdr.1.2
-Epoch: 0
+Release: 2
 URL: http://www.courier-mta.org/cone/
 Source0: http://dl.sf.net/sourceforge/courier/%{name}-%{version}.tar.bz2
+Patch: cone-0.60-gcc34.patch
 License: GPL
 Group: Applications/Internet
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -41,6 +41,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .gcc34
 
 %build
 CPPFLAGS="$CPPFLAGS -I%{curses_include_dir}"
@@ -97,6 +98,9 @@
 %doc cone/html
 
 %changelog
+* Fri Nov 12 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 0.60-2
+- Fix addressbookget.C for GCC 3.4.
+
 * Thu Jul 15 2004 Steven Pritchard <steve at kspei.com> 0:0.60-0.fdr.1
 - Update to 0.60
 - Re-enable sysconftool