rpms/hugin/devel hugin-0.7.0-includes.patch, NONE, 1.1 hugin.spec, 1.18, 1.19

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	hugin.spec 
Added Files:
	hugin-0.7.0-includes.patch 
Log Message:
include stdio.h for snprintf and cstdio for std::sprintf, etc.

hugin-0.7.0-includes.patch:

--- NEW FILE hugin-0.7.0-includes.patch ---
diff -ru hugin-0.7.0.orig/src/hugin_base/appbase/ProgressDisplayOld.cpp hugin-0.7.0/src/hugin_base/appbase/ProgressDisplayOld.cpp
--- hugin-0.7.0.orig/src/hugin_base/appbase/ProgressDisplayOld.cpp	2009-03-01 20:59:17.000000000 +0000
+++ hugin-0.7.0/src/hugin_base/appbase/ProgressDisplayOld.cpp	2009-03-01 20:59:47.000000000 +0000
@@ -22,6 +22,7 @@
  */
 
 #include "ProgressDisplayOld.h"
+#include <stdio.h>
 
 #ifdef WIN32
 #define snprintf _snprintf
diff -ru hugin-0.7.0.orig/src/hugin_base/hugin_utils/utils.cpp hugin-0.7.0/src/hugin_base/hugin_utils/utils.cpp
--- hugin-0.7.0.orig/src/hugin_base/hugin_utils/utils.cpp	2009-03-01 20:59:17.000000000 +0000
+++ hugin-0.7.0/src/hugin_base/hugin_utils/utils.cpp	2009-03-01 22:03:41.000000000 +0000
@@ -31,6 +31,7 @@
 #endif
 #include <time.h>
 #include <stdio.h>
+#include <cstdio>
 
 
 namespace hugin_utils {
diff -ru hugin-0.7.0.orig/src/hugin_base/panodata/PTScriptParsing.cpp hugin-0.7.0/src/hugin_base/panodata/PTScriptParsing.cpp
--- hugin-0.7.0.orig/src/hugin_base/panodata/PTScriptParsing.cpp	2009-03-01 20:59:17.000000000 +0000
+++ hugin-0.7.0/src/hugin_base/panodata/PTScriptParsing.cpp	2009-03-01 22:58:55.000000000 +0000
@@ -25,6 +25,7 @@
 #include "PTScriptParsing.h"
 
 #include <hugin_utils/utils.h>
+#include <stdio.h>
 
 
 namespace HuginBase {


Index: hugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hugin/devel/hugin.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- hugin.spec	25 Feb 2009 04:20:09 -0000	1.18
+++ hugin.spec	1 Mar 2009 23:18:18 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Panoramic photo stitcher, similar to PTGui for Windows
 Name: hugin
 Version: 0.7.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source: http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.gz
@@ -12,6 +12,7 @@
 BuildRequires: libpano13-devel zlib-devel libtiff-devel libjpeg-devel
 BuildRequires: libpng-devel gettext-devel wxGTK-devel >= 2.6.0 boost-devel
 BuildRequires: cmake desktop-file-utils OpenEXR-devel exiv2-devel
+Patch1: hugin-0.7.0-includes.patch
 
 %description
 hugin can be used to stitch multiple images together. The resulting image can
@@ -31,6 +32,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .includes
 # replace autopano-sift default with info message
 sed -i 's/"autopano-sift-c"/"autopano-noop.sh"/' \
        src/hugin1/hugin/config_defaults.h
@@ -107,6 +109,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Mar 01 2009 Caolán McNamara <caolanm at redhat.com> - 0.7.0-5
+- include stdio.h for snprintf and cstdio for std::sprintf
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild