diff --git a/.gitignore b/.gitignore index 03de229..184c224 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /GraphicsMagick-1.3.33.tar.xz /GraphicsMagick-1.3.34.tar.xz /GraphicsMagick-1.3.35.tar.xz +/GraphicsMagick-1.3.36.tar.xz diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec index 8a364a7..fcc08cb 100644 --- a/GraphicsMagick.spec +++ b/GraphicsMagick.spec @@ -1,12 +1,7 @@ -%if 0%{?fedora} || 0%{?rhel} > 6 %global _with_quantum_depth --with-quantum-depth=16 -%endif - -%if 0%{?fedora} || 0%{?rhel} > 6 %global _enable_quantum_library_names --enable-quantum-library-names %global libQ -Q16 -%endif %if ! 0%{?flatpak} %global perl 1 @@ -31,8 +26,8 @@ Summary: An ImageMagick fork, offering faster image generation and better quality Name: GraphicsMagick -Version: 1.3.35 -Release: 3%{?dist} +Version: 1.3.36 +Release: 1%{?dist} License: MIT Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.xz @@ -82,9 +77,9 @@ BuildRequires: libwebp-devel # upgrade path for introduction of -doc subpkg in 1.3.19-4 Obsoletes: GraphicsMagick < 1.3.19-4 -# depend on stuff referenced below -# --with-gs-font-dir=%%{_datadir}/fonts/default/Type1 -Requires: urw-fonts +BuildRequires: urw-base35-fonts-devel +## FIXME/TODO: verify if all of these are needed or just some subset (suspect the latter) -- rdieter +Requires: urw-base35-fonts %description GraphicsMagick is a comprehensive image processing package which is initially @@ -181,7 +176,10 @@ sed -i.rpath -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure CFLAGS="$RPM_OPT_FLAGS -DFT_ENCODING_PRC=FT_ENCODING_GB2312" %endif -%configure --enable-shared --disable-static \ +# FIXME/TODO: --with-gs-font-dir needs adjustment for newer releases + +%configure \ + --enable-shared --disable-static \ --docdir=%{_pkgdocdir} \ --with-lcms2 \ --with-magick_plus_plus \ @@ -200,7 +198,7 @@ CFLAGS="$RPM_OPT_FLAGS -DFT_ENCODING_PRC=FT_ENCODING_GB2312" --with-xml \ --without-dps \ --without-gslib \ - --with-gs-font-dir=%{_datadir}/fonts/default/Type1 + --with-gs-font-dir=%{urw_base35_fontpath} %make_build %if 0%{?perl} @@ -333,6 +331,9 @@ exit 1 %changelog +* Wed Dec 30 2020 Rex Dieter - 1.3.36-1 +- 1.3.36 + * Mon Jul 27 2020 Fedora Release Engineering - 1.3.35-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index e445a78..958ae8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (GraphicsMagick-1.3.35.tar.xz) = baae92089d52147ef961f93495abc8a9d8b1a963af61d87a650c1ab105d46816aa38c83f654edcb5a0e1b7f07ccc06eaeaa443b9bde3a63a0b9bfb45f3ae144c +SHA512 (GraphicsMagick-1.3.36.tar.xz) = 27ed5fcbfb0303436bdcb0f11d18257a967d471251b51e633e2c655b0a7e5ed01f61a61f9702cc7d4c02714e005ac18ca9ba0f690c0580e41d07947a03c5cbb4