1.3.33

use %perl feature macro (instead of %flatpak) everywhere

.gitignore

@@ -1,2 +1,3 @@
 /GraphicsMagick-1.3.31.tar.xz
 /GraphicsMagick-1.3.32.tar.xz
+/GraphicsMagick-1.3.33.tar.xz

GraphicsMagick.spec

@@ -8,6 +8,10 @@
 %global libQ -Q16
 %endif
 
+%if ! 0%{?flatpak}
+%global perl 1
+%endif
+
 %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}
@@ -27,8 +31,8 @@
 
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
-Version: 1.3.32
+Version: 1.3.33
-Release: 3%{?dist}
+Release: 1%{?dist}
 
 License: MIT
 Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.xz
@@ -59,7 +63,7 @@ BuildRequires: libxml2-devel
 BuildRequires: libX11-devel libXext-devel libXt-devel
 BuildRequires: lpr
 BuildRequires: p7zip
-%if ! 0%{?flatpak}
+%if 0%{?perl}
 BuildRequires: perl-devel
 BuildRequires: perl-generators
 BuildRequires: perl(ExtUtils::MakeMaker)
@@ -111,7 +115,7 @@ Obsoletes: GraphicsMagick < 1.3.19-4
 %description doc
 Documentation for GraphicsMagick.
 
-%if ! 0%{?flatpak}
+%if 0%{?perl}
 %package perl
 Summary: GraphicsMagick perl bindings
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -199,7 +203,7 @@ CFLAGS="$RPM_OPT_FLAGS -DFT_ENCODING_PRC=FT_ENCODING_GB2312"
            --with-gs-font-dir=%{_datadir}/fonts/default/Type1
 
 %make_build
-%if ! 0%{?flatpak}
+%if 0%{?perl}
 %make_build perl-build
 %endif
 
@@ -207,7 +211,7 @@ CFLAGS="$RPM_OPT_FLAGS -DFT_ENCODING_PRC=FT_ENCODING_GB2312"
 %install
 %make_install
 
-%if ! 0%{?flatpak}
+%if 0%{?perl}
 %make_install -C PerlMagick
 
 # perlmagick: fix perl path of demo files
@@ -263,7 +267,7 @@ EOF
 
 
 %check
-%if ! 0%{?flatpak}
+%if 0%{?perl}
 make test -C PerlMagick ||:
 %endif
 time \
@@ -321,7 +325,7 @@ exit 1
 %{_libdir}/pkgconfig/GraphicsMagick++.pc
 %{_mandir}/man1/GraphicsMagick++-config.*
 
-%if ! 0%{?flatpak}
+%if 0%{?perl}
 %files perl -f perl-pkg-files
 %{_mandir}/man3/*
 %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt
@@ -329,6 +333,10 @@ exit 1
 
 
 %changelog
+* Sat Aug 17 2019 Rex Dieter <rdieter@fedoraproject.org> - 1.3.33-1
+- 1.3.33
+- use %%perl feature macro (instead of %%flatpak) everywhere
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.32-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (GraphicsMagick-1.3.32.tar.xz) = f84cdb9318962aed1dc25d70db4d0ca102e4f88748f468f8a56b77d228fd315b772afa48e90a396d32e8226eba9105717bcb94166bbe43723afeec58ead53e09
+SHA512 (GraphicsMagick-1.3.33.tar.xz) = 8afeb461d1a9dab9b88b9bc7c2d50b5c409463b369e6b0ba7ee39b0ece32da9393d7a5a4d18faf8f72a529346a3477bae61b802bac2af81aeae79d95c9d6cd13