From 065322bd3cdb2c712d6dfd3814d1260c54566fb9 Mon Sep 17 00:00:00 2001
From: Michael Schloh von Bennewitz <ms@openpkg.org>
Date: Fri, 1 Aug 2003 15:15:19 +0000
Subject: [PATCH] Fix packaging of NEWS and LICENSE, and patch nonstandard
 source code some more

---
 ddd/ddd.patch | 36 ++++++++++++++++++++++++++++++++++++
 ddd/ddd.spec  |  2 --
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/ddd/ddd.patch b/ddd/ddd.patch
index a4b5f6fa23..4dd45d9b65 100644
--- a/ddd/ddd.patch
+++ b/ddd/ddd.patch
@@ -36,3 +36,39 @@ diff -Naur ddd-3.3.7.orig/termcap/termcap.h ddd-3.3.7/termcap/termcap.h
  extern short ospeed;
  extern void tputs (const char *string, int nlines, int (*outfun) ());
  
+diff -Naur ddd-3.3.7.orig/ddd/DispBox.C ddd-3.3.7/ddd/DispBox.C
+--- ddd-3.3.7.orig/ddd/DispBox.C	Sat May 24 17:27:02 2003
++++ ddd-3.3.7/ddd/DispBox.C	Fri Aug  1 15:49:30 2003
+@@ -59,7 +59,9 @@
+ #include "regexps.h"
+ #include "resolveP.h"
+ 
+-#include <ctype.h>
++#include <iostream>
++#include <strstream>
++#include <cctype>
+ 
+ #define assert_ok(x) assert(x)
+ 
+@@ -152,7 +154,7 @@
+ 	    "#line 1 \"" Ddd_NAME "*vslDefs\"\n" +
+ 	    vsllib_defs;
+ 
+-	istrstream is(defs.chars());
++	std::istrstream is(defs.chars());
+ 	vsllib_ptr = new ThemedVSLLib(is, VSEFlags::optimize_mode());
+ #else
+ 	name = "vsllib/" ddd_NAME ".vsl";
+diff -Naur ddd-3.3.7.orig/ddd/Ddd.in ddd-3.3.7/ddd/Ddd.in
+--- ddd-3.3.7.orig/ddd/Ddd.in	Sat May 24 21:00:35 2003
++++ ddd-3.3.7/ddd/Ddd.in	Fri Aug  1 15:43:54 2003
+@@ -649,9 +649,6 @@
+ ! The Perl Debugger settings.  Usually overridden in `~/.@ddd@/init'.
+ @Ddd@*perlSettings:
+ 
+-@Ddd@*bashInitCommands: \
+-  set prompt bashdb$_Dbg_less$_Dbg_greater$_Dbg_space\n\
+-
+ ! The Bash Debugger settings.  Usually overridden in `~/.@ddd@/init'.
+ @Ddd@*bashSettings:
+ 
diff --git a/ddd/ddd.spec b/ddd/ddd.spec
index 0c0ea5324f..f54c3b7c30 100644
--- a/ddd/ddd.spec
+++ b/ddd/ddd.spec
@@ -88,8 +88,6 @@ AutoReqProv:  no
     rm -rf $RPM_BUILD_ROOT
     %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
     rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
-    rm $RPM_BUILD_ROOT%{l_prefix}/share/ddd/COPYING
-    rm $RPM_BUILD_ROOT%{l_prefix}/share/ddd/NEWS
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}