From 15bdba43466bd0db242e52e352741f770ae18803 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Thu, 12 Jan 2012 14:41:03 -0600
Subject: [PATCH] 1.3.13

---
 .gitignore                               |  3 ++-
 GraphicsMagick-1.3.12-perl_linkage.patch | 12 ------------
 GraphicsMagick.spec                      | 23 +++++++++--------------
 sources                                  |  2 +-
 4 files changed, 12 insertions(+), 28 deletions(-)
 delete mode 100644 GraphicsMagick-1.3.12-perl_linkage.patch

diff --git a/.gitignore b/.gitignore
index 78226e4..5ba4520 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-GraphicsMagick-1.3.12.tar.lzma
+/GraphicsMagick-1.3.12.tar.lzma
+/GraphicsMagick-1.3.13.tar.xz
diff --git a/GraphicsMagick-1.3.12-perl_linkage.patch b/GraphicsMagick-1.3.12-perl_linkage.patch
deleted file mode 100644
index 5814c4d..0000000
--- a/GraphicsMagick-1.3.12-perl_linkage.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up GraphicsMagick-1.3.12/PerlMagick/Makefile.PL.in.perl_linkage GraphicsMagick-1.3.12/PerlMagick/Makefile.PL.in
---- GraphicsMagick-1.3.12/PerlMagick/Makefile.PL.in.perl_linkage	2009-07-24 14:34:32.000000000 -0500
-+++ GraphicsMagick-1.3.12/PerlMagick/Makefile.PL.in	2011-04-26 14:22:47.101574777 -0500
-@@ -67,7 +67,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 9a6378c..26555c6 100644
--- a/GraphicsMagick.spec
+++ b/GraphicsMagick.spec
@@ -6,17 +6,14 @@
 
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
-Version: 1.3.12
-Release: 8%{?dist}
+Version: 1.3.13
+Release: 1%{?dist}
 License: MIT
 Group: Applications/Multimedia
-Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.lzma
+Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.xz
 Url: http://www.graphicsmagick.org/
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-## upstreamable patches
-Patch50: GraphicsMagick-1.3.12-perl_linkage.patch
-
 BuildRequires: bzip2-devel
 BuildRequires: freetype-devel
 BuildRequires: jasper-devel
@@ -103,8 +100,6 @@ however.
 %prep
 %setup -q
 
-%patch50 -p1 -b .perl_linkage
-
 iconv -f iso-8859-2 -t utf8 < ChangeLog > ChangeLog.utf8
 mv -f ChangeLog.utf8 ChangeLog
 
@@ -210,14 +205,8 @@ rm -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
-
-%post c++ -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
-%postun c++ -p /sbin/ldconfig
-
-
 %files
 %defattr(-,root,root,-)
 %doc Copyright.txt
@@ -244,6 +233,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/GraphicsMagick-config.*
 %{_mandir}/man1/GraphicsMagickWand-config.*
 
+%post c++ -p /sbin/ldconfig
+%postun c++ -p /sbin/ldconfig
+
 %files c++
 %defattr(-,root,root,-)
 %{_libdir}/libGraphicsMagick++.so.3*
@@ -264,6 +256,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Jan 12 2012 Rex Dieter <rdieter@fedoraproject.org> 1.3.13-1
+- 1.3.13
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.12-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 0a5533e..7dfc76c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1b91c37daa9640440a91a83727607269  GraphicsMagick-1.3.12.tar.lzma
+ca8e410d115ec93b75bf6cd2de72411a  GraphicsMagick-1.3.13.tar.xz