rpms/cone/devel cone-0.66.20060203-compile.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 cone.spec, 1.13, 1.14 sources, 1.6, 1.7

[Steven Pritchard (steve)]

Author: steve

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

Modified Files:
	.cvsignore cone.spec sources 
Added Files:
	cone-0.66.20060203-compile.patch 
Log Message:
- Update to 0.66.20060203 (development snapshot, needed to fix compilation
  with g++ 4.1)
- Patch a few more g++ 4.1 issues


cone-0.66.20060203-compile.patch:

--- NEW FILE cone-0.66.20060203-compile.patch ---
--- ./cone/myserver.H.orig	2004-06-22 19:55:22.000000000 -0500
+++ ./cone/myserver.H	2006-02-06 10:50:39.000000000 -0600
@@ -182,7 +182,7 @@
 
 	static std::string getConfigDir();
 	static std::string getHomeDir();
-	static std::string myServer::getConfigFilename();
+	static std::string getConfigFilename();
 
 	static void saveconfig(bool saveRemote=true,
 			       bool installRemote=false);
--- ./cone/cursesmessage.H.orig	2005-06-29 21:55:49.000000000 -0500
+++ ./cone/cursesmessage.H	2006-02-06 10:53:58.000000000 -0600
@@ -86,9 +86,9 @@
 	// Returns the "image" of line #lineNum, a list of
 	// attribute/text pairs.
 
-	void CursesMessage::drawLine(size_t lineNum,
-				     Curses *window,
-				     size_t windowLineNum);
+	void drawLine(size_t lineNum,
+		      Curses *window,
+		      size_t windowLineNum);
 
 	std::string shownMimeId; // Non "" if showing an attached message.
 private:
--- ./cone/spellcheckerAspell.H.orig	2003-06-21 22:59:52.000000000 -0500
+++ ./cone/spellcheckerAspell.H	2006-02-06 10:57:24.000000000 -0600
@@ -90,7 +90,7 @@
 	virtual void setDictionary(std::string);
 
 	SpellCheckerBase::Manager
-	*SpellChecker::getManager(std::string &errmsg);
+	*getManager(std::string &errmsg);
 };
 
 #endif
--- cone/cursesedit.H.orig	2004-11-19 20:37:20.000000000 -0600
+++ cone/cursesedit.H	2006-02-07 10:43:22.000000000 -0600
@@ -223,7 +223,7 @@
 		  bool saveFcc);
 
 private:
-	std::string CursesEdit::getFcc(SaveSink *sink);
+	std::string getFcc(SaveSink *sink);
 
 	std::string sender;		   // Initialized by save()
 	std::vector<std::string> recipients; // Initialized by save()


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cone/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 01:32:56 -0000	1.6
+++ .cvsignore	7 Feb 2006 17:48:27 -0000	1.7
@@ -1 +1,2 @@
-cone-0.66.tar.bz2
+cone-0.66.20060203.tar.bz2
+cone-0.66.20060203.tar.bz2.sig


Index: cone.spec
===================================================================
RCS file: /cvs/extras/rpms/cone/devel/cone.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cone.spec	3 Feb 2006 01:32:56 -0000	1.13
+++ cone.spec	7 Feb 2006 17:48:27 -0000	1.14
@@ -2,12 +2,15 @@
 
 Summary:        CONE mail reader
 Name:           cone
-Version:        0.66
+Version:        0.66.20060203
 Release:        1%{?dist}
 
 URL:            http://www.courier-mta.org/cone/
-Source0:        http://dl.sf.net/courier/%{name}-%{version}.tar.bz2
-Source1:        http://dl.sf.net/courier/%{name}-%{version}.tar.bz2.sig
+#Source0:        http://dl.sf.net/courier/%{name}-%{version}.tar.bz2
+#Source1:        http://dl.sf.net/courier/%{name}-%{version}.tar.bz2.sig
+Source0:        http://www.courier-mta.org/beta/cone/cone-%{version}.tar.bz2
+Source1:        http://www.courier-mta.org/beta/cone/cone-%{version}.tar.bz2.sig
+Patch0:         cone-0.66.20060203-compile.patch
 License:        GPL
 Group:          Applications/Internet
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -42,6 +45,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 CPPFLAGS="$CPPFLAGS -I%{curses_include_dir}"
@@ -87,7 +91,7 @@
 %{_libexecdir}/cone
 %{_datadir}/cone
 %{_mandir}/man1/*
-%{_libdir}/*.so
+#%{_libdir}/*.so
 %doc ABOUT-NLS ChangeLog README NEWS AUTHORS COPYING COPYING.GPL
 
 %files devel
@@ -101,12 +105,17 @@
 %doc cone/html
 
 %changelog
+* Sat Feb 04 2006 Steven Pritchard <steve at kspei.com> 0.66.20060203-1
+- Update to 0.66.20060203 (development snapshot, needed to fix compilation
+  with g++ 4.1)
+- Patch a few more g++ 4.1 issues
+
 * Thu Feb 02 2006 Steven Pritchard <steve at kspei.com> 0.66-1
 - Update to 0.66
 - Spec cleanup (reformatting)
 
 * Mon Nov 14 2005 Steven Pritchard <steve at kspei.com> 0.65-3
-- Disable static library creation
+- Disabling static library creation breaks the build
 
 * Mon Nov 14 2005 Steven Pritchard <steve at kspei.com> 0.65-2
 - Rebuild


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cone/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 01:32:56 -0000	1.6
+++ sources	7 Feb 2006 17:48:27 -0000	1.7
@@ -1 +1,2 @@
-0c924c109b31a632acd7e905fd415c58  cone-0.66.tar.bz2
+967447f88794f6568809c409bdcc8aa4  cone-0.66.20060203.tar.bz2
+3b491ef80708cee46a02eab94c3b5c20  cone-0.66.20060203.tar.bz2.sig