--- cauldron/imagemagick/current/SPECS/imagemagick.spec 2011/12/22 15:05:23 185964 +++ cauldron/imagemagick/current/SPECS/imagemagick.spec 2011/12/22 15:36:15 185989 @@ -203,8 +203,10 @@ --with-xml \ --without-dps \ --without-windows-font-dir \ - --without-modules \ + --with-modules \ --with-perl \ + --without-included-ltdl --with-ltdl-include=%{_includedir} \ + --with-ltdl-lib=%{_libdir} \ --with-perl-options="INSTALLDIRS=vendor CC='%{__cc} -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \ --with-jp2 \ --with-gvc \ @@ -243,8 +245,7 @@ rm -rf installed_docs; mv %{buildroot}/installed_docs . # Remove unpackaged files -find %{buildroot} -name '*.la' | xargs rm -rm -f %{buildroot}%{_libdir}/libltdl* +rm -f %{buildroot}%{_libdir}/*.la %multiarch_binaries %{buildroot}%{_bindir}/Magick-config %multiarch_binaries %{buildroot}%{_bindir}/Magick++-config @@ -297,11 +298,7 @@ %{_bindir}/mogrify %{_bindir}/montage %{_bindir}/stream -%dir %{_libdir}/ImageMagick-%{rversion} -%dir %{_libdir}/ImageMagick-%{rversion}/modules-%{qlev} -%dir %{_libdir}/ImageMagick-%{rversion}/modules-%{qlev}/coders -%dir %{_libdir}/ImageMagick-%{rversion}/config -%{_libdir}/ImageMagick-%{rversion}/config/*.xml +%{_libdir}/ImageMagick-%{rversion} %{_datadir}/ImageMagick-%{rversion} %{_mandir}/man1/* %{_mandir}/man3/*