rpms/GraphicsMagick/F-9 GraphicsMagick-1.1.10-gcc43.patch, 1.1, 1.2 GraphicsMagick.spec, 1.21, 1.22

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/GraphicsMagick/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16785/F-9

Modified Files:
	GraphicsMagick-1.1.10-gcc43.patch GraphicsMagick.spec 
Log Message:
revert devel to 1.1.14, apply gcc43 patch

GraphicsMagick-1.1.10-gcc43.patch:

Index: GraphicsMagick-1.1.10-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/F-9/GraphicsMagick-1.1.10-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GraphicsMagick-1.1.10-gcc43.patch	11 Feb 2008 12:53:00 -0000	1.1
+++ GraphicsMagick-1.1.10-gcc43.patch	11 Sep 2008 15:46:56 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up GraphicsMagick-1.1.10/Magick++/lib/Geometry.cpp.orig GraphicsMagick-1.1.10/Magick++/lib/Geometry.cpp
---- GraphicsMagick-1.1.10/Magick++/lib/Geometry.cpp.orig	2008-02-11 13:26:47.000000000 +0100
-+++ GraphicsMagick-1.1.10/Magick++/lib/Geometry.cpp	2008-02-11 13:29:08.000000000 +0100
+diff -up GraphicsMagick-1.1.14/Magick++/lib/Geometry.cpp.BAD GraphicsMagick-1.1.14/Magick++/lib/Geometry.cpp
+--- GraphicsMagick-1.1.14/Magick++/lib/Geometry.cpp.BAD	2008-09-11 11:43:45.000000000 -0400
++++ GraphicsMagick-1.1.14/Magick++/lib/Geometry.cpp	2008-09-11 11:43:52.000000000 -0400
 @@ -8,7 +8,7 @@
  #define MAGICK_IMPLEMENTATION
  
@@ -8,5 +8,5 @@
 -#include <string>
 +#include <cstring>
  #include <ctype.h> // for isdigit
+ #include <strings.h> // for strcpy
  
- using namespace std;


Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/F-9/GraphicsMagick.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- GraphicsMagick.spec	11 Sep 2008 14:38:42 -0000	1.21
+++ GraphicsMagick.spec	11 Sep 2008 15:46:56 -0000	1.22
@@ -1,12 +1,13 @@
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
 Version: 1.1.14
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: Applications/Multimedia
 Source0: http://download.sourceforge.net/graphicsmagick/GraphicsMagick-%{version}.tar.bz2
 Patch0: GraphicsMagick-gslib.patch
 Patch1: GraphicsMagick-perl.patch
+Patch2: GraphicsMagick-1.1.10-gcc43.patch
 Url: http://www.graphicsmagick.org/
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
@@ -88,6 +89,7 @@
 # Disabled, causing segfaults in the gslib code path
 #%patch0 -p 1 -b .gslib 
 %patch1 -p 1 -b .perl
+%patch2 -p1 -b .gcc43
 # Regenerating configure script
 #autoconf
 
@@ -233,6 +235,9 @@
 
 
 %changelog
+* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1.14-2
+- turns out we do need gcc43 patch
+
 * Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.1.14-1
 - update to 1.1.14
 - fix perl issue (bz 454087)