- package www docs as resurrected -doc subpackage

- License format unification

Changed files:
    ImageMagick.spec -> 1.191

diff --git a/ImageMagick.spec b/ImageMagick.spec
index e0f94ea1b9f69cc1d8c2e5e39132a4a15eea1ace..82bf677338ddc4da1485b0960b662d0c2654585c 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -22,7 +22,7 @@ Name:         ImageMagick
 Version:       %{ver}%{?pver:.%{pver}}
 Release:       1
 Epoch:         1
-License:       Apache-style License
+License:       Apache-like
 Group:         X11/Applications/Graphics
 Source0:       http://www.imagemagick.org/download/%{name}-%{ver}-%{pver}.tar.bz2
 # Source0-md5: 0855b4b03aa566a2121d4d12ef810419
@@ -117,6 +117,17 @@ ImageMagick - 
 ÚÏÂÒÁÖÅÎØ. ÷ÏÎÁ ÐÒÁÃÀ¤ Ð¦Ä X Window. ImageMagick ÄÁ¤ ËÏÒÉÓÔÕ×ÁÞÕ
 ÛÉÒÏ˦ ÍÏÖÌÉ×ÏÓÔ¦ ÐÏ ÏÂÒÏÂæ ÚÏÂÒÁÖÅÎØ × Ò¦ÚÎÏÍÁΦÔÎÉÈ ÆÏÒÍÁÔÁÈ.
 
+%package doc
+Summary:       ImageMagick documentation
+Summary(pl):   Dokumentacja do ImageMagick
+Group:         Documentation
+
+%description doc
+Documentation for ImageMagick.
+
+%description doc -l pl
+Dokumentacja do ImageMagick.
+
 %package libs
 Summary:       ImageMagick libraries
 Summary(pl):   Biblioteki ImageMagick
@@ -554,7 +565,6 @@ Modu
 find -type f -exec perl -pi -e 's=!/usr/local/bin/perl=!/usr/bin/perl='  {} \;
 
 %build
-rm -f missing
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
@@ -787,6 +797,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %{_mandir}/man1/[Iacdim]*
 
+%files doc
+%defattr(644,root,root,755)
+%doc www
+
 %files libs
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog LICENSE NEWS