SPECS (AC-branch): ImageMagick.spec - fix build with automake 1.10...

[ankry]

Author: ankry                        Date: Sun May 13 09:06:56 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- fix build with automake 1.10
- move documentation to -dos; fix paths in manpages

---- Files affected:
SPECS:
   ImageMagick.spec (1.222.2.4 -> 1.222.2.5) 

---- Diffs:

================================================================
Index: SPECS/ImageMagick.spec
diff -u SPECS/ImageMagick.spec:1.222.2.4 SPECS/ImageMagick.spec:1.222.2.5
--- SPECS/ImageMagick.spec:1.222.2.4	Wed Aug 23 06:42:52 2006
+++ SPECS/ImageMagick.spec	Sun May 13 11:06:51 2007
@@ -23,7 +23,7 @@
 Summary(uk):	đĹŇĹÇĚŃÄ, ËĎÎ×ĹŇÔŐ×ÁÎÎŃ ÔÁ ĎÂŇĎÂËÁ ÚĎÂŇÁÖĹÎŘ ĐŚÄ X Window
 Name:		ImageMagick
 Version:	%{ver}%{?pver:.%{pver}}
-Release:	2
+Release:	3
 Epoch:		1
 License:	Apache-like
 Group:		X11/Applications/Graphics
@@ -34,6 +34,7 @@
 Patch1:		%{name}-ac.patch
 Patch2:		%{name}-system-libltdl.patch
 Patch3:		%{name}-link.patch
+Patch4:		%{name}-am110.patch
 URL:		http://www.imagemagick.org/
 BuildRequires:	XFree86-DPS-devel
 BuildRequires:	XFree86-devel
@@ -568,6 +569,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %{__perl} -pi -e 's,lib/graphviz,%{_lib}/graphviz,' configure.ac
 find -type f -exec perl -pi -e 's=!/usr/local/bin/perl=!/usr/bin/perl='  {} \;
@@ -601,6 +603,7 @@
 	--with-x
 
 %{__make}
+%{__perl} -pi -e 's,/%{name}-%{ver}/,/%{name}-doc-%{version}/,' utilities/*.1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -608,7 +611,7 @@
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	pkgdocdir=%{_defaultdocdir}/%{name}-devel-%{version}
+	pkgdocdir=%{_defaultdocdir}/%{name}-doc-%{version}
 
 install PerlMagick/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl
 rm -f $RPM_BUILD_ROOT%{modulesdir}/{coders,filters}/*.a
@@ -814,7 +817,7 @@
 
 %files doc
 %defattr(644,root,root,755)
-%doc www
+%doc %{_defaultdocdir}/%{name}-doc-%{version}
 
 %files libs
 %defattr(644,root,root,755)
@@ -924,7 +927,6 @@
 
 %files devel
 %defattr(644,root,root,755)
-%doc %{_defaultdocdir}/%{name}-devel-%{version}
 %attr(755,root,root) %{_bindir}/Magick-config
 %attr(755,root,root) %{_bindir}/Wand-config
 %attr(755,root,root) %{_libdir}/libMagick.so
@@ -979,6 +981,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.222.2.5  2007/05/13 09:06:51  ankry
+- fix build with automake 1.10
+- move documentation to -dos; fix paths in manpages
+
 Revision 1.222.2.4  2006/08/23 04:42:52  glen
 - rel 2: %{perl_vendorarch}/Image and %{perl_vendorarch}/auto/Image provided by perl-dirs
 
================================================================

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