diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec index f8d7aed..edbc85b 100644 --- a/GraphicsMagick.spec +++ b/GraphicsMagick.spec @@ -1,16 +1,14 @@ %{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} -%if 0%{?fedora} > 15 || 0%{?rhel} > 6 +%if 0%{?fedora} || 0%{?rhel} > 6 %global _with_quantum_depth --with-quantum-depth=16 %endif -%if 0%{?fedora} > 16 || 0%{?rhel} > 6 -%global lcms lcms2 -%else -%global lcms lcms +%if 0%{?fedora} || 0%{?rhel} > 5 +%global lcms2 --with-lcms2 %endif -%if 0%{?fedora} > 18 || 0%{?rhel} > 6 +%if 0%{?fedora} || 0%{?rhel} > 6 %global _enable_quantum_library_names --enable-quantum-library-names %global libQ -Q16 %endif @@ -38,7 +36,7 @@ Summary: An ImageMagick fork, offering faster image generation and better quality Name: GraphicsMagick Version: 1.3.23 -Release: 4%{?dist} +Release: 5%{?dist} License: MIT Group: Applications/Multimedia @@ -57,7 +55,9 @@ Patch50: GraphicsMagick-1.3.14-perl_linkage.patch BuildRequires: bzip2-devel BuildRequires: freetype-devel BuildRequires: jasper-devel -BuildRequires: %{lcms}-devel +%if 0%{?lcms2:1} +BuildRequires: lcms2-devel +%endif BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: librsvg2-devel @@ -181,7 +181,7 @@ sed -i.rpath -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure %build %configure --enable-shared --disable-static \ --docdir=%{_pkgdocdir} \ - --with-%{lcms} \ + %{?lcms2} \ --with-magick_plus_plus \ --with-modules \ --with-perl \ @@ -323,6 +323,10 @@ rm -rf %{buildroot} %changelog +* Fri Mar 04 2016 Rex Dieter - 1.3.23-5 +- LCMS support broken in GraphicsMagick 1.3.23 (#1314898) +- simplify .spec conditionals (EOL fedora releases mostly) + * Mon Feb 08 2016 Rex Dieter - 1.3.23-4 - make .spec el5/el6-compatible again