- removed some commented lines

- removed description of freedos (we have full freedos in separate packages)
- package dosemu-dosnet with kernel module dosnet.o
- STBR and STB all dosemu-freedos-*

Changed files:
    dosemu.spec -> 1.31

diff --git a/dosemu.spec b/dosemu.spec
index df7a92eb273f1f7a7ba24c6d643afac022cf7592..1329afc3c65a43f3657b1bdc0158bb193338c10f 100644 (file)
--- a/dosemu.spec
+++ b/dosemu.spec
@@ -2,10 +2,8 @@
 #%define         _kernel_ver_str %(echo %{_kernel_ver} | sed s/-/_/g)
 Summary:       A DOS emulator
 Summary(de):   DOS-Emulator
-Summary(es):   Emulador DOS
 Summary(fr):   Emulateur DOS
 Summary(pl):   Emulator DOSa
-Summary(pt_BR):        Emulador DOS
 Summary(tr):   DOS öykünümcüsü
 Name:          dosemu
 Version:       1.0.2
@@ -15,34 +13,24 @@ Group:              Applications/Emulators
 Group(de):     Applikationen/Emulators
 Group(pl):     Aplikacje/Emulatory
 Source0:       ftp://ftp.dosemu.org/dosemu/%{name}-%{version}.tgz
-#Source1:      http://www.freedos.org/files/distributions/base1.zip
-#Source2:      http://www.freedos.org/files/distributions/util1.zip
-#Source3:      http://www.freedos.org/files/distributions/edit1.zip
-#Source4:      ftp://ftp.gcfl.net/freedos/kernel/ker2019x.zip
-#Source5:      ftp://ftp.home.vim.org/pub/vim/pc/vim56d16.zip
-#Source6:      ftp://ftp.home.vim.org/pub/vim/pc/vim56rt.zip
-#Source7:      autoexec.bat
-#Source8:      config.sys
-Source9:       %{name}-pl-man-pages.tar.bz2
-Source10:      http://prdownloads.sourceforge.net/freedos/ke2025c16.zip
-#Source11:     dosemu.conf
-Source12:      autoexec2.bat
-Source13:      config2.sys
-Source14:      keybpl.exe
-Source15:      egapl.exe
-Source16:      shsucdx.exe
-Source17:      %{name}-sys.tar.gz
-Patch0:                %{name}-%{name}_conf.patch
+Source1:       %{name}-pl-man-pages.tar.bz2
+Source2:       dosemu-sys.tar.gz
+Source3:       http://prdownloads.sourceforge.net/freedos/ke2025c16.zip
+Source4:       autoexec2.bat
+Source5:       config2.sys
+Source6:       keybpl.exe
+Source7:       egapl.exe
+Source8:       shsucdx.exe
+Patch0:                %{name}-dosemu_conf.patch
+Patch1:                %{name}-1.0.2-man-pages.patch
 URL:           http://www.dosemu.org/
 BuildRequires: bin86
-#BuildRequires:        mtools
 BuildRequires: unzip
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: glibc-static
 BuildRequires: XFree86-static
 BuildRequires: slang-static
-Prereq:                /sbin/depmod
 Conflicts:     mtools < 3.6
 Exclusivearch: %{ix86}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -65,8 +53,8 @@ tambi
 Dosemu to Emulator systemu DOS. Po zainstalowaniu mo¿esz go uruchomiæ
 komend± "dos".
 
-Powiniene¶ zainstalowaæ dosemu, je¶li korzystasz z dosowych programów
-i chcia³by¶ je uruchamiaæ na twoim Linuksowym systemie. Mo¿esz te¿
+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
@@ -116,74 +104,34 @@ X Window. Possui suporte a gr
 Bu yazýlým, DOS öykünümcüsünün X altýnda çalýþan bir sürümüdür. VGA
 grafikleri ve fare desteði vardýr.
 
-%package freedos
-Summary:       A FreeDOS hdimage for dosemu, a DOS emulator, to use
-Summary(pl):   Obraz FreeDOS-a do u¿ywania z dosemu
+%package dosnet
+Summary:       kernel module dosnet.o
+Summary(pl):   Modu³ dosnet.o do kernela
 Group:         Applications/Emulators
 Group(de):     Applikationen/Emulators
 Group(pl):     Aplikacje/Emulatory
 Requires:      %{name} = %{version}
