diff --git a/ImageMagick.changes b/ImageMagick.changes index 6ef4a99..9f2961e 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -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 66f53f5..a62ac33 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,8 +223,6 @@ 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) @@ -233,12 +231,8 @@ 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)