From b84dc149a736e5ddad0b929ecd868949a090e40d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 8 Feb 2016 08:46:23 -0600 Subject: [PATCH] make .spec el5/el6-compatible again --- GraphicsMagick.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec index 80c98cc..2b210f7 100644 --- a/GraphicsMagick.spec +++ b/GraphicsMagick.spec @@ -1,4 +1,4 @@ -%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} +%{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} %if 0%{?fedora} > 15 || 0%{?rhel} > 6 %global _with_quantum_depth --with-quantum-depth=16 @@ -15,7 +15,7 @@ %global libQ -Q16 %endif -%define multilib_archs x86_64 %{ix86} ppc64 ppc64le ppc s390x s390 sparc64 sparcv9 +%global multilib_archs x86_64 %{ix86} ppc64 ppc64le ppc s390x s390 sparc64 sparcv9 # hack for older platforms/rpm-versions that do not support %%__isa_bits (like el5) %ifarch %{multilib_archs} %if ! 0%{?__isa_bits:1} @@ -55,10 +55,8 @@ Patch50: GraphicsMagick-1.3.14-perl_linkage.patch ## upstream patches BuildRequires: bzip2-devel -BuildRequires: cups-client BuildRequires: freetype-devel BuildRequires: jasper-devel -BuildRequires: jbigkit-devel BuildRequires: %{lcms}-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel @@ -66,10 +64,10 @@ BuildRequires: librsvg2-devel BuildRequires: libtiff-devel BuildRequires: libtool-ltdl-devel BuildRequires: libungif-devel -BuildRequires: libwebp-devel BuildRequires: libwmf-devel BuildRequires: libxml2-devel BuildRequires: libX11-devel libXext-devel libXt-devel +BuildRequires: lpr BuildRequires: p7zip BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: xdg-utils @@ -77,6 +75,11 @@ BuildRequires: xz-devel BuildRequires: zlib-devel ## FIXME: %%check stuff #BuildRequires: xorg-x11-server-Xvfb +## conditional deps +%if 0%{?fedora} || 0%{?rhel} > 6 +BuildRequires: jbigkit-devel +BuildRequires: libwebp-devel +%endif # upgrade path for introduction of -doc subpkg in 1.3.19-4 Obsoletes: GraphicsMagick < 1.3.19-4 @@ -275,6 +278,7 @@ rm -rf %{buildroot} %postun -p /sbin/ldconfig %files +%{!?_licensedir:%global license %doc} %license Copyright.txt %{_libdir}/libGraphicsMagick%{?libQ}.so.3* %{_libdir}/libGraphicsMagickWand%{?libQ}.so.2* @@ -319,6 +323,9 @@ rm -rf %{buildroot} %changelog +* Mon Feb 08 2016 Rex Dieter - 1.3.23-4 +- make .spec el5/el6-compatible again + * Wed Feb 03 2016 Fedora Release Engineering - 1.3.23-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild