SPECS: ImageMagick.spec - merged from AC-branch: moved documentati...

[qboosh]

Author: qboosh                       Date: Sun May 13 09:38:27 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from AC-branch: moved documentation to -doc, fix paths in manpages
- release 2

---- Files affected:
SPECS:
   ImageMagick.spec (1.253 -> 1.254) 

---- Diffs:

================================================================
Index: SPECS/ImageMagick.spec
diff -u SPECS/ImageMagick.spec:1.253 SPECS/ImageMagick.spec:1.254
--- SPECS/ImageMagick.spec:1.253	Thu Mar  8 11:12:38 2007
+++ SPECS/ImageMagick.spec	Sun May 13 11:38:21 2007
@@ -24,7 +24,7 @@
 Summary(uk.UTF-8):	Перегляд, конвертування та обробка зображень під X Window
 Name:		ImageMagick
 Version:	%{ver}%{?pver:.%{pver}}
-Release:	1
+Release:	2
 Epoch:		1
 License:	Apache-like
 Group:		X11/Applications/Graphics
@@ -606,6 +606,7 @@
 	--with-x
 
 %{__make}
+%{__perl} -pi -e 's,/%{name}-%{ver}/,/%{name}-doc-%{version}/,' utilities/*.1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -613,7 +614,7 @@
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	pkgdocdir=%{_docdir}/%{name}-devel-%{version}
+	pkgdocdir=%{_docdir}/%{name}-doc-%{version}
 
 install PerlMagick/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl
 rm -f $RPM_BUILD_ROOT%{modulesdir}/{coders,filters}/*.a
@@ -834,7 +835,7 @@
 
 %files doc
 %defattr(644,root,root,755)
-%doc www
+%doc %{_defaultdocdir}/%{name}-doc-%{version}
 
 %files libs
 %defattr(644,root,root,755)
@@ -946,7 +947,6 @@
 
 %files devel
 %defattr(644,root,root,755)
-%doc %{_docdir}/%{name}-devel-%{version}
 %attr(755,root,root) %{_bindir}/Magick-config
 %attr(755,root,root) %{_bindir}/Wand-config
 %attr(755,root,root) %{_libdir}/libMagick.so
@@ -1001,6 +1001,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.254  2007/05/13 09:38:21  qboosh
+- merged from AC-branch: moved documentation to -doc, fix paths in manpages
+- release 2
+
 Revision 1.253  2007/03/08 10:12:38  arekm
 - up to 6.3.3.0
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ImageMagick.spec?r1=1.253&r2=1.254&f=u