From 6d4547b0c442993696fe0c2ca115fbb86ea3a8ee Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 25 Jan 2021 10:26:17 -0600 Subject: [PATCH] fix bundled urw font install (#1911008) bundled fonts were getting installed, then promptly deleted. Move the install to after directory cleanup --- GraphicsMagick.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec index 3b5d701..1401981 100644 --- a/GraphicsMagick.spec +++ b/GraphicsMagick.spec @@ -27,7 +27,7 @@ Summary: An ImageMagick fork, offering faster image generation and better quality Name: GraphicsMagick Version: 1.3.36 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.xz @@ -252,17 +252,17 @@ if [ -z perl-pkg-files ] ; then fi %endif +rm -rf %{buildroot}%{_datadir}/GraphicsMagick +# Keep config +rm -rf %{buildroot}%{_datadir}/%{name}-%{version}/[a-b,d-z,A-Z]* +rm -vf %{buildroot}%{_libdir}/lib*.la + %if 0%{?urw_font_bundle} mkdir -p %{buildroot}%{urw_font_path}/ install -p -m644 urw-fonts/* \ %{buildroot}%{urw_font_path}/ %endif -rm -rf %{buildroot}%{_datadir}/GraphicsMagick -# Keep config -rm -rf %{buildroot}%{_datadir}/%{name}-%{version}/[a-b,d-z,A-Z]* -rm -vf %{buildroot}%{_libdir}/lib*.la - # fix multilib issues %ifarch %{multilib_archs} mv %{buildroot}%{_includedir}/GraphicsMagick/magick/magick_types.h \ @@ -354,6 +354,9 @@ exit 1 %changelog +* Mon Jan 25 2021 Rex Dieter - 1.3.36-2 +- fix bundled urw font install (#1911008) + * Wed Dec 30 2020 Rex Dieter - 1.3.36-1 - 1.3.36 - fix urw font path, Requires: urw-base35-fonts-legacy (#1847187)