diff --git a/ImageMagick.changes b/ImageMagick.changes index bec7c25..411e749 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -3,6 +3,11 @@ Wed Oct 2 12:33:43 UTC 2013 - dvaleev@suse.com - disable mat tests for powerpc bnc#843673 (disable_mat_test.patch) +------------------------------------------------------------------- +Wed Oct 2 08:32:02 UTC 2013 - pgajdos@suse.com + +- documentation back to -doc package + ------------------------------------------------------------------- Mon Sep 30 13:38:14 UTC 2013 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index aef51fb..b61c504 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -179,26 +179,22 @@ cd PerlMagick make test %install -%{__install} -d "${RPM_BUILD_ROOT%}"'%{_defaultdocdir}/%{name}/images' %{__make} install \ - DESTDIR=$RPM_BUILD_ROOT \ - pkgdocdir=%{_defaultdocdir}/%{name}/ + DESTDIR=%{buildroot} \ + pkgdocdir=%{_defaultdocdir}/%{name}-doc/ %perl_process_packlist cd 'Magick++' %{__rm} -rf demo/{.deps,.libs,*.C,*.o,Makefile*,run_demos.bat} PATH='/bin:/usr/bin' find demo -type f -perm /111 -execdir %{__rm} -rf '{}' ';' %{__mv} demo/makefile.2 demo/Makefile cd .. -%{__mv} -t "${RPM_BUILD_ROOT}"'%{_sysconfdir}'/%{name}* "${RPM_BUILD_ROOT}"'%{_datadir}'/%{name}*/*.xml -PATH='/bin:/usr/bin' find "${RPM_BUILD_ROOT}/%{_libdir}" -name "*.la" ! -empty \ +%{__mv} -t %{buildroot}%{_sysconfdir}/%{name}* %{buildroot}%{_datadir}/%{name}*/*.xml +PATH='/bin:/usr/bin' find %{buildroot}/%{_libdir} -name "*.la" ! -empty \ -execdir %{__sed} -i -e 's@ -L/usr/src[^ ]*@@g' -e 's@ /usr/lib/libltdl.la@@g' '{}' ';' -%{__rm} -f "${RPM_BUILD_ROOT}"'%{_libdir}'/libltdl.* -%{__rm} -f "${RPM_BUILD_ROOT}"'%{_libdir}'/*.la +%{__rm} %{buildroot}%{_libdir}/*.la %if 0%{?suse_version} > 1020 -%fdupes $RPM_BUILD_ROOT%{_includedir}/%{name}*/wand -%fdupes $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}*/www/api +%fdupes -s %{buildroot}%{_defaultdocdir}/%{name}-doc/www/api %endif -rm -rf %{buildroot}/%{_datadir}/doc/%{name} %post -n libMagickCore%{libspec}-%{clibver} -p /sbin/ldconfig @@ -214,9 +210,8 @@ rm -rf %{buildroot}/%{_datadir}/doc/%{name} %files %defattr(-,root,root) -%docdir %{_docdir}/%{name} -%doc QuickStart.txt README.txt NEWS.txt ChangeLog LICENSE %{_bindir}/[^MW]* +%doc QuickStart.txt README.txt NEWS.txt ChangeLog LICENSE %doc %{_mandir}/man1/* %exclude %{_mandir}/man1/*-config.1.gz @@ -301,7 +296,7 @@ rm -rf %{buildroot}/%{_datadir}/doc/%{name} %files doc %defattr(-,root,root) -%dir %{_docdir}/%{name} +%{_docdir}/%{name}-doc %description ImageMagick is a robust collection of tools and libraries to read, @@ -420,6 +415,10 @@ HTML documentation for ImageMagick library and scene examples. + + + +