packages: lilypond/lilypond.spec - unify doc bcond

[glen]

Author: glen                         Date: Fri Feb  5 08:09:42 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unify doc bcond

---- Files affected:
packages/lilypond:
   lilypond.spec (1.59 -> 1.60) 

---- Diffs:

================================================================
Index: packages/lilypond/lilypond.spec
diff -u packages/lilypond/lilypond.spec:1.59 packages/lilypond/lilypond.spec:1.60
--- packages/lilypond/lilypond.spec:1.59	Sat Nov 28 17:22:05 2009
+++ packages/lilypond/lilypond.spec	Fri Feb  5 09:09:37 2010
@@ -4,7 +4,7 @@
 #
 # Conditional build:
 %bcond_with	gui	# enable experimental GUI
-%bcond_with	docs	# build docs
+%bcond_with	doc	# build docs
 #
 Summary:	Music typesetter
 Summary(pl.UTF-8):	Program do składania nut
@@ -21,8 +21,8 @@
 Patch4:		%{name}-aclocal.patch
 Patch5:		%{name}-bad_cast.patch
 URL:		http://www.lilypond.org/
-%{?with_docs:BuildRequires:	ImageMagick}
-%{?with_docs:BuildRequires:	ImageMagick-coder-png}
+%{?with_doc:BuildRequires:	ImageMagick}
+%{?with_doc:BuildRequires:	ImageMagick-coder-png}
 BuildRequires:	automake
 BuildRequires:	bison >= 1.29
 BuildRequires:	flex >= 2.5.4a
@@ -32,7 +32,7 @@
 BuildRequires:	fonts-Type1-urw
 BuildRequires:	gettext-devel >= 0.17
 BuildRequires:	ghostscript >= 8.15
-%{?with_docs:BuildRequires:	ghostscript >= 8.60}
+%{?with_doc:BuildRequires:	ghostscript >= 8.60}
 BuildRequires:	ghostscript-fonts-std
 %{?with_gui:BuildRequires:	gtk+2-devel >= 2:2.4.0}
 BuildRequires:	guile-devel >= 5:1.8.2
@@ -40,20 +40,20 @@
 BuildRequires:	libltdl-devel
 BuildRequires:	libstdc++-devel >= 5:3.4
 BuildRequires:	mftrace >= 1.1.19
-%{?with_docs:BuildRequires:	netpbm-progs}
+%{?with_doc:BuildRequires:	netpbm-progs}
 BuildRequires:	pango-devel >= 1.12.0
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig >= 1:0.9.0
 BuildRequires:	python-devel >= 2.4
-%{?with_docs:BuildRequires:	rsync}
+%{?with_doc:BuildRequires:	rsync}
 BuildRequires:	texlive-dvips
 BuildRequires:	texlive-fonts-cm
 BuildRequires:	texlive-fonts-cmextra
 BuildRequires:	texlive-fonts-jknappen
-%{?with_docs:BuildRequires:	texlive-latex-bibtex}
+%{?with_doc:BuildRequires:	texlive-latex-bibtex}
 BuildRequires:	texlive-metapost
 BuildRequires:	texinfo >= 4.11
-%{?with_docs:BuildRequires:	texinfo-texi2dvi}
+%{?with_doc:BuildRequires:	texinfo-texi2dvi}
 BuildConflicts:	lilypond < 1.6.0
 Requires:	ghostscript >= 8.15
 Requires:	guile >= 5:1.8.2
@@ -120,7 +120,7 @@
 	%{?debug:--disable-optimising} \
 	%{?with_gui:--enable-gui}
 %{__make} -j1
-%{?with_docs:%{__make} -j1 web}
+%{?with_doc:%{__make} -j1 web}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -128,7 +128,7 @@
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
-%if %{with docs}
+%if %{with doc}
 %{__make} -j1 web-install \
 	DESTDIR=$RPM_BUILD_ROOT
 %endif
@@ -212,7 +212,7 @@
 %{texmfdir}/tex/lilypond
 
 %{_datadir}/omf/lilypond
-%{?with_docs:/usr/share/doc/lilypond}
+%{?with_doc:/usr/share/doc/lilypond}
 
 %files -n emacs-lilypond-mode-pkg
 %defattr(644,root,root,755)
@@ -232,6 +232,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.60  2010/02/05 08:09:37  glen
+- unify doc bcond
+
 Revision 1.59  2009/11/28 16:22:05  jajcus
 - Release: 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lilypond/lilypond.spec?r1=1.59&r2=1.60&f=u