- removed obsolete symbols patch, updated XTerm.ad patch

Changed files:
    XFree86-XTerm.ad.patch -> 1.10
    XFree86-symbols.patch -> 1.3
    XFree86.spec -> 1.493

diff --git a/XFree86-XTerm.ad.patch b/XFree86-XTerm.ad.patch
index 3debcf6f762d4d365693148a6a95195a26cc468c..050057331216efec7d1357dd045e6d2d879932e8 100644 (file)
--- a/XFree86-XTerm.ad.patch
+++ b/XFree86-XTerm.ad.patch
@@ -1,8 +1,7 @@
-diff -urN xc.orig/programs/xterm/XTerm.ad xc/programs/xterm/XTerm.ad
---- xc.orig/programs/xterm/XTerm.ad    Mon Dec 30 15:54:16 2002
-+++ xc/programs/xterm/XTerm.ad Mon Dec 30 20:05:06 2002
-@@ -115,8 +115,8 @@
- *VT100*dynamicColors: on
+--- xc/programs/xterm/XTerm-col.ad.orig        2003-09-25 13:06:59.000000000 +0200
++++ xc/programs/xterm/XTerm-col.ad     2003-10-01 20:48:30.453913496 +0200
+@@ -11,8 +11,8 @@
+ !*VT100*background: black
  
  ! Uncomment this to use color for underline attribute
 -!*VT100*colorULMode: on
@@ -12,10 +11,12 @@ diff -urN xc.orig/programs/xterm/XTerm.ad xc/programs/xterm/XTerm.ad
  
  ! Uncomment this to use color for the bold attribute
  !*VT100*colorBDMode: on
-@@ -142,3 +142,176 @@
- *VT100*color15: white
- *VT100*colorUL: yellow
- *VT100*colorBD: white
+--- xc/programs/xterm/XTerm.ad.orig    2003-09-25 13:06:59.000000000 +0200
++++ xc/programs/xterm/XTerm.ad 2003-10-01 20:49:35.565015104 +0200
+@@ -107,3 +107,176 @@
+ *tek4014*font2: 8x13
+ *tek4014*font3: 6x13
+ *tek4014*fontSmall: 6x10
 +
 +! This file causes when loaded using xrdb correct behaviour of xterm
 +! if you are using enclosed xterm.tcap and xterm.ti.

diff --git a/XFree86-symbols.patch b/XFree86-symbols.patch
deleted file mode 100644 (file)
index 2fc42ac..0000000
--- a/XFree86-symbols.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN xc.orig/programs/xkbcomp/symbols/pc/pl2 xc/programs/xkbcomp/symbols/pc/pl2
---- xc.orig/programs/xkbcomp/symbols/pc/pl2    2003-04-25 13:09:44.000000000 +0200
-+++ xc/programs/xkbcomp/symbols/pc/pl2 2003-08-30 21:29:21.000000000 +0200
-@@ -41,6 +41,6 @@
-     key <BKSL>        { [    oacute,     zacute,   dead_grave,   dead_breve ] };
-     key <AB03>        { [         c,          C,         cent,    copyright ] };
- 
--    include "level3(ralt_switch_multikey)"
-+    include "level3(ralt_switch)"
- };
- 

diff --git a/XFree86.spec b/XFree86.spec
index 1113a39ecaa13c68754efd57a7ed8451f5ea66d7..919b34859a7b28aa6c0f62293865c96f6b148b43 100644 (file)
--- a/XFree86.spec
+++ b/XFree86.spec
@@ -97,7 +97,7 @@ Patch21:      %{name}-r128-busmstr2.patch
 Patch22:       %{name}-neomagic_swcursor.patch
 Patch23:       %{name}-mga-busmstr.patch
 Patch24:       %{name}-agpgart-load.patch
-Patch25:       %{name}-symbols.patch
+
 Patch26:       %{name}-HasFreetype2.patch
 Patch27:       %{name}-config-s3.patch
 Patch28:       %{name}-sparc_pci_domains.patch
@@ -1767,13 +1767,13 @@ System. 
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
-#%patch25 -p0
+
 %patch26 -p1
 %patch27 -p1
 %ifarch sparc sparc64
 #%patch28 -p1  -- needs update
 %endif
-#%patch29 -p0   -- needs update
+%patch29 -p0
 %patch30 -p1
 %patch32 -p1
 %patch33 -p1