rpms/nightview/devel nightview-0.3.2-gcc44.patch, 1.1, 1.2 nightview.spec, 1.5, 1.6

[Lubomir Rintel]

Author: lkundrak

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

Modified Files:
	nightview-0.3.2-gcc44.patch nightview.spec 
Log Message:
* Sun Mar 1 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.2-5
- Update the gcc44 fix


nightview-0.3.2-gcc44.patch:

Index: nightview-0.3.2-gcc44.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nightview/devel/nightview-0.3.2-gcc44.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nightview-0.3.2-gcc44.patch	22 Feb 2009 12:51:19 -0000	1.1
+++ nightview-0.3.2-gcc44.patch	1 Mar 2009 11:33:53 -0000	1.2
@@ -1,12 +1,25 @@
 The STL headers in gcc-4.4 have been cleaned up, so that the headers don't drag in
 unnecessary dependencies which aren't requested by the standard.
+strstr() returns const char pointer, which differs from non-const one.
 This fixes build for gcc-4.4
 
 Lubomir Rintel <lkundrak at v3.sk>
 
+diff -up nightview-0.3.2/httpdaemon/httpprotocol.cpp.gcc44 nightview-0.3.2/httpdaemon/httpprotocol.cpp
+--- nightview-0.3.2/httpdaemon/httpprotocol.cpp.gcc44	2009-03-01 12:24:35.000000000 +0100
++++ nightview-0.3.2/httpdaemon/httpprotocol.cpp	2009-03-01 12:24:44.000000000 +0100
+@@ -51,7 +51,7 @@ void HttpProtocol::Init(const string& in
+   if( version == "" )
+     version = "HTTP/0.9";
+ 
+-  char *b = strstr(version.c_str(),"/");
++  const char *b = strstr(version.c_str(),"/");
+   nversion = strtod(b+1,NULL);
+ 
+   if( method == "HEAD" ) {
 diff -up nightview-0.3.2/shell/night_batch.cpp.gcc44 nightview-0.3.2/shell/night_batch.cpp
---- nightview-0.3.2/shell/night_batch.cpp.gcc44	2009-02-03 21:09:52.000000000 +0100
-+++ nightview-0.3.2/shell/night_batch.cpp	2009-02-03 21:09:46.000000000 +0100
+--- nightview-0.3.2/shell/night_batch.cpp.gcc44	2008-10-29 23:05:23.000000000 +0100
++++ nightview-0.3.2/shell/night_batch.cpp	2009-03-01 12:19:14.000000000 +0100
 @@ -16,6 +16,7 @@
  #include <vector>
  #include <string>


Index: nightview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nightview/devel/nightview.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nightview.spec	26 Feb 2009 05:42:44 -0000	1.5
+++ nightview.spec	1 Mar 2009 11:33:53 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           nightview
 Version:        0.3.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A general astronomical software package to control of a CCD camera
 
 Group:          Amusements/Graphics
@@ -13,7 +13,7 @@
 Patch0:         nightview-0.3.2-fitslib.patch
 Patch1:         nightview-0.3.2-initscript.patch
 Patch2:         nightview-0.3.1-doc.patch
-# Sent upstream by mail, accepted
+# Sent upstream by mail, first hunk already accepted
 Patch3:         nightview-0.3.2-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -245,6 +245,9 @@
 
 
 %changelog
+* Sun Mar 1 2009 Lubomir Rintel (Fedora Astronomy) <lkundrak at v3.sk> - 0.3.2-5
+- Update the gcc44 fix
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild