X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dosemu.spec;h=3555a2e0c6b7ea240f079d29a4d6461927a19347;hb=bf9377259e3909078fab186dd09ee8ec4be7c048;hp=a92eb6233d124143721e668aebd463b6adc5fa2c;hpb=462001517529f0962e455232c202bf556e7a3201;p=packages%2Fdosemu.git

diff --git a/dosemu.spec b/dosemu.spec
index a92eb62..3555a2e 100644
--- a/dosemu.spec
+++ b/dosemu.spec
@@ -3,9 +3,12 @@
 # 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
 #
 %define		smarthogver	0.1.0
+%define		smbrel		01
 
 Summary:	A DOS emulator
 Summary(de.UTF-8):	DOS-Emulator
@@ -15,12 +18,12 @@ Summary(pl.UTF-8):	Emulator DOS-a
 Summary(pt_BR.UTF-8):	Emulador DOS
 Summary(tr.UTF-8):	DOS öykünümcüsü
 Name:		dosemu
-Version:	1.3.5
-Release:	1
+Version:	1.4.0
+Release:	4%{?with_samba:.smb%{smbrel}}
 License:	GPL v2
 Group:		Applications/Emulators
 Source0:	http://dl.sourceforge.net/dosemu/%{name}-%{version}.tgz
-# Source0-md5:	16cb31112d5928c9d45319157948bb7c
+# Source0-md5:	0bba530637266f99d404ba15e3f118d4
 #Source2:	%{name}-sys.tar.gz
 Source3:	%{name}-PRZECZYTAJ_TO
 Source4:	%{name}-README.PLD
@@ -33,8 +36,12 @@ Patch1:		%{name}-make-new.patch
 Patch2:		%{name}-%{name}_conf.patch
 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
+Patch7:		%{name}-lpt4.patch
+Patch8:		%{name}-Xquit.patch
+Patch9:		%{name}-creat_mode.patch
 URL:		http://www.dosemu.org/
-BuildRequires:	SDL-devel
 BuildRequires:	alsa-lib-devel >= 0.9
 BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	bin86
@@ -44,18 +51,21 @@ BuildRequires:	docbook-style-dsssl
 BuildRequires:	flex
 %{?with_static:BuildRequires:	glibc-static}
 BuildRequires:	gpm-devel
+%{?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
 BuildRequires:	util-linux
 %if %{with x}
+BuildRequires:	SDL-devel
 %if !%{with AC}
 BuildRequires:	xorg-app-bdftopcf
+BuildRequires:	xorg-app-mkfontdir
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXxf86vm-devel
@@ -140,11 +150,17 @@ Wtyczka X dla dosemu.
 
 %prep
 %setup -q -a6 -a7
+
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%{?with_samba:%patch5 -p1}
+%{?with_samba:%patch6 -p1}
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %build
 OPTFLAGS="%{rpmcflags}"; export OPTFLAGS
@@ -176,12 +192,14 @@ echo '.so dosemu.1' > pl/man1/dos.1
 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
@@ -271,11 +289,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/mkfatimage16.1*
 %lang(ru) %{_mandir}/ru/man1/mkfatimage16.1*
 
+%if %{with x}
 %files SDL
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/dosemu/libplugin_sdl.so
 
-%if %{with x}
 %files X
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/dosemu/libplugin_X.so