Appended patches for Solaris 2.8 and 2.9

emacs/emacs.patch

@@ -0,0 +1,44 @@
+--- configure.orig	Mon Jan 13 17:26:11 2003
++++ configure	Mon Jan 13 17:26:09 2003
+@@ -1527,8 +1527,18 @@
+ 		NON_GNU_CPP=/usr/ccs/lib/cpp
+ 		RANLIB="ar -ts"
+ 		;;
+-      *-sunos5* | *-solaris* )
++      *-sunos5.6* | *-solaris2.6* )
++		opsys=sol2-5
++		NON_GNU_CPP=/usr/ccs/lib/cpp
++		RANLIB="ar -ts"
++		;;
++      *-sunos5.7* | *-solaris2.7* )
+ 		opsys=sol2-5
++		NON_GNU_CPP=/usr/ccs/lib/cpp
++		RANLIB="ar -ts"
++		;;
++      *-sunos5* | *-solaris* )
++		opsys=sol2-8
+ 		NON_GNU_CPP=/usr/ccs/lib/cpp
+ 		;;
+       *			  ) opsys=bsd4-2   ;;
+--- configure.in.orig	Mon Jan 13 17:26:10 2003
++++ configure.in	Mon Jan 13 17:26:10 2003
+@@ -901,8 +901,18 @@
+ 		NON_GNU_CPP=/usr/ccs/lib/cpp
+ 		RANLIB="ar -ts"
+ 		;;
+-      *-sunos5* | *-solaris* )
++      *-sunos5.6* | *-solaris2.6* )
++		opsys=sol2-5
++		NON_GNU_CPP=/usr/ccs/lib/cpp
++		RANLIB="ar -ts"
++		;;
++      *-sunos5.7* | *-solaris2.7* )
+ 		opsys=sol2-5
++		NON_GNU_CPP=/usr/ccs/lib/cpp
++		RANLIB="ar -ts"
++		;;
++      *-sunos5* | *-solaris* )
++		opsys=sol2-8
+ 		NON_GNU_CPP=/usr/ccs/lib/cpp
+ 		;;
+       *			  ) opsys=bsd4-2   ;;

emacs/emacs.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [BASE]
 Group:        Editor
 License:      GPL
 Version:      21.2
-Release:      20030103
+Release:      20030113
 
 #   package options
 %option       with_x11       %{l_test -p x11}
@@ -48,6 +48,8 @@ Release:      20030103
 
 #   list of sources
 Source0:      ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.gz
+Source1:      sol2-8.h
+Patch0:       emacs.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -72,8 +74,11 @@ AutoReqProv:  no
 
 %prep
     %setup -q
+	%patch0 -p0
 
 %build
+    %{l_shtool} install -c -m 755 \
+       %{SOURCE sol2-8.h} ${RPM_BUILD_DIR}emacs-%{version}/src/s/sol2-8.h
     %{l_shtool} subst \
         -e 's;/${version}/;/;g' \
         -e 's;/${version};;g' \

emacs/sol2-8.h

@@ -0,0 +1,10 @@
+/* Handle Solaris 2.8 and 2.9 .  */
+
+#include "sol2-5.h"
+
+/* Avoid conflict with strings.h iso/string_iso.h */
+
+#undef bcmp
+#undef bcopy
+#undef bzero
+