+Prereq:                /sbin/depmod
+
+%description dosnet
+Kernel module for dosnet (vnet).  Dosnet lets you establish TCP/IP
+connection beetween dosemu session and Linux kernel.  Read README
+for dosemu for more information.
 
-%description freedos
-Generally, the dosemu DOS emulator requires either that your system
-have some version of DOS available or that your system's partitions
-were formatted and installed with DOS. If your system does not meet
-either of the previous requirements, you can instead use the dosemu-
-freedos package, which contains an hdimage file which will be
-installed in the /var/lib/dosemu directory. The hdimage file is
-already bootable with FreeDOS.
-
-You will need to edit your /etc/dosemu.conf file to add the image to
-the list of disk 'drives' used by dosemu.
-
-Install dosemu-freedos if you are installing the dosemu package and
-you don't have a version of DOS available on your system, and your
-system's partitions were not formatted and installed with DOS.
-
-%description -l es -n freedos
-Este paquete incluye una imagen de disco duro que será instalada en el
-directorio /var/lib/dosemu, si es necesaria una versión del DOS para
-el uso del dosemu. Generalmente dosemu requiere una versión cualquiera
-del DOS para arrancar su archivo hdimage antes del primer uso, o que
-tengas alguna partición formateada y con el DOS instalado. Si ninguna
-de estas dos opciones está disponible usa esta imagen que ya arranca
-con el FreeDOs. Será necesario editar el archivo /etc/dosemu.conf para
-añadir esta imagen en la lista de "drives" usados por el dosemu.
-
-%description -l pl freedos
-Ogólnie rzecz bior±c dosemu wymaga posiadania b±d¼ jakiej¶ wersji
-systemu DOS w systemie, b±d¼ partycji z zainstalowanym DOSem. Je¶li
-¿aden z tych warunków nie jest spe³niony, to mo¿esz w zastêpstwie u¿yæ
-pakietu dosemu-freedos. Zawiera on obraz obraz dysku (który bêdzie
-zainstalowany w katalogu /var/lib/dosemu) z zainstalowanym FreeDOSem.
-
-Musisz wyedytowaæ plik /etc/dosemu.conf aby dodaæ ten plik do listy
-'drives' uzywanych przez dosemu.
-
-Zainstaluj dosemu-freedos, je¶li zainstalowa³e¶ pakiet dosemu, a nie
-masz dostêpnej ¿adnej innej wersji DOSa.
-
-%description -l pt_BR -n freedos
-Este pacote inclui uma imagem de disco rígido que será instalada no
-diretório /var/lib/dosemu se for necessário uma versão do DOS para o
-uso do dosemu.
-
-Geralmente o dosemu requer uma versão qualquer do DOS para inicializar
-seu arquivo hdimage antes do primeiro uso ou que você tenha alguma
-partição formatada e com o DOS instalado. Se nenhuma destas duas
-opções estiver disponível use esta imagem que já é inicializável com o
-FreeDOS.
-
-Será necessário editar o arquivo /etc/dosemu.conf para adicionar esta
-imagem na lista de "drives" usados pelo dosemu.
+%description -l pl dosnet
+Modu³ dosnet.o dla kernela.  Modu³ ten pozwala ³±czyæ siê programom
+DOSowym wykorzystuj±cym TCP/IP z Linuksem.  Przydatny miêdzy innymi
+przy pisaniu programów sieciowych dla DOSa.  Rzeteln± informacjê na
+temat dosnet mo¿esz znale¼æ w README do dosemu.   
 
 %prep
-%setup -q -a9 -a17
+%setup -q -a1 -a2
 %patch0 -p0
+%patch1 -p1
 
 rm -rf freedos
 mkdir freedos
-unzip -L -o %{SOURCE10} -d freedos
+unzip -L -o %{SOURCE3} -d freedos
 
 %build
 cp base-configure.in configure.in
@@ -200,14 +148,16 @@ mv -f bin/dosemu.bin bin/dos-nox
        --enable-new-intcode \
        --enable-aspi
 echo | %{__make}
-%{__make} -C src/dosext/net/v-net
+make -C src/dosext/net/v-net
 mv -f bin/dos-nox bin/dos
 
