[GraphicsMagick/el6: 23/23] Merge remote branch 'origin/master' into el6

[Rex Dieter]

commit 3d2a6da90993bc3a4b0eb6c3ccc0516cab006853
Merge: f046fc3 d9c5b22
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 1 14:48:07 2012 -0600

    Merge remote branch 'origin/master' into el6
    
    Conflicts:
    	.gitignore
    	GraphicsMagick.spec
    	sources

 .gitignore                               |    4 +-
 GraphicsMagick-1.3.14-perl_linkage.patch |   12 ++++
 GraphicsMagick.spec                      |   98 ++++++++++++++++++++++--------
 sources                                  |    2 +-
 4 files changed, 89 insertions(+), 27 deletions(-)
---
diff --cc GraphicsMagick.spec
index 4e30856,d7b20b7..d16276a
--- a/GraphicsMagick.spec
+++ b/GraphicsMagick.spec
@@@ -5,7 -10,7 +10,7 @@@ Version: 1.3.1
  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
++Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.gz
  Url: http://www.graphicsmagick.org/
  BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)