From 2a89c79127cbe39e86f69d213a45ac18a8bafc29 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 11 Sep 2008 14:07:27 +0000 Subject: [PATCH] update to 1.2.5, fix perl bits --- .cvsignore | 2 +- GraphicsMagick-perl.patch | 26 +++++++++++++------------- GraphicsMagick.spec | 27 ++++++++++++++++----------- sources | 2 +- 4 files changed, 31 insertions(+), 26 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2c083a4..a7933fc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -GraphicsMagick-1.1.10.tar.bz2 +GraphicsMagick-1.2.5.tar.bz2 diff --git a/GraphicsMagick-perl.patch b/GraphicsMagick-perl.patch index 5d3915f..a12c534 100644 --- a/GraphicsMagick-perl.patch +++ b/GraphicsMagick-perl.patch @@ -1,24 +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', +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@', # 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'], +- '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 -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 +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 @@ -57,7 +57,7 @@ WriteMakefile - 'INSTALLBIN' => '@BIN_DIR@', + '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/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'], # Perl binary name (if a Perl binary is built) 'MAP_TARGET' => 'PerlMagick', diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec index 2af6d47..8b30265 100644 --- a/GraphicsMagick.spec +++ b/GraphicsMagick.spec @@ -1,13 +1,12 @@ Summary: An ImageMagick fork, offering faster image generation and better quality Name: GraphicsMagick -Version: 1.1.10 -Release: 4%{?dist} +Version: 1.2.5 +Release: 1%{?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 @@ -46,9 +45,7 @@ however. Summary: GraphicsMagick perl bindings Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} -Requires: perl >= 5.6.0 -%define perl_vendorarch %(perl -MConfig -le 'print $Config{installvendorarch}') -BuildRequires: %{perl_vendorarch} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description perl Perl bindings to GraphicsMagick. @@ -91,10 +88,12 @@ however. # Disabled, causing segfaults in the gslib code path #%patch0 -p 1 -b .gslib %patch1 -p 1 -b .perl -%patch2 -p 1 -b .gcc43 # Regenerating configure script #autoconf +iconv -f iso-8859-2 -t utf8 < ChangeLog > ChangeLog.utf8 +mv -f ChangeLog.utf8 ChangeLog + %build %configure --enable-shared \ --with-modules \ @@ -112,6 +111,9 @@ however. --with-windows-font-dir=%{_datadir}/fonts/default/TrueType \ --without-dps +# Avoid bogus RPATHs on x86_64 +sed -i.rpath -e 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool + make %install @@ -188,10 +190,9 @@ rm -rf %{buildroot} %postun c++ -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc ChangeLog Copyright.txt -%doc index.html www/ images/ -%doc README.txt AUTHORS NEWS +%defattr(-,root,root,-) +%doc README.txt AUTHORS.txt +%doc %{_datadir}/doc/%{name}/ %attr(755,root,root) %{_libdir}/libGraphicsMagick.so.* %attr(755,root,root) %{_libdir}/libGraphicsMagickWand.so.* %{_bindir}/[a-z]* @@ -231,6 +232,10 @@ rm -rf %{buildroot} %changelog +* Thu Sep 11 2008 Tom "spot" Callaway 1.2.5-1 +- update to 1.2.5 +- fix perl issues + * Sun Jun 01 2008 Dennis Gilmore - 1.1.10-4 - sparc64 is a 64 bit arch diff --git a/sources b/sources index c84da0a..54c0fe9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fb8a223ad7d7369970166b2266cb41e4 GraphicsMagick-1.1.10.tar.bz2 +a023a1561ec0780f25f5a4f0cf208053 GraphicsMagick-1.2.5.tar.bz2