SPECS: dosemu.spec - important bug fix for samba 4 dosemu beta2; h...

[pascalek]

Author: pascalek                     Date: Mon Jan 28 09:57:15 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- important bug fix for samba 4 dosemu beta2; htmldocs bcond

---- Files affected:
SPECS:
   dosemu.spec (1.136 -> 1.137) 

---- Diffs:

================================================================
Index: SPECS/dosemu.spec
diff -u SPECS/dosemu.spec:1.136 SPECS/dosemu.spec:1.137
--- SPECS/dosemu.spec:1.136	Fri Jan 11 20:27:19 2008
+++ SPECS/dosemu.spec	Mon Jan 28 10:57:10 2008
@@ -4,6 +4,7 @@
 # Conditional build:
 %bcond_with	static		# link statically
 %bcond_with	AC
+%bcond_without	htmldocs	# do not build documentation in HTML
 %bcond_without	x		# X support
 %bcond_with	samba		# samba support
 #
@@ -36,6 +37,7 @@
 Patch3:		%{name}-doSgmlTools.patch
 Patch4:		%{name}-makehtml.patch
 Patch5:		http://pascalek.pers.pl/files/projects/Samba4DosEmu/%{name}-1.4.0-samba-beta2.patch.gz
+Patch6:		http://pascalek.pers.pl/files/projects/Samba4DosEmu/s4d-beta2-fix1.patch
 URL:		http://www.dosemu.org/
 BuildRequires:	SDL-devel
 BuildRequires:	alsa-lib-devel >= 0.9
@@ -50,9 +52,9 @@
 %{?with_samba:BuildRequires:	libcli_smb-devel}
 BuildRequires:	libsndfile-devel
 BuildRequires:	lynx
-BuildRequires:	openjade
-BuildRequires:	perl-base
-BuildRequires:	sgml-tools
+%{?with_htmldocs:BuildRequires:	openjade}
+%{?with_htmldocs:BuildRequires:	perl-base}
+%{?with_htmldocs:BuildRequires:	sgml-tools}
 BuildRequires:	slang-devel
 %{?with_static:BuildRequires:	slang-static}
 BuildRequires:	unzip
@@ -151,6 +153,7 @@
 %patch3 -p1
 %patch4 -p1
 %{?with_samba:%patch5 -p1}
+%{?with_samba:%patch6 -p1}
 
 %build
 OPTFLAGS="%{rpmcflags}"; export OPTFLAGS
@@ -182,12 +185,14 @@
 echo '.so dosemu.1' > pl/man1/xdosemu.1
 echo '.so dosemu.1' > pl/man1/dosdebug.1
 
+%if %{with htmldocs}
 # documentation
 %{__make} -C src/doc/DANG html
 %{__make} -C src/doc/HOWTO html
 %{__make} -C src/doc/README html
 
 find src/doc -name "*.html" -exec cp -f '{}' doc/ ';'
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -293,6 +298,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.137  2008-01-28 09:57:10  pascalek
+- important bug fix for samba 4 dosemu beta2; htmldocs bcond
+
 Revision 1.136  2008-01-11 19:27:19  qboosh
 - reenabled html docs (no rationale specified for disabling)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/dosemu.spec?r1=1.136&r2=1.137&f=u