rpms/GraphicsMagick/devel GraphicsMagick-1.1.10-gcc43.patch, 1.1, 1.2 GraphicsMagick-perl.patch, 1.2, 1.3 GraphicsMagick.spec, 1.20, 1.21 sources, 1.5, 1.6
Tom Callaway
spot at fedoraproject.org
Thu Sep 11 15:46:57 UTC 2008
Author: spot
Update of /cvs/pkgs/rpms/GraphicsMagick/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16785/devel
Modified Files:
GraphicsMagick-1.1.10-gcc43.patch GraphicsMagick-perl.patch
GraphicsMagick.spec sources
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/devel/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;
GraphicsMagick-perl.patch:
Index: GraphicsMagick-perl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/devel/GraphicsMagick-perl.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GraphicsMagick-perl.patch 11 Sep 2008 14:07:27 -0000 1.2
+++ GraphicsMagick-perl.patch 11 Sep 2008 15:46:56 -0000 1.3
@@ -1,24 +1,24 @@
-diff -up GraphicsMagick-1.2.5/PerlMagick/Makefile.PL.in.perl GraphicsMagick-1.2.5/PerlMagick/Makefile.PL.in
---- GraphicsMagick-1.2.5/PerlMagick/Makefile.PL.in.perl 2008-05-18 17:21:59.000000000 -0400
-+++ GraphicsMagick-1.2.5/PerlMagick/Makefile.PL.in 2008-09-11 08:54:06.000000000 -0400
-@@ -61,7 +61,7 @@ WriteMakefile
- 'INSTALLBIN' => '@BIN_DIR@',
+diff -up GraphicsMagick-1.1.10/PerlMagick/Makefile.PL.orig GraphicsMagick-1.1.10/PerlMagick/Makefile.PL
+--- GraphicsMagick-1.1.10/PerlMagick/Makefile.PL.orig 2008-01-28 17:48:28.000000000 +0100
++++ GraphicsMagick-1.1.10/PerlMagick/Makefile.PL 2008-01-28 17:48:58.000000000 +0100
+@@ -62,7 +62,7 @@ WriteMakefile
+ 'INSTALLBIN' => '/usr/local/bin',
# Library specification
-- 'LIBS' => ['-L at MAGICKLIBDIR@ -lGraphicsMagick @LDFLAGS@ @MAGICK_DEP_LIBS@'],
-+ 'LIBS' => ['-L at MAGICKLIBDIR@ -L../magick/.libs -lGraphicsMagick @LDFLAGS@ @MAGICK_DEP_LIBS@'],
+- 'LIBS' => ['-L/usr/local/lib -R/usr/local/lib -L/usr/local/lib -L/usr/local/lib -L/home/glennrp/CVS/ImageMagick/magick -lGraphicsMagick -ljbig -llcms -ltiff -lfreetype -ljasper -ljpeg -lgs -lpng -lfpx -lwmflite -lXext -lSM -lICE -lX11 -lsocket -lnsl -lbz2 -lxml2 -lz -lpthread -lm'],
++ 'LIBS' => ['-L/usr/local/lib -R/usr/local/lib -L/usr/local/lib -L/usr/local/lib -L/home/glennrp/CVS/ImageMagick/magick -L../magick/.libs -lGraphicsMagick -ljbig -llcms -ltiff -lfreetype -ljasper -ljpeg -lgs -lpng -lfpx -lwmflite -lXext -lSM -lICE -lX11 -lsocket -lnsl -lbz2 -lxml2 -lz -lpthread -lm'],
# Perl binary name (if a Perl binary is built)
'MAP_TARGET' => 'PerlMagick',
-diff -up GraphicsMagick-1.2.5/PerlMagick/Makefile.PL.perl GraphicsMagick-1.2.5/PerlMagick/Makefile.PL
---- GraphicsMagick-1.2.5/PerlMagick/Makefile.PL.perl 2004-04-18 18:20:51.000000000 -0400
-+++ GraphicsMagick-1.2.5/PerlMagick/Makefile.PL 2008-09-11 08:57:44.000000000 -0400
+diff -up GraphicsMagick-1.1.10/PerlMagick/Makefile.PL.in.orig GraphicsMagick-1.1.10/PerlMagick/Makefile.PL.in
+--- GraphicsMagick-1.1.10/PerlMagick/Makefile.PL.in.orig 2008-01-28 17:48:34.000000000 +0100
++++ GraphicsMagick-1.1.10/PerlMagick/Makefile.PL.in 2008-01-28 17:48:58.000000000 +0100
@@ -57,7 +57,7 @@ WriteMakefile
- 'INSTALLBIN' => '/usr/local/bin',
+ 'INSTALLBIN' => '@BIN_DIR@',
# Library specification
-- 'LIBS' => ['-L/home/bfriesen/src/graphics/GraphicsMagick-Web/magick/.libs -lGraphicsMagick -L/usr/local/lib -R/usr/local/lib -R/usr/X11R6/lib -L/usr/X11R6/lib -L/usr/local/lib -L/usr/local/lib -ljbig -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lwmflite -ldpstk -ldps -lXext -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lc_r'],
-+ 'LIBS' => ['-L/home/bfriesen/src/graphics/GraphicsMagick-Web/magick/.libs -L../magick/.libs -lGraphicsMagick -L/usr/local/lib -R/usr/local/lib -R/usr/X11R6/lib -L/usr/X11R6/lib -L/usr/local/lib -L/usr/local/lib -ljbig -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lwmflite -ldpstk -ldps -lXext -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lc_r'],
+- 'LIBS' => ['-L at MAGICKLIBDIR@ -lGraphicsMagick @LDFLAGS@ @MAGICK_DEP_LIBS@'],
++ 'LIBS' => ['-L at MAGICKLIBDIR@ -L../magick/.libs -lGraphicsMagick @LDFLAGS@ @MAGICK_DEP_LIBS@'],
# Perl binary name (if a Perl binary is built)
'MAP_TARGET' => 'PerlMagick',
Index: GraphicsMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/devel/GraphicsMagick.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- GraphicsMagick.spec 11 Sep 2008 14:07:27 -0000 1.20
+++ GraphicsMagick.spec 11 Sep 2008 15:46:56 -0000 1.21
@@ -1,12 +1,13 @@
Summary: An ImageMagick fork, offering faster image generation and better quality
Name: GraphicsMagick
-Version: 1.2.5
-Release: 1%{?dist}
+Version: 1.1.14
+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
@@ -190,9 +192,10 @@
%postun c++ -p /sbin/ldconfig
%files
-%defattr(-,root,root,-)
-%doc README.txt AUTHORS.txt
-%doc %{_datadir}/doc/%{name}/
+%defattr(-,root,root)
+%doc ChangeLog Copyright.txt
+%doc index.html www/ images/
+%doc README.txt AUTHORS NEWS
%attr(755,root,root) %{_libdir}/libGraphicsMagick.so.*
%attr(755,root,root) %{_libdir}/libGraphicsMagickWand.so.*
%{_bindir}/[a-z]*
@@ -232,9 +235,12 @@
%changelog
-* Thu Sep 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.5-1
-- update to 1.2.5
-- fix perl issues
+* 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)
* Sun Jun 01 2008 Dennis Gilmore <dennis at ausil.us> - 1.1.10-4
- sparc64 is a 64 bit arch
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/GraphicsMagick/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 11 Sep 2008 14:07:27 -0000 1.5
+++ sources 11 Sep 2008 15:46:56 -0000 1.6
@@ -1 +1 @@
-a023a1561ec0780f25f5a4f0cf208053 GraphicsMagick-1.2.5.tar.bz2
+a4085265d4493a090557534b938ce942 GraphicsMagick-1.1.14.tar.bz2
More information about the fedora-extras-commits
mailing list