From 14e33a31c10ddf6e0a71659c735601bd0ee4a62d Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Thu, 8 Sep 2016 06:58:10 -0500
Subject: [PATCH] 1.3.25-1

- 1.3.25
- -doc: fix case where %licensedir is undefined
---
 .gitignore          |  2 +-
 GraphicsMagick.spec | 20 ++++++++++++--------
 sources             |  2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 95d442e..427f25f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/GraphicsMagick-1.3.24.tar.xz
+/GraphicsMagick-1.3.25.tar.xz
diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec
index 4c14864..faf98a3 100644
--- a/GraphicsMagick.spec
+++ b/GraphicsMagick.spec
@@ -31,7 +31,7 @@
 
 Summary: An ImageMagick fork, offering faster image generation and better quality
 Name: GraphicsMagick
-Version: 1.3.24
+Version: 1.3.25
 Release: 1%{?dist}
 
 License: MIT
@@ -251,13 +251,10 @@ cat >%{buildroot}%{_includedir}/GraphicsMagick/magick/magick_types.h <<EOF
 EOF
 %endif
 
-## unpackaged files
-rm -f %{buildroot}%{_pkgdocdir}/Copyright.txt
-
 
 %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)
@@ -276,7 +273,7 @@ rm -rf %{buildroot}
 
 %files
 %{!?_licensedir:%global license %doc}
-%license Copyright.txt
+%license %{_pkgdocdir}/Copyright.txt
 %{_libdir}/libGraphicsMagick%{?libQ}.so.3*
 %{_libdir}/libGraphicsMagickWand%{?libQ}.so.2*
 %{_bindir}/[a-z]*
@@ -298,7 +295,10 @@ rm -rf %{buildroot}
 %{_mandir}/man1/GraphicsMagickWand-config.*
 
 %files doc
-%{_pkgdocdir}
+%dir %{_pkgdocdir}
+%{_pkgdocdir}/ChangeLog*
+%{_pkgdocdir}/*.txt
+%{_pkgdocdir}/www/
 
 %post c++ -p /sbin/ldconfig
 %postun c++ -p /sbin/ldconfig
@@ -320,6 +320,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Sep 08 2016 Rex Dieter <rdieter@fedoraproject.org> - 1.3.25-1
+- 1.3.25
+- -doc: fix case where %%licensedir is undefined
+
 * Mon May 30 2016 Rex Dieter <rdieter@fedoraproject.org> - 1.3.24-1
 - 1.3.24
 
diff --git a/sources b/sources
index 08ab808..3eb86f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-40034150f6eaae28a12b6c8f9baa3e5e  GraphicsMagick-1.3.24.tar.xz
+6eed966b22588fb068442319a8aa17f6  GraphicsMagick-1.3.25.tar.xz