diff --git a/.gitignore b/.gitignore index 5ba4520..2b6e703 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /GraphicsMagick-1.3.12.tar.lzma /GraphicsMagick-1.3.13.tar.xz +/GraphicsMagick-1.3.14.tar.xz diff --git a/GraphicsMagick-1.3.13-perl_linkage.patch b/GraphicsMagick-1.3.13-perl_linkage.patch deleted file mode 100644 index 89bf4b9..0000000 --- a/GraphicsMagick-1.3.13-perl_linkage.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up GraphicsMagick-1.3.13/PerlMagick/Makefile.PL.in.perl_linkage GraphicsMagick-1.3.13/PerlMagick/Makefile.PL.in ---- GraphicsMagick-1.3.13/PerlMagick/Makefile.PL.in.perl_linkage 2011-12-24 13:34:16.000000000 -0600 -+++ GraphicsMagick-1.3.13/PerlMagick/Makefile.PL.in 2012-01-23 10:09:16.435774518 -0600 -@@ -79,7 +79,7 @@ WriteMakefile - 'INSTALLBIN' => $magick_BIN_DIR, - - # Library specification -- 'LIBS' => ["-L$magick_LIB_DIR -lGraphicsMagick $magick_LDFLAGS $magick_DEP_LIBS $magick_OMP_LIBS"], -+ 'LIBS' => ["-L$magick_LIB_DIR -L../magick/.libs -lGraphicsMagick $magick_LDFLAGS $magick_DEP_LIBS $magick_OMP_LIBS"], - - # Perl binary name (if a Perl binary is built) - 'MAP_TARGET' => 'PerlMagick', diff --git a/GraphicsMagick-1.3.14-perl_linkage.patch b/GraphicsMagick-1.3.14-perl_linkage.patch new file mode 100644 index 0000000..db504a0 --- /dev/null +++ b/GraphicsMagick-1.3.14-perl_linkage.patch @@ -0,0 +1,12 @@ +diff -up GraphicsMagick-1.3.14/PerlMagick/Makefile.PL.in.perl_linkage GraphicsMagick-1.3.14/PerlMagick/Makefile.PL.in +--- GraphicsMagick-1.3.14/PerlMagick/Makefile.PL.in.perl_linkage 2012-02-25 14:43:38.000000000 -0600 ++++ GraphicsMagick-1.3.14/PerlMagick/Makefile.PL.in 2012-02-26 07:35:38.542731280 -0600 +@@ -78,7 +78,7 @@ WriteMakefile + 'INSTALLBIN' => $magick_BIN_DIR, + + # Library specification +- 'LIBS' => ["-L$magick_LIB_DIR -lGraphicsMagick $magick_LDFLAGS $magick_DEP_LIBS"], ++ 'LIBS' => ["-L$magick_LIB_DIR -L../magick/.libs -lGraphicsMagick $magick_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 fbcd6c2..d7b20b7 100644 --- a/GraphicsMagick.spec +++ b/GraphicsMagick.spec @@ -6,8 +6,8 @@ Summary: An ImageMagick fork, offering faster image generation and better quality Name: GraphicsMagick -Version: 1.3.13 -Release: 4%{?dist} +Version: 1.3.14 +Release: 1%{?dist} License: MIT Group: Applications/Multimedia Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.xz @@ -15,7 +15,7 @@ Url: http://www.graphicsmagick.org/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) ## upstreamable patches -Patch50: GraphicsMagick-1.3.13-perl_linkage.patch +Patch50: GraphicsMagick-1.3.14-perl_linkage.patch BuildRequires: bzip2-devel BuildRequires: freetype-devel @@ -258,6 +258,9 @@ rm -rf %{buildroot} %changelog +* Sun Feb 26 2012 Rex Dieter 1.3.14-1 +- 1.3.14 + * Mon Jan 23 2012 Rex Dieter 1.3.13-4 - -devel: omit seemingly extraneous dependencies diff --git a/sources b/sources index 7dfc76c..bb9e1cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ca8e410d115ec93b75bf6cd2de72411a GraphicsMagick-1.3.13.tar.xz +a67ef2942550ddfa69b07dd944e2a096 GraphicsMagick-1.3.14.tar.xz