+mv -f man/dosemu.bin.1 man/dos.1
+
 %define _dosemudir /var/lib/dosemu
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir},%{_mandir}/pl/man1,%{_pixmapsdir}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir},%{_mandir}/man1,%{_mandir}/pl/man1,%{_pixmapsdir}}
 install -d $RPM_BUILD_ROOT%{_dosemudir}/bootdir/{dosemu,freedos/doc/fdkernel}
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/net
 
@@ -219,12 +169,13 @@ install etc/dosemu.xpm $RPM_BUILD_ROOT%{_prefix}/X11R6/share/pixmaps
 install etc/dosemu.users.secure $RPM_BUILD_ROOT%{_sysconfdir}/dosemu.users
 install etc/global.conf $RPM_BUILD_ROOT%{_dosemudir}/global.conf
 install etc/dosemu.conf $RPM_BUILD_ROOT%{_sysconfdir}/dosemu.conf
+install man/{dos.1,dosdebug.1,xdos.1,mkfatimage16.1} $RPM_BUILD_ROOT%{_mandir}/man1
 install pl/man1/{dos.1,dosdebug.1,xdos.1} $RPM_BUILD_ROOT%{_mandir}/pl/man1
-install %{SOURCE12} $RPM_BUILD_ROOT%{_dosemudir}/bootdir/autoexec.bat
-install %{SOURCE13} $RPM_BUILD_ROOT%{_dosemudir}/bootdir/config.sys
-install %{SOURCE14} $RPM_BUILD_ROOT%{_dosemudir}/bootdir/keybpl.exe
-install %{SOURCE15} $RPM_BUILD_ROOT%{_dosemudir}/bootdir/egapl.exe
-install %{SOURCE16} $RPM_BUILD_ROOT%{_dosemudir}/bootdir/shsucdx.exe
+install %{SOURCE4} $RPM_BUILD_ROOT%{_dosemudir}/bootdir/autoexec.bat
+install %{SOURCE5} $RPM_BUILD_ROOT%{_dosemudir}/bootdir/config.sys
+install %{SOURCE6} $RPM_BUILD_ROOT%{_dosemudir}/bootdir/keybpl.exe
+install %{SOURCE7} $RPM_BUILD_ROOT%{_dosemudir}/bootdir/egapl.exe
+install %{SOURCE8} $RPM_BUILD_ROOT%{_dosemudir}/bootdir/shsucdx.exe
 install src/plugin/commands/*.com $RPM_BUILD_ROOT%{_dosemudir}/bootdir/dosemu
 install dosemu/*.sys $RPM_BUILD_ROOT%{_dosemudir}/bootdir/dosemu
 install src/dosext/net/v-net/dosnet.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/net
@@ -232,34 +183,6 @@ install freedos/bin/kernel.sys $RPM_BUILD_ROOT%{_dosemudir}/bootdir
 install freedos/doc/fdkernel/* $RPM_BUILD_ROOT%{_dosemudir}/bootdir/freedos/doc/fdkernel
 ln -sf dosemu/comcom.com $RPM_BUILD_ROOT%{_dosemudir}/bootdir/command.com
 
-#src/tools/periph/mkfatimage16 -p -k 16192 -l FreeDos \
-#      -b freedos/kernel/boot.bin \
-#      -f $RPM_BUILD_ROOT%{_dosemudir}/hdimage.freedos \
-#      freedos/kernel/* 
-#FREEDOS=`/bin/mktemp /tmp/freedos.XXXXXX`
-#echo "drive n: file=\"$RPM_BUILD_ROOT%{_dosemudir}/hdimage.freedos\" offset=8832" > $FREEDOS
-#MTOOLSRC=$FREEDOS
-#export MTOOLSRC
-#mcopy -o/ freedos/vim-5.6 freedos/bin freedos/doc freedos/help freedos/emacs n:
-#mmd n:/DOSEMU
-#mcopy -/ commands/* n:/DOSEMU
-#mcopy -o %{SOURCE7} %{SOURCE8} commands/exitemu* n:/
-#mdir -w n:
-#rm -f $FREEDOS
-#unset MTOOLSRC
-
-#install etc/hdimage.dist $RPM_BUILD_ROOT%{_dosemudir}/hdimage
-# install dexe utils
-#install dexe/{do_mtools,extract-dos,mkdexe,myxcopy} $RPM_BUILD_ROOT%{_bindir}
-
-#cat <<EOF >$RPM_BUILD_ROOT%{_bindir}/rundos
-##!/bin/sh
-#BINDIR=/bin
-#export BINDIR 
-# ignore errors if user does not have module installed
-#%attr(755,root,root) %{_bindir}/dos
-#EOF
-
 # Take out irritating ^H's from the documentation
 for i in `ls --color=no doc/` ; do cat doc/$i > $i ; cat $i | perl -p -e 's/.\b//g' > doc/$i ; done
 
@@ -268,42 +191,19 @@ rm -f doc/{configuration,dosemu.lsm}
 #mv -f $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/misc \
 #      $RPM_BUILD_ROOT%{_fontsdir}
 
-#bzip2 -dc %{SOURCE9} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
 gzip -9nf QuickStart COPYING ChangeLog* doc/*
-#      $RPM_BUILD_ROOT%{_fontsdir}/misc/*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
+
+%post dosnet
 depmod -a
 
-%postun
+%postun dosnet
 depmod -a
 
-#%post -n xdosemu
-#if [ -x /usr/X11R6/bin/mkfontdir ]; then
-#      (cd /usr/share/fonts/misc; /usr/X11R6/bin/mkfontdir)
-#fi
-#killall -USR1 xfs > /dev/null 2>&1 ||:
-
-#%postun -n xdosemu
-#if [ -x /usr/X11R6/bin/mkfontdir ]; then
-#      (cd /usr/share/fonts/misc; /usr/X11R6/bin/mkfontdir)
-#fi
-#killall -USR1 xfs > /dev/null 2>&1 ||:
-
-#%post freedos
-#[ -e %{_dosemudir}/hdimage.first ] || \
-#      ln -sf hdimage.freedos %{_dosemudir}/hdimage.first
-
-#%postun freedos
-#if [ "$1" = "0" ]; then
-#      if [ -e %{_dosemudir}/hdimage.first ]; then
-#              rm -f %{_dosemudir}/hdimage.first
-#      fi
-#fi
     
 %files
 %defattr(644,root,root,755)
@@ -326,16 +226,17 @@ depmod -a
 %attr(755,root,root) %{_bindir}/mkfatimage16
 #%attr(755,root,root) %{_bindir}/rundos
 %dir %{_dosemudir}/bootdir
-%{_dosemudir}/bootdir/dosemu
+%dir %{_dosemudir}/bootdir/dosemu
+%dir %{_dosemudir}/bootdir/freedos
+%{_dosemudir}/bootdir/dosemu/*
 %{_dosemudir}/bootdir/kernel.sys
 %config(noreplace) %{_dosemudir}/bootdir/autoexec.bat
 %config(noreplace) %{_dosemudir}/bootdir/config.sys
 %{_dosemudir}/bootdir/command.com
 %{_dosemudir}/bootdir/*.exe
-%{_dosemudir}/bootdir/freedos
-/lib/modules/%{_kernel_ver}/net/dosnet.o
-#%{_mandir}/man1/dos*
-#%{_mandir}/man1/mkfatimage16.1*
+%{_dosemudir}/bootdir/freedos/*
+%{_mandir}/man1/dos*
+%{_mandir}/man1/mkfatimage16.1*
 %lang(pl) %{_mandir}/pl/man1/dos*
 %{_pixmapsdir}/dosemu.xpm
 
@@ -343,11 +244,11 @@ depmod -a
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/xdos
 # %attr(755,root,root) %{_bindir}/xtermdos
-#%{_mandir}/man1/xdos.1*
+%{_mandir}/man1/xdos.1*
 %lang(pl) %{_mandir}/pl/man1/xdos.1*
 # %{_mandir}/man1/xtermdos.1*
 # %{_datadir}/fonts/misc/*
 
-#%files freedos
-#%defattr(644,root,root,755)
-#%config %{_dosemudir}/hdimage.freedos
+%files dosnet
+%defattr(644,root,root,755)
+/lib/modules/%{_kernel_ver}/net/dosnet.o