SPECS: iputils.spec - fixed doc bcond

[qboosh]

Author: qboosh                       Date: Sat Nov  1 15:29:30 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed doc bcond

---- Files affected:
SPECS:
   iputils.spec (1.82 -> 1.83) 

---- Diffs:

================================================================
Index: SPECS/iputils.spec
diff -u SPECS/iputils.spec:1.82 SPECS/iputils.spec:1.83
--- SPECS/iputils.spec:1.82	Sat Nov  1 14:53:27 2008
+++ SPECS/iputils.spec	Sat Nov  1 16:29:24 2008
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 #
 # Conditional build
-%bcond_without	doc	# don't build documentation
+%bcond_without	doc	# don't build documentation (man, HTML)
 #
 Summary:	Utilities for IPv4/IPv6 networking
 Summary(pl.UTF-8):	Użytki przeznaczone dla pracy z siecią IPv4/IPv6
@@ -21,9 +21,7 @@
 Patch3:		%{name}-gcc34.patch
 Patch4:		%{name}-OPEN_MAX.patch
 URL:		http://linux-net.osdl.org/index.php/Iputils
-BuildRequires:	docbook-dtd31-sgml
 %if %{with doc}
-BuildRequires:	docbook-dtd30-sgml
 BuildRequires:	docbook-dtd31-sgml
 BuildRequires:	docbook-utils >= 0.6.10
 %endif
@@ -103,8 +101,10 @@
 	CCOPT="%{rpmcflags} -D_GNU_SOURCE -DHAVE_SIN6_SCOPEID=1" \
 	LDLIBS=
 
-%{?with_doc:%{__make} html}
+%if %{with doc}
+%{__make} html
 %{__make} man
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -117,8 +117,10 @@
 
 install ping ping6 $RPM_BUILD_ROOT/bin
 
+%if %{with doc}
 install doc/*.8 $RPM_BUILD_ROOT%{_mandir}/man8
 echo ".so tracepath.8" > $RPM_BUILD_ROOT%{_mandir}/man8/tracepath6.8
+%endif
 
 # no tftpd
 rm -f $RPM_BUILD_ROOT%{_sbindir}/tftpd
@@ -139,22 +141,28 @@
 %attr(755,root,root) %{_sbindir}/rdisc
 %attr(4754,root,adm) %{_sbindir}/traceroute6
 %attr(4754,root,adm) %{_sbindir}/clockdiff
+%if %{with doc}
 %{_mandir}/man8/clockdiff.8*
 %{_mandir}/man8/rarpd.8*
 %{_mandir}/man8/rdisc.8*
 %{_mandir}/man8/tracepath*.8*
 %{_mandir}/man8/traceroute6.8*
+%endif
 
 %files ping
 %defattr(644,root,root,755)
 %attr(4754,root,adm) %verify(not mode) /bin/ping
 %attr(4754,root,adm) %verify(not mode) /bin/ping6
+%if %{with doc}
 %{_mandir}/man8/ping.8*
+%endif
 
 %files arping
 %defattr(644,root,root,755)
 %attr(4754,root,adm) /sbin/arping
+%if %{with doc}
 %{_mandir}/man8/arping.8*
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -162,6 +170,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.83  2008/11/01 15:29:24  qboosh
+- fixed doc bcond
+
 Revision 1.82  2008/11/01 13:53:27  areq
 - BR docbook-dtd31-sgml
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/iputils.spec?r1=1.82&r2=1.83&f=u