From a8779cfcf4fdf37ac5f5b5e2b9eb496eb80652cd Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Thu, 27 Jul 2017 20:56:32 -0500
Subject: [PATCH] .spec cleanup, drop deprecated stuff update filtering restore
 %check

---
 GraphicsMagick.spec | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec
index 9bd8bc0..963d3f6 100644
--- a/GraphicsMagick.spec
+++ b/GraphicsMagick.spec
@@ -1,4 +1,3 @@
-%{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 %if 0%{?fedora} || 0%{?rhel} > 6
 %global _with_quantum_depth --with-quantum-depth=16
@@ -24,22 +23,16 @@
 # trim changelog included in binary rpms
 %global _changelog_trimtime %(date +%s -d "1 year ago")
 
-## FIXME/TODO: update to new style filtering
-%{?filter_setup:
-%filter_provides_in %{_libdir}/GraphicsMagick-%{version}
-%filter_setup
-}
+%global __provides_exclude_from ^%{_libdir}/GraphicsMagick-%{version}/.*\\.(la|so)$
 
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
 Version: 1.3.26
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: MIT
-Group: Applications/Multimedia
 Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.xz
 Url: http://www.graphicsmagick.org/
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 ## downstream patches
 # workaround multilib conflicts with GraphicsMagick-config
@@ -201,8 +194,6 @@ make %{?_smp_mflags} perl-build
 
 
 %install
-rm -rf %{buildroot}
-
 make install DESTDIR=%{buildroot}
 make install DESTDIR=%{buildroot} -C PerlMagick
 
@@ -257,8 +248,8 @@ EOF
 
 
 %check
-#time \
-#make %{?_smp_mflags} check ||:
+time \
+make %{?_smp_mflags} check ||:
 # multilib hack only supports 32/64 bits for now
 %ifarch %{multilib_archs}
 %if ! (%{__isa_bits} == 32 || %{__isa_bits} == 64)
@@ -268,15 +259,10 @@ exit 1
 %endif
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
-%{!?_licensedir:%global license %doc}
 %license %{_pkgdocdir}/Copyright.txt
 %{_libdir}/libGraphicsMagick%{?libQ}.so.3*
 %{_libdir}/libGraphicsMagickWand%{?libQ}.so.2*
@@ -324,6 +310,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Jul 27 2017 Rex Dieter <rdieter@fedoraproject.org> - 1.3.26-5
+- .spec cleanup, drop deprecated stuff
+- update filtering
+- restore %%check
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.26-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild