- Updated to 1.3.1

Changed files:
    dosemu-make-new.patch -> 1.8
    dosemu-man-pages.patch -> 1.10
    dosemu.spec -> 1.108

diff --git a/dosemu-make-new.patch b/dosemu-make-new.patch
index 0216a7510446bd292e930bed05478941a6fa83ec..0571eab8d3183247ccf55d42b4483710d1d93fef 100644 (file)
--- a/dosemu-make-new.patch
+++ b/dosemu-make-new.patch
@@ -2,29 +2,32 @@ diff -urN dosemu-1.1.5.org/configure.ac dosemu-1.1.5/configure.ac
 --- dosemu-1.1.5.org/configure.ac      2003-09-01 23:10:03.000000000 +0200
 +++ dosemu-1.1.5/configure.ac  2003-09-01 23:10:53.000000000 +0200
 @@ -428,9 +428,9 @@
- if test "$enable_debug" = "yes"; then
-   CFLAGS="$CFLAGS -gstabs+"
-   AC_DEFINE(_DEBUG)
--  OPT="-O"
-+  OPT="$OPTFLAGS"
- else
--  OPT="-O2"   # BIG NOTE: do _not_ use -O3,
-+  OPT="$OPTFLAGS"   # BIG NOTE: do _not_ use -O3,
+   if test "$enable_debug" = "yes"; then
+     CFLAGS="$CFLAGS -g"
+     AC_DEFINE(_DEBUG)
+-    OPT="-O"
++    OPT="$OPTFLAGS"
+   else
+-    OPT="-O2" # BIG NOTE: do _not_ use -O3,
++    OPT="$OPTFLAGS" # BIG NOTE: do _not_ use -O3,
                # because in forces _inline_ at places where we don't want it !
                # If we want _inline_, well then we 'code' it.
-   OPT="$OPT -fomit-frame-pointer"  # never omit the frame pointer when debugging!
-@@ -517,33 +517,6 @@
-   fi
+     OPT="$OPT -fomit-frame-pointer"  # never omit the frame pointer when debugging!
+@@ -517,35 +517,6 @@
+  fi
  
  
 -  # -m486 is usually in the specs for the compiler
 -  # but gcc-3.0 wants -mcpu=i486 instead
+-  # and gcc-3.4 wants -mtune=i486 instead
 -  # let the compiler options be dependent of the _target_
 -  # where dosemu is compiled for, not the host
 -  if test "$target_cpu" = "athlon" -a $GCC_VERSION_CODE -le 2095 ;  then
 -    target_cpu="i686"
 -  fi
--  if test "$GCC_VERSION_CODE" -ge 2095 ; then
+-  if test "$GCC_VERSION_CODE" -ge 3004 ; then
+-     OPT="$OPT -mtune=$target_cpu"
+-  elif test "$GCC_VERSION_CODE" -ge 2095 ; then
 -     OPT="$OPT -mcpu=$target_cpu"
 -  else
 -     case "$target_cpu" in
@@ -43,10 +46,9 @@ diff -urN dosemu-1.1.5.org/configure.ac dosemu-1.1.5/configure.ac
 -  elif test "$target_cpu" = "i486"; then
 -     OPT="$OPT -malign-loops=2 -malign-jumps=2 -malign-functions=2"
 -  fi
--
+ 
    AC_MSG_CHECKING(for glibc...)
    set `printf '%b\n' '#include <features.h>\nXXAaZZ __GLIBC__ XXBbZZ __GLIBC_MINOR__'|gcc -E -|awk '/XXAaZZ/ {print $2 " " $4}'`
-   major=$1; minor=$2
 diff -urN dosemu-1.1.5.org/src/arch/linux/dosext/sound/midid/Makefile dosemu-1.1.5/src/arch/linux/dosext/sound/midid/Makefile
 --- dosemu-1.1.5.org/src/arch/linux/dosext/sound/midid/Makefile        2003-09-01 23:10:03.000000000 +0200
 +++ dosemu-1.1.5/src/arch/linux/dosext/sound/midid/Makefile    2003-09-01 23:10:19.000000000 +0200

diff --git a/dosemu-man-pages.patch b/dosemu-man-pages.patch
index 4e468573973acdd98a7bf656bebe89ffc0fcc659..d29cfccfe580ed63dc0f6bc491922e88ba4bae22 100644 (file)
--- a/dosemu-man-pages.patch
+++ b/dosemu-man-pages.patch
@@ -113,8 +113,8 @@
 +++ dosemu-1.2.0/man/dosemu.bin.1.in   2004-02-01 15:13:55.922162736 +0100
 @@ -1,9 +1,9 @@
  .\" -*- nroff -*-  (This is for Emacs)
--.TH DOSEMU.BIN 1 "Mar, 2004" "Version 1.3.0" "DOS Emulation"
-+.TH DOSEMU 1 "Mar, 2004" "Version 1.3.0" "DOS Emulation"
+-.TH DOSEMU.BIN 1 "Jul, 2004" "Version 1.3.1" "DOS Emulation"
++.TH DOSEMU 1 "Jul, 2004" "Version 1.3.1" "DOS Emulation"
  .SH NAME
 -dosemu.bin, dosdebug \- run DOS and DOS programs under Linux
 +dosemu, xdosemu, dos, dosdebug \- run DOS and DOS programs under Linux

diff --git a/dosemu.spec b/dosemu.spec
index d8ecd69813198418bd1e4077b5b24b02d506eba6..3cbea8735c5ac13dfb5aa79998289238c33aa1b0 100644 (file)
--- a/dosemu.spec
+++ b/dosemu.spec
@@ -1,7 +1,6 @@
 #
 # Conditional build:
 %bcond_with    static          # linked statically
-%bcond_with    linux26         # /proc/net/ipx/* patch
 #
 Summary:       A DOS emulator
 Summary(de):   DOS-Emulator
@@ -11,12 +10,12 @@ Summary(pl):        Emulator DOS-a
 Summary(pt_BR):        Emulador DOS
 Summary(tr):   DOS öykünümcüsü
 Name:          dosemu
-Version:       1.3.0
-Release:       0.2
+Version:       1.3.1
+Release:       0.1
 License:       GPL v2
 Group:         Applications/Emulators
-Source0:       http://dl.sourceforge.net/dosemu/%{name}-1.3.0.tgz
-# Source0-md5: d2864cecdfe6a2f7adb97270e892f0d5
+Source0:       http://dl.sourceforge.net/dosemu/%{name}-%{version}.tgz
+# Source0-md5: d64c0d2d63944c407401a04367cfadc4
 #Source2:      %{name}-sys.tar.gz
 Source3:       %{name}-PRZECZYTAJ_TO
 Source4:       %{name}-README.PLD
@@ -28,7 +27,6 @@ Patch1:               %{name}-make-new.patch
 Patch2:                %{name}-%{name}_conf.patch
 Patch3:                %{name}-doSgmlTools.patch
 Patch4:                %{name}-makehtml.patch
-Patch5:                %{name}-linux26-ipx.patch
 URL:           http://www.dosemu.org/
 BuildRequires: XFree86-devel
 %{?with_static:BuildRequires:  XFree86-static}
@@ -144,7 +142,6 @@ mkfatimage16.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%{?with_linux26:%patch5 -p1}
 
 %build
 OPTFLAGS="%{rpmcflags}"; export OPTFLAGS