rpms/nget/F-7 nget-0.27.1-gcc43.patch,NONE,1.1 nget.spec,1.10,1.11

[Debarshi Ray (rishi)]

Author: rishi

Update of /cvs/pkgs/rpms/nget/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5535

Modified Files:
	nget.spec 
Added Files:
	nget-0.27.1-gcc43.patch 
Log Message:
Updated to 0.27.1-8 in F-7.
 
 Modified Files:
 	nget.spec 
 Added Files:
 	nget-0.27.1-gcc43.patch 


nget-0.27.1-gcc43.patch:

--- NEW FILE nget-0.27.1-gcc43.patch ---
diff -urNp nget-0.27.1.orig/auto_map.h nget-0.27.1/auto_map.h
--- nget-0.27.1.orig/auto_map.h	2004-06-18 02:30:33.000000000 +0530
+++ nget-0.27.1/auto_map.h	2008-02-16 01:50:06.000000000 +0530
@@ -23,10 +23,12 @@
 #include <assert.h>
 #include <map>
 
-template <class K, class T, template <class BK, class BT> class Base>
+template <class K, class T, template <class BK, class BT,
+        class _Compare=std::less<BK>,
+        class _Alloc=std::allocator<std::pair<const BK, BT> > > class Base>
 class auto_map_base : public Base<K, restricted_ptr<T> > {
 	protected:
-		typedef Base<K, restricted_ptr<T> > super;
+                typedef Base<K, restricted_ptr<T> > super;
 	public:
 		typedef typename super::iterator iterator;
 
diff -urNp nget-0.27.1.orig/dupe_file.cc nget-0.27.1/dupe_file.cc
--- nget-0.27.1.orig/dupe_file.cc	2004-05-30 04:30:05.000000000 +0530
+++ nget-0.27.1/dupe_file.cc	2008-02-16 01:40:34.000000000 +0530
@@ -24,7 +24,8 @@
 #include <ctype.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <errno.h>
+#include <cerrno>
+#include <cstring>
 
 void dupe_file_checker::add(const char *filename, ulong size){
 	file_match *fm;
diff -urNp nget-0.27.1.orig/lite.h nget-0.27.1/lite.h
--- nget-0.27.1.orig/lite.h	2004-05-30 04:30:08.000000000 +0530
+++ nget-0.27.1/lite.h	2008-02-16 01:45:18.000000000 +0530
@@ -23,7 +23,8 @@
 #include "config.h"
 #endif
 
-#include <stdlib.h>
+#include <cstdlib>
+#include <cstring>
 char * newstrcpy(char *&dest, const char *src);
 inline void safefree(char *&p){
     if (p){free(p);p=NULL;}
diff -urNp nget-0.27.1.orig/myregex.cc nget-0.27.1/myregex.cc
--- nget-0.27.1.orig/myregex.cc	2004-05-30 04:30:06.000000000 +0530
+++ nget-0.27.1/myregex.cc	2008-02-16 01:42:12.000000000 +0530
@@ -19,7 +19,8 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include <stdlib.h>
+#include <cstdlib>
+#include <cstring>
 #include "myregex.h"
 
 
diff -urNp nget-0.27.1.orig/nrange.h nget-0.27.1/nrange.h
--- nget-0.27.1.orig/nrange.h	2004-05-30 04:30:08.000000000 +0530
+++ nget-0.27.1/nrange.h	2008-02-16 01:43:41.000000000 +0530
@@ -22,6 +22,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include <climits>
 #include <sys/types.h>
 #include <map>
 #include <stdexcept>
diff -urNp nget-0.27.1.orig/path.cc nget-0.27.1/path.cc
--- nget-0.27.1.orig/path.cc	2004-05-30 04:30:06.000000000 +0530
+++ nget-0.27.1/path.cc	2008-02-16 01:40:23.000000000 +0530
@@ -17,7 +17,8 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 #include "path.h"
-#include <errno.h>
+#include <cerrno>
+#include <cstring>
 #include <unistd.h>
 #include "log.h"
 #include "_fileconf.h"
diff -urNp nget-0.27.1.orig/stlhelp.h nget-0.27.1/stlhelp.h
--- nget-0.27.1.orig/stlhelp.h	2004-05-30 04:30:08.000000000 +0530
+++ nget-0.27.1/stlhelp.h	2008-02-16 01:56:36.000000000 +0530
@@ -19,6 +19,7 @@
 #ifndef _STLHELP_H_
 #define _STLHELP_H_
 
+#include <cstring>
 struct eqstr
 {
 	bool operator()(const char* s1, const char* s2) const


Index: nget.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nget/F-7/nget.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- nget.spec	10 Oct 2007 17:38:47 -0000	1.10
+++ nget.spec	16 Feb 2008 15:28:04 -0000	1.11
@@ -1,13 +1,14 @@
 Summary:	Command line NNTP file grabber
 Name:		nget
 Version:	0.27.1
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://nget.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/nget/%{name}-%{version}.tar.gz
 
 Patch0:		%{name}-%{version}-debuginfo.patch
+Patch1:		%{name}-%{version}-gcc43.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -28,12 +29,15 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --with-pcre --with-popt
 make %{?_smp_mflags}
 
-# 'make test' fails due to absence of SUBTERFUGUE (http://subterfugue.org/).
+%check
+# make test
+# fails due to absence of SUBTERFUGUE (http://subterfugue.org/).
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -57,6 +61,10 @@
 %{_mandir}/man1/ngetlite.1.gz
 
 %changelog
+* Sat Feb 16 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.27.1-8
+- Fixed build failure with gcc-4.3.
+- Addressed warning generated by rpmlint
+
 * Sat Oct 06 2007 Debarshi Ray <rishi at fedoraproject.org> - 0.27.1-7
 - Removed 'BuildRequires: cppunit'.
 - Added comments about failure of test suite.