X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdosemu.git;a=blobdiff_plain;f=dosemu.spec;h=a76bf0d55c643d60a5595cec3cc65528188ec855;hp=70a3e0c1edd04ffc260be6e3d9fa0d0107ab82c4;hb=9651f53073c5885cb4d5a8b228f61a5df455d384;hpb=a1436bdbd503a4aa900efacae6c0a1aa7201d300

diff --git a/dosemu.spec b/dosemu.spec
index 70a3e0c..a76bf0d 100644
--- a/dosemu.spec
+++ b/dosemu.spec
@@ -4,46 +4,41 @@
 %bcond_with	static		# link statically
 %bcond_with	AC
 %bcond_without	x		# X support
+%bcond_with	samba		# samba support
 #
+%define		smarthogver	0.1.0
+
 Summary:	A DOS emulator
-Summary(de):	DOS-Emulator
-Summary(es):	Emulador DOS
-Summary(fr):	Emulateur DOS
-Summary(pl):	Emulator DOS-a
-Summary(pt_BR):	Emulador DOS
-Summary(tr):	DOS öykünümcüsü
+Summary(de.UTF-8):	DOS-Emulator
+Summary(es.UTF-8):	Emulador DOS
+Summary(fr.UTF-8):	Emulateur DOS
+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.3.1
-Release:	0.svn.1
+Version:	1.4.0
+Release:	1%{?with_samba:.smb}
 License:	GPL v2
 Group:		Applications/Emulators
-Source0:	http://dl.sourceforge.net/dosemu/%{name}-1.3.3.tgz
-# Source0-md5:	f3b27a9326e5c95e59093fcb79a61023
+Source0:	http://dl.sourceforge.net/dosemu/%{name}-%{version}.tgz
+# Source0-md5:	0bba530637266f99d404ba15e3f118d4
 #Source2:	%{name}-sys.tar.gz
 Source3:	%{name}-PRZECZYTAJ_TO
 Source4:	%{name}-README.PLD
 Source5:	%{name}.desktop
 Source6:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-pl-man-pages.tar.bz2
 # Source6-md5:	7a8abf5c656e6b99bdd03a4783751895
+Source7:	smarthog-%{smarthogver}.tgz
 Patch0:		%{name}-man-pages.patch
 Patch1:		%{name}-make-new.patch
 Patch2:		%{name}-%{name}_conf.patch
 Patch3:		%{name}-doSgmlTools.patch
 Patch4:		%{name}-makehtml.patch
-Patch5:		%{name}-1.3.3.1svn.patch.gz
+Patch5:		http://www.pers.pl/~pascalek/%{name}-1.4.0-samba-beta1.patch.gz
 URL:		http://www.dosemu.org/
 BuildRequires:	SDL-devel
-%if %{with x}
-%if !%{with AC}
-BuildRequires:	xorg-lib-libX11-devel
-%{?with_static:BuildRequires:	xorg-lib-libX11-static}
-%endif
-%if %{with AC}
-BuildRequires:	X11-devel
-%{?with_static:BuildRequires:	X11-static}
-%endif
-%endif
-BuildRequires:	autoconf >= 2.57
+BuildRequires:	alsa-lib-devel >= 0.9
+BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	bin86
 BuildRequires:	bison
 BuildRequires:	docbook-dtd30-sgml
@@ -51,19 +46,38 @@ 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
+BuildRequires:	perl-base
 BuildRequires:	sgml-tools
 BuildRequires:	slang-devel
 %{?with_static:BuildRequires:	slang-static}
 BuildRequires:	unzip
 BuildRequires:	util-linux
+%if %{with x}
+%if !%{with AC}
+BuildRequires:	xorg-app-bdftopcf
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXext-devel
+BuildRequires:	xorg-lib-libXxf86vm-devel
+%if %{with static}
+BuildRequires:	xorg-lib-libX11-static
+BuildRequires:	xorg-lib-libXext-static
+BuildRequires:	xorg-lib-libXxf86vm-static
+%endif
+%endif
+%if %{with AC}
+BuildRequires:	X11-devel
+%{?with_static:BuildRequires:	X11-static}
+%endif
+%endif
 Obsoletes:	xdosemu
 Conflicts:	dosemu-freedos-minimal < 2.0.33
 Conflicts:	kernel < 2.0.28
 Conflicts:	mtools < 3.6
-ExclusiveArch:	%{ix86}
+ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_dosemudir	/var/lib/dosemu
@@ -77,65 +91,65 @@ You need to install dosemu if you use DOS programs and you want to be
 able to run them on your GNU/Linux system. You may also need to
 install the dosemu-freedos-* packages.
 
-%description -l pl
-Dosemu to Emulator systemu DOS. Po zainstalowaniu mo¿esz go uruchomiæ
-komend± "dos".
+%description -l pl.UTF-8
+Dosemu to Emulator systemu DOS. Po zainstalowaniu możesz go uruchomić
+komendą "dos".
 
