From d99fd3a835533217c97d22245bce2d4f86ea2197 Mon Sep 17 00:00:00 2001 From: jenna Date: Fri, 3 Jun 2022 23:06:23 -0600 Subject: [PATCH 1/2] Tries to use system Fortran if installed, this prevents that --- packages/fftw/SPECS/fftw.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fftw/SPECS/fftw.spec b/packages/fftw/SPECS/fftw.spec index fa112d731..5447d8f11 100644 --- a/packages/fftw/SPECS/fftw.spec +++ b/packages/fftw/SPECS/fftw.spec @@ -285,7 +285,7 @@ autoreconf -vfi # Configure uses g77 by default, if present on system #export F77=gfortran -BASEFLAGS="--enable-shared --disable-dependency-tracking --enable-threads" +BASEFLAGS="--enable-shared --disable-dependency-tracking --enable-threads --disable-fortran" #BASEFLAGS+=" --enable-openmp" # Precisions to build From a50124fc4a104757177f27ee982a35012c56cd70 Mon Sep 17 00:00:00 2001 From: jenna Date: Sat, 4 Jun 2022 20:11:33 -0600 Subject: [PATCH 2/2] Minor patches to imagemagick --- packages/ImageMagick/SPECS/ImageMagick.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/ImageMagick/SPECS/ImageMagick.spec b/packages/ImageMagick/SPECS/ImageMagick.spec index 6f41bd3c8..5cd45524f 100644 --- a/packages/ImageMagick/SPECS/ImageMagick.spec +++ b/packages/ImageMagick/SPECS/ImageMagick.spec @@ -10,7 +10,7 @@ Epoch: 2 Epoch: 0 %endif Version: %{VER}.%{Patchlevel} -Release: 2%{?dist} +Release: 3%{?dist} Summary: An X application for displaying and manipulating images License: ImageMagick @@ -186,6 +186,10 @@ cp -a www/source %{buildroot}%{_datadir}/doc/%{name}-%{VER} # Delete *ONLY* _libdir/*.la files! .la files used internally to handle plugins - BUG#185237!!! rm %{buildroot}%{_libdir}/*.la +# Don't skip the actual binaries +cp -r utilities/.libs %{buildroot}%{_bindir}/ +# utilities/.libs/ + # perlmagick: fix perl path of demo files %{__perl} -MExtUtils::MakeMaker -e 'MY->fixin(@ARGV)' PerlMagick/demo/*.pl @@ -247,6 +251,8 @@ rm PerlMagick/demo/Generic.ttf %files %doc README.txt LICENSE NOTICE AUTHORS.txt NEWS.txt ChangeLog Platforms.txt %{_bindir}/[a-z]* +%{_bindir}/.libs +%{_bindir}/.libs/* %{_mandir}/man[145]/[a-z]* %{_mandir}/man1/%{name}.*