diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec index 0eca800..b215e76 100644 --- a/GraphicsMagick.spec +++ b/GraphicsMagick.spec @@ -28,7 +28,7 @@ Summary: An ImageMagick fork, offering faster image generation and better quality Name: GraphicsMagick Version: 1.3.28 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.xz @@ -45,6 +45,7 @@ Patch50: GraphicsMagick-1.3.14-perl_linkage.patch BuildRequires: bzip2-devel BuildRequires: freetype-devel +BuildRequires: gcc-c++ BuildRequires: giflib-devel BuildRequires: jasper-devel BuildRequires: lcms2-devel @@ -187,13 +188,13 @@ sed -i.rpath -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure --without-gslib \ --with-gs-font-dir=%{_datadir}/fonts/default/Type1 -make %{?_smp_mflags} -make %{?_smp_mflags} perl-build +%make_build +%make_build perl-build %install -make install DESTDIR=%{buildroot} -make install DESTDIR=%{buildroot} -C PerlMagick +%make_install +%make_install -C PerlMagick # perlmagick: fix perl path of demo files %{__perl} -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' PerlMagick/demo/*.pl @@ -257,7 +258,7 @@ exit 1 %endif -%{?ldconfig_scriptlets} +%ldconfig_scriptlets %files %dir %{_pkgdocdir} @@ -288,8 +289,7 @@ exit 1 %{_pkgdocdir}/*.txt %{_pkgdocdir}/www/ -%post c++ -p /sbin/ldconfig -%postun c++ -p /sbin/ldconfig +%ldconfig_scriptlets c++ %files c++ %{_libdir}/libGraphicsMagick++%{?libQ}.so.12* @@ -308,6 +308,9 @@ exit 1 %changelog +* Wed Mar 07 2018 Rex Dieter - 1.3.28-4 +- BR: gcc-c++, %%make_build %%make_install %%ldconfig_scriptlets + * Fri Feb 16 2018 Rex Dieter - 1.3.28-3 - use %%ldconfig_scriptlets - s/libungif/giflib