packages: sdcc/sdcc.spec - added without doc bcond - readded as-build patch...

[sparky]

Author: sparky                       Date: Tue Feb  2 20:27:47 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added without doc bcond
- readded as-build patch
- dropped BR: automake

---- Files affected:
packages/sdcc:
   sdcc.spec (1.46 -> 1.47) 

---- Diffs:

================================================================
Index: packages/sdcc/sdcc.spec
diff -u packages/sdcc/sdcc.spec:1.46 packages/sdcc/sdcc.spec:1.47
--- packages/sdcc/sdcc.spec:1.46	Tue Feb  2 10:00:40 2010
+++ packages/sdcc/sdcc.spec	Tue Feb  2 21:27:42 2010
@@ -1,4 +1,8 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	doc		# don't rebuild documentation
+
 %define		_snap_date	20100201
 %define		_snap_id	5667
 
@@ -14,15 +18,16 @@
 Patch0:		%{name}-mcs51-pcall.patch
 Patch1:		%{name}-mcs51-stack-probe.patch
 Patch2:		%{name}-gstabs.patch
+Patch3:		%{name}-as-build.patch
 URL:		http://sdcc.sourceforge.net/
 BuildRequires:	autoconf
-BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	gc-devel
 BuildRequires:	gputils
-BuildRequires:	latex2html
 BuildRequires:	libstdc++-devel
+%if %{with doc}
+BuildRequires:	latex2html
 BuildRequires:	lyx >= 1.4.4
 BuildRequires:	texlive-fonts-cmsuper
 BuildRequires:	texlive-fonts-type1-urw
@@ -30,6 +35,7 @@
 BuildRequires:	texlive-latex-ams
 BuildRequires:	texlive-makeindex
 BuildRequires:	texlive-tex-babel
+%endif
 Obsoletes:	ucsim
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -57,6 +63,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 find -type f -name 'configure.??' | while read FILE; do
@@ -66,7 +73,7 @@
 done
 
 %configure \
-	--enable-doc \
+	%{__enable_disable doc} \
 	--enable-libgc \
 	--enable-ucsim \
 	--enable-xa \
@@ -109,6 +116,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.47  2010/02/02 20:27:42  sparky
+- added without doc bcond
+- readded as-build patch
+- dropped BR: automake
+
 Revision 1.46  2010/02/02 09:00:40  kosmo
 - updated to 2.9.7 (snap 20100201).
 
@@ -163,7 +175,7 @@
 - updated to 2.7.4 (snap. 20071013)
 
 Revision 1.30  2007/07/14 10:53:31  kosmo
--updated to 2.7.2 (snap 20070713)
+- updated to 2.7.2 (snap 20070713)
 
 Revision 1.29  2007/05/10 16:56:34  kosmo
 - updated to 20070510
@@ -230,7 +242,7 @@
 - cosmetics.
 
 Revision 1.8  2002/07/23 19:31:13  marcus
-- use new %%doc
+- use new %doc
 - rel.2.
 
 Revision 1.7  2002/02/23 04:41:58  kloczek
@@ -241,7 +253,7 @@
   Group field using gettext).
 
 Revision 1.5  2002/01/18 02:14:53  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.4  2001/12/01 13:06:43  ankry
 - replaced source URL by a working one. It seems that http: URLs in
@@ -252,8 +264,8 @@
 - Version: 2.3.0
 
 Revision 1.2  2001/03/30 12:43:40  misiek
-descriptions and nothing more
+- descriptions and nothing more
 
 Revision 1.1  2001/03/29 23:32:00  agaran
-Initial, dont build properly (tested for now only on sparc), no %files section
-no %description , no group, translation and in fact that is totally unfinished
+- Initial, dont build properly (tested for now only on sparc), no %files section
+  no %description , no group, translation and in fact that is totally unfinished
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sdcc/sdcc.spec?r1=1.46&r2=1.47&f=u