--- /dev/null
+--- dosemu-1.1.5/src/base/bios/int10.c.orig 2003-07-19 17:21:55.000000000 +0200
++++ dosemu-1.1.5/src/base/bios/int10.c 2003-07-19 17:27:55.000000000 +0200
+@@ -723,6 +723,7 @@
+ /* helpers for font processing - eric@coli.uni-sb.de 11/2002 */
+ /* only for TEXT mode: Otherwise, int 0x43 is used... */
+
++#ifdef X_GRAPHICS
+ static void vga_RAM_to_RAM(unsigned height, unsigned char chr, unsigned count,
+ unsigned seg, unsigned ofs, int bank)
+ {
+@@ -767,6 +768,7 @@
+ }
+ vga_RAM_to_RAM(height,0,256,seg,ofs,bank);
+ }
++#endif
+
+ /******************************************************************/
+
+++ /dev/null
---- dosemu-1.1.4/configure.ac.orig 2003-05-18 01:17:04.000000000 +0200
-+++ dosemu-1.1.4/configure.ac 2003-05-18 01:20:19.000000000 +0200
-@@ -138,7 +138,7 @@
- AC_MSG_WARN( )
- ELF="ELF=1"
- else
-- if grep __ELF__ `$CC -v 2>&1|head -n1|cut -d' ' -f4` /dev/null 1>/dev/null 2>&1; then
-+ if grep '__ELF__\|elf_' `$CC -v 2>&1|head -n1|cut -d' ' -f4` /dev/null 1>/dev/null 2>&1; then
- ELF="ELF=1"
- else
- if test "$CONFIG_HOST" = "linux"; then
---- dosemu-1.1.4/configure.ac.orig Fri Mar 28 10:32:29 2003
-+++ dosemu-1.1.4/configure.ac Fri Mar 28 10:35:43 2003
+--- dosemu-1.1.5/configure.ac.orig Fri Mar 28 10:32:29 2003
++++ dosemu-1.1.5/configure.ac Fri Mar 28 10:35:43 2003
@@ -421,15 +421,15 @@
AC_SUBST(INCDIR)
CFLAGS="-Wall -Wstrict-prototypes -Wmissing-declarations -Wnested-externs"
+OPT="$OPTFLAGS"
- if test "$dodebug" = "yes"; then
+ if test "$dodebug" = "yes" -o "$debug" = "yes"; then
CFLAGS="$CFLAGS -gstabs+"
AC_DEFINE(_DEBUG)
- OPT="-O"
@@ -1 +1 @@
-.so man1/dosemu.bin.1
+.so dos.1
-diff -Nur dosemu-1.1.4/man.orig/dosemu.bin.1 dosemu-1.1.4/man/dosemu.bin.1
---- dosemu-1.1.4/man.orig/dosemu.bin.1 2003-05-18 11:53:55.000000000 +0200
-+++ dosemu-1.1.4/man/dosemu.bin.1 2003-05-18 12:02:15.000000000 +0200
+diff -Nur dosemu-1.1.5/man.orig/dosemu.bin.1 dosemu-1.1.5/man/dosemu.bin.1
+--- dosemu-1.1.5/man.orig/dosemu.bin.1 2003-05-18 11:53:55.000000000 +0200
++++ dosemu-1.1.5/man/dosemu.bin.1 2003-05-18 12:02:15.000000000 +0200
@@ -1,9 +1,9 @@
.\" -*- nroff -*- (This is for Emacs)
--.TH DOSEMU.BIN 1 "Jan, 2003" "Version 1.1.4.1" "DOS Emulation"
-+.TH DOS 1 "Jan, 2003" "Version 1.1.4.1" "DOS Emulation"
+-.TH DOSEMU.BIN 1 "Jun, 2003" "Version 1.1.5" "DOS Emulation"
++.TH DOS 1 "Jun, 2003" "Version 1.1.5" "DOS Emulation"
.SH NAME
-dosemu.bin, dosdebug \- run DOS and DOS programs under Linux
+dos, xdos, dosdebug \- run DOS and DOS programs under Linux
.SH FILES
.PD 0
.TP
--.I /usr/local/bin/dosemu.bin
+-.I dosemu.bin
+.I /usr/bin/dos
+or
+.I /usr/X11R6/bin/dos
The binary
.TP
--.I /usr/local/bin/dosemu
+-.I dosemu
-The wrapper script, it is recommended not to invoke dosemu.bin directly.
-.TP
--.I /usr/local/bin/xdosemu
+-.I xdosemu
+.I /usr/X11R6/bin/xdos
Same, but invoking DOS in an X window.
.TP
Summary(pt_BR): Emulador DOS
Summary(tr): DOS öykünümcüsü
Name: dosemu
-%define ver 1.1.4
-%define subver 15
+%define ver 1.1.5
+%define subver 5
Version: %{ver}.%{subver}
# Please don't bump to 1 until dosemu-1.2
-Release: 0.3
+Release: 0.1
License: GPL v2
Group: Applications/Emulators
Source0: http://dl.sourceforge.net/dosemu/%{name}-%{ver}.tgz
-# Source0-md5: be632c6e5edd3388d9d6d2c8dba7dc10
+# Source0-md5: 15b37a5e45bbeaa31bb19269327707ff
Source1: http://dosemu.sourceforge.net/testing/patchset-%{version}.tgz
-# Source1-md5: 21b6d8cf3797333e6be0ddf8954e58e1
+# Source1-md5: ea5b334e65bddf8a2e88d8cbaf3ad569
#Source2: %{name}-sys.tar.gz
Source3: %{name}-PRZECZYTAJ_TO
Source4: %{name}-README.PLD
Patch2: %{name}-%{name}_conf.patch
Patch3: %{name}-doSgmlTools.patch
Patch4: %{name}-makehtml.patch
-Patch5: %{name}-gcc33.patch
-#Patch5: %{name}-nox.patch
+Patch5: %{name}-fix.patch
+#Patch5: %{name}-gcc33.patch
URL: http://www.dosemu.org/
BuildRequires: XFree86-devel
%{?_with_static:BuildRequires: XFree86-static}
%files
%defattr(644,root,root,755)
-%doc QuickStart COPYING ChangeLog* doc/*.html PRZECZYTAJ_TO README.PLD
+%doc QuickStart COPYING ChangeLog* doc/* README.PLD
+%lang(pl) %doc PRZECZYTAJ_TO
%dir %{_dosemudir}
%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dosemu.conf
%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dosemu.users
%files -n xdosemu
%defattr(644,root,root,755)
-%doc QuickStart COPYING ChangeLog* doc/*.html PRZECZYTAJ_TO README.PLD
+%doc QuickStart COPYING ChangeLog* doc/* README.PLD
+%lang(pl) %doc PRZECZYTAJ_TO
%dir %{_dosemudir}
%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dosemu.conf
%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dosemu.users