From 15144729c22d301ad6c225ae7a29cc4d63834d5916c97980c8a4ed449d977737 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 15 Feb 2010 08:55:50 +0000 Subject: [PATCH] - don't remove *.la files, see [bnc#579798] OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=20 --- ImageMagick.changes | 5 +++++ ImageMagick.spec | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ImageMagick.changes b/ImageMagick.changes index 9f2961e..6ef4a99 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 15 09:39:38 CET 2010 - pgajdos@suse.cz + +- don't remove *.la files, see [bnc#579798] + ------------------------------------------------------------------- Tue Feb 9 15:03:34 UTC 2010 - prusnak@suse.cz diff --git a/ImageMagick.spec b/ImageMagick.spec index a62ac33..66f53f5 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -179,9 +179,9 @@ mv -f $RPM_BUILD_ROOT%{_datadir}/ImageMagick*/config/* $RPM_BUILD_ROOT%{_libdir} rmdir $RPM_BUILD_ROOT%{_datadir}/ImageMagick*/config mv -f $RPM_BUILD_ROOT%{_datadir}/ImageMagick*/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/ cp -a scenes $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/ +find $RPM_BUILD_ROOT/%{_libdir} -name "*.la" -print0 | xargs -0 -r perl -spi -e "s@ -L/usr/src[^ ]*@@g;s@ /usr/lib/libltdl.la@@g" rm -f $RPM_BUILD_ROOT%{_libdir}/libltdl.* rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/ImageMagick*/modules*/*/*.la %if 0%{?suse_version} > 1020 %fdupes $RPM_BUILD_ROOT%{_includedir}/ImageMagick/wand %fdupes $RPM_BUILD_ROOT%{_datadir}/doc/packages/ImageMagick/www/api @@ -223,6 +223,8 @@ rm -rf $RPM_BUILD_ROOT %exclude %{_libdir}/ImageMagick*/modules*/*/jp2.* %exclude %{_libdir}/ImageMagick*/modules*/*/djvu.* %{_libdir}/ImageMagick*/modules*/*/*.so +# don't remove la files, see bnc#579798 +%{_libdir}/ImageMagick*/modules*/*/*.la %files -n libMagickWand2 %defattr(-,root,root) @@ -231,8 +233,12 @@ rm -rf $RPM_BUILD_ROOT %files extra %defattr(-,root,root) %{_libdir}/ImageMagick*/modules*/*/wmf.so +# don't remove la files, see bnc#579798 +%{_libdir}/ImageMagick*/modules*/*/wmf.la %{_libdir}/ImageMagick*/modules*/*/jp2.so +%{_libdir}/ImageMagick*/modules*/*/jp2.la %{_libdir}/ImageMagick*/modules*/*/djvu.so +%{_libdir}/ImageMagick*/modules*/*/djvu.la %files devel %defattr(-,root,root)