From c317f0c1dcc712463d6551d38a8eedb6d06d7273 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 11 Sep 2008 15:46:56 +0000 Subject: [PATCH] revert devel to 1.1.14, apply gcc43 patch --- GraphicsMagick-1.1.10-gcc43.patch | 8 ++++---- GraphicsMagick-perl.patch | 26 +++++++++++++------------- GraphicsMagick.spec | 22 ++++++++++++++-------- sources | 2 +- 4 files changed, 32 insertions(+), 26 deletions(-) diff --git a/GraphicsMagick-1.1.10-gcc43.patch b/GraphicsMagick-1.1.10-gcc43.patch index 798c4c8..e668a6d 100644 --- a/GraphicsMagick-1.1.10-gcc43.patch +++ b/GraphicsMagick-1.1.10-gcc43.patch @@ -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 @@ diff -up GraphicsMagick-1.1.10/Magick++/lib/Geometry.cpp.orig GraphicsMagick-1.1 -#include +#include #include // for isdigit + #include // for strcpy - using namespace std; diff --git a/GraphicsMagick-perl.patch b/GraphicsMagick-perl.patch index a12c534..5d3915f 100644 --- a/GraphicsMagick-perl.patch +++ b/GraphicsMagick-perl.patch @@ -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@MAGICKLIBDIR@ -lGraphicsMagick @LDFLAGS@ @MAGICK_DEP_LIBS@'], -+ 'LIBS' => ['-L@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@MAGICKLIBDIR@ -lGraphicsMagick @LDFLAGS@ @MAGICK_DEP_LIBS@'], ++ 'LIBS' => ['-L@MAGICKLIBDIR@ -L../magick/.libs -lGraphicsMagick @LDFLAGS@ @MAGICK_DEP_LIBS@'], # Perl binary name (if a Perl binary is built) 'MAP_TARGET' => 'PerlMagick', diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec index 8b30265..08b0947 100644 --- a/GraphicsMagick.spec +++ b/GraphicsMagick.spec @@ -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 @@ however. # 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 @@ rm -rf %{buildroot} %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 @@ rm -rf %{buildroot} %changelog -* Thu Sep 11 2008 Tom "spot" Callaway 1.2.5-1 -- update to 1.2.5 -- fix perl issues +* Thu Sep 11 2008 Tom "spot" Callaway - 1.1.14-2 +- turns out we do need gcc43 patch + +* Thu Sep 11 2008 Tom "spot" Callaway - 1.1.14-1 +- update to 1.1.14 +- fix perl issue (bz 454087) * Sun Jun 01 2008 Dennis Gilmore - 1.1.10-4 - sparc64 is a 64 bit arch diff --git a/sources b/sources index 54c0fe9..33c829f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a023a1561ec0780f25f5a4f0cf208053 GraphicsMagick-1.2.5.tar.bz2 +a4085265d4493a090557534b938ce942 GraphicsMagick-1.1.14.tar.bz2