diff --git a/.cvsignore b/.cvsignore index 14348bd..2c083a4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -GraphicsMagick-1.1.8.tar.bz2 +GraphicsMagick-1.1.10.tar.bz2 diff --git a/GraphicsMagick-perl.patch b/GraphicsMagick-perl.patch new file mode 100644 index 0000000..5d3915f --- /dev/null +++ b/GraphicsMagick-perl.patch @@ -0,0 +1,24 @@ +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/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.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' => '@BIN_DIR@', + + # Library specification +- '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 a28ee90..ad321b7 100644 --- a/GraphicsMagick.spec +++ b/GraphicsMagick.spec @@ -1,12 +1,12 @@ Summary: An ImageMagick fork, offering faster image generation and better quality Name: GraphicsMagick -Version: 1.1.8 -Release: 3%{?dist} +Version: 1.1.10 +Release: 1%{?dist} License: MIT Group: Applications/Multimedia Source0: http://download.sourceforge.net/graphicsmagick/GraphicsMagick-%{version}.tar.bz2 Patch0: GraphicsMagick-gslib.patch -Patch1: GraphicsMagick-1.1.8-MagickSpawnVP.patch +Patch1: GraphicsMagick-perl.patch Url: http://www.graphicsmagick.org/ Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel @@ -89,7 +89,7 @@ however. %setup -q # Disabled, causing segfaults in the gslib code path #%patch0 -p 1 -b .gslib -%patch1 -p 1 -b .spawn +%patch1 -p 1 -b .perl # Regenerating configure script #autoconf @@ -229,6 +229,10 @@ rm -rf %{buildroot} %changelog +* Mon Jan 28 2008 Andreas Thienemann - 1.1.10-1 +- Upgraded to 1.1.10 +- Fixed linking problem with the Perl module. #365901 + * Wed Aug 29 2007 Fedora Release Engineering - 1.1.8-3 - Rebuild for selinux ppc32 issue. diff --git a/sources b/sources index 4427b72..c84da0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0a673c0d5b3b8152c2c69e9fbbb7c1d9 GraphicsMagick-1.1.8.tar.bz2 +fb8a223ad7d7369970166b2266cb41e4 GraphicsMagick-1.1.10.tar.bz2