-Je¶li korzystasz z dosowych programów i chcia³by¶ je uruchamiaæ na
-twoim linuksowym systemie zainstaluj dosemu. Mo¿esz te¿ potrzebowaæ
-pakietów dosemu-freedos-*.
+Jeśli korzystasz z dosowych programów i chciałbyś je uruchamiać na
+twoim linuksowym systemie zainstaluj dosemu. Możesz też potrzebować
+pakietów dosemu-freedos-*.
 
-%description -l pt_BR
-Essa é uma versão do emulador DOS que foi projetada para rodar em
-sessões X Window. Oferece suporte para gráficos VGA bem como suporte
+%description -l pt_BR.UTF-8
+Essa é uma versão do emulador DOS que foi projetada para rodar em
+sessões X Window. Oferece suporte para gráficos VGA bem como suporte
 para mouse.
 
 %package utils
 Summary:	Utilities for dosemu
-Summary(pl):	Programy pomocnicze do dosemu
+Summary(pl.UTF-8):	Programy pomocnicze do dosemu
 Group:		Applications/Emulators
 Requires:	%{name} = %{version}-%{release}
 
 %description utils
 Utilities for dosemu: dexeconfig, hdinfo, mkhdimage, mkfatimage16.
 
-%description utils -l pl
+%description utils -l pl.UTF-8
 Programy pomocnicze dla dosemu: dexeconfig, hdinfo, mkhdimage,
 mkfatimage16.
 
 %package SDL
 Summary:	SDL plugin for dosemu
-Summary(pl):	Wtyczka SDL dla dosemu
+Summary(pl.UTF-8):	Wtyczka SDL dla dosemu
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description SDL
 SDL plugin for dosemu.
 
-%description SDL -l pl
+%description SDL -l pl.UTF-8
 Wtyczka SDL dla dosemu.
 
 %package X
 Summary:	X plugin for dosemu
-Summary(pl):	Wtyczka X dla dosemu
+Summary(pl.UTF-8):	Wtyczka X dla dosemu
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description X
 X plugin for dosemu.
 
-%description X -l pl
+%description X -l pl.UTF-8
 Wtyczka X dla dosemu.
 
 %prep
-%setup -q -a6 -n %{name}-1.3.3
-#sh tmp/do_patch
-#%patch0 -p1
+%setup -q -a6 -a7
+
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
+%{?with_samba:%patch5 -p1}
 
 %build
 OPTFLAGS="%{rpmcflags}"; export OPTFLAGS
@@ -168,11 +182,11 @@ echo '.so dosemu.1' > pl/man1/xdosemu.1
 echo '.so dosemu.1' > pl/man1/dosdebug.1
 
 # documentation
-%{__make} -C src/doc/DANG html
-%{__make} -C src/doc/HOWTO html
-%{__make} -C src/doc/README html
+#%{__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/ ';'
+#find src/doc -name "*.html" -exec cp -f '{}' doc/ ';'
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -195,7 +209,7 @@ ln -sf dosemu $RPM_BUILD_ROOT%{_bindir}/xdosexec
 
 install bin/libplugin*.so  $RPM_BUILD_ROOT%{_libdir}/dosemu
 
-install bin/dosdebug $RPM_BUILD_ROOT%{_bindir}/dosdebug
+install bin/{dosdebug,mkfatimage16} $RPM_BUILD_ROOT%{_bindir}
 install src/tools/periph/{dexeconfig,hdinfo,mkhdimage} $RPM_BUILD_ROOT%{_bindir}
 ln -sf dos $RPM_BUILD_ROOT%{_bindir}/dosexec
 
@@ -210,6 +224,7 @@ install man/ru/{dosemu.1,dosdebug.1,xdosemu.1,dos.1,mkfatimage16.1} $RPM_BUILD_R
 
 install commands/*.com $RPM_BUILD_ROOT%{_dosemudir}/bootdir/dosemu
 install commands/*.sys $RPM_BUILD_ROOT%{_dosemudir}/bootdir/dosemu
+install smarthog-%{smarthogver}/*.exe	$RPM_BUILD_ROOT%{_dosemudir}/bootdir/dosemu
 cp %{SOURCE3} PRZECZYTAJ_TO
 cp %{SOURCE4} README.PLD
 install %{SOURCE5} $RPM_BUILD_ROOT%{_desktopdir}
@@ -233,7 +248,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/dosexec
 %attr(755,root,root) %{_bindir}/midid
 %dir %{_libdir}/dosemu
+%{_libdir}/dosemu/libplugin_alsa.so
 %{_libdir}/dosemu/libplugin_gpm.so
+%{_libdir}/dosemu/libplugin_sndfile.so
 %{_libdir}/dosemu/libplugin_term.so
 %dir %{_dosemudir}/bootdir
 %dir %{_dosemudir}/bootdir/dosemu
@@ -255,7 +272,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/dexeconfig
 %attr(755,root,root) %{_bindir}/hdinfo
 %attr(755,root,root) %{_bindir}/mkhdimage
-#%attr(755,root,root) %{_bindir}/mkfatimage16
+%attr(755,root,root) %{_bindir}/mkfatimage16
 %{_mandir}/man1/mkfatimage16.1*
 %lang(ru) %{_mandir}/ru/man1/mkfatimage16.1*