[mate-file-manager-image-converter/f19: 7/7] Merge branch 'master' into f19

[Dan Mashal]

commit e5322ea4b5827f9b9bef004fe83f0a47d3a6c079
Merge: b898ee2 93a3d0c
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Mon Apr 8 15:16:12 2013 -0700

    Merge branch 'master' into f19
    
    Conflicts:
    	mate-file-manager-image-converter.spec

 .gitignore                             |    1 +
 mate-file-manager-image-converter.spec |   19 ++++++++++---------
 sources                                |    2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)
---
diff --cc mate-file-manager-image-converter.spec
index 937cc18,6a44052..c4fca7b
--- a/mate-file-manager-image-converter.spec
+++ b/mate-file-manager-image-converter.spec
@@@ -9,9 -9,9 +9,8 @@@ Source0:        http://pub.mate-desktop
  BuildRequires:  mate-common
  BuildRequires:  mate-file-manager-devel
  BuildRequires:  mate-doc-utils
--
--Requires:       mate-file-manager-extensions
--Requires:		ImageMagick
++Requires:  mate-file-manager-extensions
++Requires:  ImageMagick
  
  %description
  Caja-Image-Converter extension allows you to resize/rotate images from Caja.
@@@ -21,9 -21,9 +20,8 @@@
  %build
  
  NOCONFIGURE=1 ./autogen.sh
--%configure                  \
--           --disable-static \
--           --with-gnu-ld
++%configure \
++  --disable-static
  
  make %{?_smp_mflags} V=1