pool/ImageMagick
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 201893 from home:pgajdos

Browse Source 
- documentation back to -doc package

OBS-URL: https://build.opensuse.org/request/show/201893
OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=168
This commit is contained in:
Petr Gajdos 2013-10-02 13:27:18 +00:00 committed by Git OBS Bridge
parent 6840c482a4
commit 19631d6835
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ImageMagick.changes
View File

@ -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) - 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 Mon Sep 30 13:38:14 UTC 2013 - pgajdos@suse.com

25
ImageMagick.spec
View File

@ -179,26 +179,22 @@ cd PerlMagick
make test make test
%install %install
%{__install} -d "${RPM_BUILD_ROOT%}"'%{_defaultdocdir}/%{name}/images'
%{__make} install \ %{__make} install \
DESTDIR=$RPM_BUILD_ROOT \ DESTDIR=%{buildroot} \
pkgdocdir=%{_defaultdocdir}/%{name}/ pkgdocdir=%{_defaultdocdir}/%{name}-doc/
%perl_process_packlist %perl_process_packlist
cd 'Magick++' cd 'Magick++'
%{__rm} -rf demo/{.deps,.libs,*.C,*.o,Makefile*,run_demos.bat} %{__rm} -rf demo/{.deps,.libs,*.C,*.o,Makefile*,run_demos.bat}
PATH='/bin:/usr/bin' find demo -type f -perm /111 -execdir %{__rm} -rf '{}' ';' PATH='/bin:/usr/bin' find demo -type f -perm /111 -execdir %{__rm} -rf '{}' ';'
%{__mv} demo/makefile.2 demo/Makefile %{__mv} demo/makefile.2 demo/Makefile
cd .. cd ..
%{__mv} -t "${RPM_BUILD_ROOT}"'%{_sysconfdir}'/%{name}* "${RPM_BUILD_ROOT}"'%{_datadir}'/%{name}*/*.xml %{__mv} -t %{buildroot}%{_sysconfdir}/%{name}* %{buildroot}%{_datadir}/%{name}*/*.xml
PATH='/bin:/usr/bin' find "${RPM_BUILD_ROOT}/%{_libdir}" -name "*.la" ! -empty \ 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' '{}' ';' -execdir %{__sed} -i -e 's@ -L/usr/src[^ ]*@@g' -e 's@ /usr/lib/libltdl.la@@g' '{}' ';'
%{__rm} -f "${RPM_BUILD_ROOT}"'%{_libdir}'/libltdl.* %{__rm} %{buildroot}%{_libdir}/*.la
%{__rm} -f "${RPM_BUILD_ROOT}"'%{_libdir}'/*.la
%if 0%{?suse_version} > 1020 %if 0%{?suse_version} > 1020
%fdupes $RPM_BUILD_ROOT%{_includedir}/%{name}*/wand %fdupes -s %{buildroot}%{_defaultdocdir}/%{name}-doc/www/api
%fdupes $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}*/www/api
%endif %endif
rm -rf %{buildroot}/%{_datadir}/doc/%{name}
%post -n libMagickCore%{libspec}-%{clibver} -p /sbin/ldconfig %post -n libMagickCore%{libspec}-%{clibver} -p /sbin/ldconfig
@ -214,9 +210,8 @@ rm -rf %{buildroot}/%{_datadir}/doc/%{name}
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%docdir %{_docdir}/%{name}
%doc QuickStart.txt README.txt NEWS.txt ChangeLog LICENSE
%{_bindir}/[^MW]* %{_bindir}/[^MW]*
%doc QuickStart.txt README.txt NEWS.txt ChangeLog LICENSE
%doc %{_mandir}/man1/* %doc %{_mandir}/man1/*
%exclude %{_mandir}/man1/*-config.1.gz %exclude %{_mandir}/man1/*-config.1.gz
@ -301,7 +296,7 @@ rm -rf %{buildroot}/%{_datadir}/doc/%{name}
%files doc %files doc
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_docdir}/%{name} %{_docdir}/%{name}-doc
%description %description
ImageMagick is a robust collection of tools and libraries to read, ImageMagick is a robust collection of tools and libraries to read,
@ -420,6 +415,10 @@ HTML documentation for ImageMagick library and scene examples.