Accepting request 595136 from home:scarabeus_iv:branches:graphics

- Drop buildrequire on mupdf-devel-static, there is only one occurance
  in all makefiles mentioning MUPDF_LIBS and it is always empty
- Format with minimal run of spec-cleaner
  * Use license
  * Sort BRs alphabetically

OBS-URL: https://build.opensuse.org/request/show/595136
OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=354

ImageMagick.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Apr 10 08:23:27 UTC 2018 - tchvatal@suse.com
+
+- Drop buildrequire on mupdf-devel-static, there is only one occurance
+  in all makefiles mentioning MUPDF_LIBS and it is always empty
+- Format with minimal run of spec-cleaner
+  * Use license
+  * Sort BRs alphabetically
+
 -------------------------------------------------------------------
 Thu Apr  5 15:09:26 UTC 2018 - fcrozat@suse.com
 

ImageMagick.spec

@@ -31,7 +31,7 @@ Release:        0
 Summary:        Viewer and Converter for Images
 License:        ImageMagick
 Group:          Productivity/Graphics/Other
-Url:            http://www.imagemagick.org
+URL:            http://www.imagemagick.org
 Source0:        http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.bz2
 Source1:        baselibs.conf
 Source2:        http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.bz2.asc
@@ -55,35 +55,41 @@ Patch4:         ImageMagick-write.t-pict.patch
 Patch5:         ImageMagick-tests.tap-attributes.patch
 #%%endif
 BuildRequires:  chrpath
-%if 0%{?suse_version} >= 1315
-BuildRequires:  dejavu-fonts
-%endif
 BuildRequires:  dos2unix
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
-%if 0%{?suse_version} >= 1315
-BuildRequires:  libjbig-devel
-%endif
 BuildRequires:  libjasper-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libtool
 BuildRequires:  libwmf-devel
 BuildRequires:  lzma-devel
-%if 0%{?suse_version} > 1315
+BuildRequires:  xdg-utils
-BuildRequires:  mupdf-devel-static
+BuildRequires:  zip
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} >= 1315
+BuildRequires:  dejavu-fonts
+%endif
+%if 0%{?suse_version} >= 1315
+BuildRequires:  libjbig-devel
 %endif
 %if 0%{?suse_version} >= 1315
 BuildRequires:  p7zip
 BuildRequires:  pkgconfig
 %endif
-BuildRequires:  xdg-utils
-BuildRequires:  zip
 %if 0%{?suse_version} >= 1315
 BuildRequires:  pkgconfig(OpenEXR)
 BuildRequires:  pkgconfig(bzip2)
 BuildRequires:  pkgconfig(ddjvuapi)
 BuildRequires:  pkgconfig(fftw3)
 BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(lcms2)
+BuildRequires:  pkgconfig(libexif)
+BuildRequires:  pkgconfig(librsvg-2.0)
+BuildRequires:  pkgconfig(libtiff-4) >= 4.0.3
+BuildRequires:  pkgconfig(libwebp)
+BuildRequires:  pkgconfig(libwebpmux)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(pango)
 %if 0%{?suse_version} > 1315
 BuildRequires:  pkgconfig(ijs)
 %else
@@ -91,20 +97,12 @@ BuildRequires:  ghostscript-fonts-other
 BuildRequires:  ghostscript-fonts-std
 BuildRequires:  ghostscript-library
 %endif
-BuildRequires:  pkgconfig(lcms2)
-BuildRequires:  pkgconfig(libexif)
 %if 0%{?suse_version} > 1315
 BuildRequires:  pkgconfig(libopenjp2) >= 2.1.0
 %endif
-BuildRequires:  pkgconfig(librsvg-2.0)
-BuildRequires:  pkgconfig(libtiff-4) >= 4.0.3
-BuildRequires:  pkgconfig(libwebp)
-BuildRequires:  pkgconfig(libwebpmux)
-BuildRequires:  pkgconfig(libxml-2.0)
 %if 0%{?suse_version} > 1315
 BuildRequires:  pkgconfig(lqr-1)
 %endif
-BuildRequires:  pkgconfig(pango)
 %else
 BuildRequires:  OpenEXR-devel
 BuildRequires:  fftw3-devel
@@ -125,7 +123,6 @@ BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(zlib)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %endif
 
 %package -n perl-PerlMagick
@@ -164,8 +161,8 @@ Recommends:     transfig
 %package -n libMagickCore%{libspec}%{clibver}
 Summary:        C runtime library for ImageMagick
 Group:          Productivity/Graphics/Other
-Suggests:       ImageMagick-extra = %{version}
 Recommends:     ghostscript
+Suggests:       ImageMagick-extra = %{version}
 
 %package -n libMagickWand%{libspec}%{cwandver}
 Summary:        C runtime library for ImageMagick
@@ -416,7 +413,8 @@ sed -i 's:%{buildroot}::' %{buildroot}/%{_libdir}/ImageMagick-%{mfr_version}/con
 %if 0%{?suse_version} < 1315
 %defattr(-,root,root)
 %endif
-%doc LICENSE ChangeLog NEWS.txt
+%license LICENSE
+%doc ChangeLog NEWS.txt
 %{_bindir}/[^MW]*
 %{_mandir}/man1/*
 %exclude %{_mandir}/man1/*-config.1%{ext_man}
@@ -425,7 +423,8 @@ sed -i 's:%{buildroot}::' %{buildroot}/%{_libdir}/ImageMagick-%{mfr_version}/con
 %if 0%{?suse_version} < 1315
 %defattr(-,root,root)
 %endif
-%doc LICENSE ChangeLog NEWS.txt
+%license LICENSE
+%doc ChangeLog NEWS.txt
 %{_libdir}/libMagickCore*.so.%{clibver}*
 %dir %{_sysconfdir}/ImageMagick*
 %config %{_sysconfdir}/ImageMagick*/*
@@ -490,7 +489,7 @@ sed -i 's:%{buildroot}::' %{buildroot}/%{_libdir}/ImageMagick-%{mfr_version}/con
 %{perl_vendorarch}/auto/Image
 %{perl_vendorarch}/Image
 %if 0%{?suse_version} < 1315
-/var/adm/perl-modules/ImageMagick
+%{_localstatedir}/adm/perl-modules/ImageMagick
 %endif
 
 %files -n libMagick++%{libspec}%{cxxlibver}