- up to 8.5.15

diff --git a/tk-x.patch b/tk-x.patch
deleted file mode 100644 (file)
index 69cd272..0000000
--- a/tk-x.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- tk8.5a4/unix/tcl.m4.orig   2006-05-24 07:59:16.403356000 +0200
-+++ tk8.5a4/unix/tcl.m4        2006-05-24 17:57:38.087071500 +0200
-@@ -2281,9 +2281,9 @@
-     not_really_there=""
-     if test "$no_x" = ""; then
-       if test "$x_includes" = ""; then
--          AC_TRY_CPP([#include <X11/XIntrinsic.h>], , not_really_there="yes")
-+          AC_TRY_CPP([#include <X11/Xlib.h>], , not_really_there="yes")
-       else
--          if test ! -r $x_includes/X11/Intrinsic.h; then
-+          if test ! -r $x_includes/X11/Xlib.h; then
-               not_really_there="yes"
-           fi
-       fi
-@@ -2291,11 +2291,11 @@
-     if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then
-       AC_MSG_CHECKING([for X11 header files])
-       found_xincludes="no"
--      AC_TRY_CPP([#include <X11/Intrinsic.h>], found_xincludes="yes", found_xincludes="no")
-+      AC_TRY_CPP([#include <X11/Xlib.h>], found_xincludes="yes", found_xincludes="no")
-       if test "$found_xincludes" = "no"; then
-           dirs="/usr/unsupported/include /usr/local/include /usr/X386/include /usr/X11R6/include /usr/X11R5/include /usr/include/X11R5 /usr/include/X11R4 /usr/openwin/include /usr/X11/include /usr/sww/include"
-           for i in $dirs ; do
--              if test -r $i/X11/Intrinsic.h; then
-+              if test -r $i/X11/Xlib.h; then
-                   AC_MSG_RESULT([$i])
-                   XINCLUDES=" -I$i"
-                   found_xincludes="yes"

diff --git a/tk.spec b/tk.spec
index ba064b602ca4e9d5af8df8e8f9bbaa32471219f6..40dd580e0cd402fab9705373a54603f781778e55 100644 (file)
--- a/tk.spec
+++ b/tk.spec
@@ -7,13 +7,13 @@ Summary(tr.UTF-8):    Tk, Tcl için grafik kullanıcı arabirimi araç takımıdır
 Summary(uk.UTF-8):     Tk GUI toolkit для Tcl
 Name:          tk
 %define        major   8.5
-%define                minor   13
+%define                minor   15
 Version:       %{major}.%{minor}
 Release:       1
 License:       BSD
 Group:         Development/Languages/Tcl
 Source0:       http://downloads.sourceforge.net/tcl/%{name}%{version}-src.tar.gz
-# Source0-md5: 1fc7dbb7495160756dbc805224afa360
+# Source0-md5: 55b8e33f903210a4e1c8bce0f820657f
 Patch0:                %{name}-ieee.patch
 Patch1:                %{name}-manlnk.patch
 Patch2:                %{name}-pil.patch
@@ -25,7 +25,7 @@ Patch6:               %{name}-aa-cairo.patch
 Patch7:                %{name}-unix-scrollbars.patch
 Patch8:                %{name}-unix-3d-borders.patch
 Patch9:                %{name}-lib64.patch
-Patch10:       %{name}-x.patch
+
 Patch11:       %{name}-no_tcl_stub.patch
 Patch12:       %{name}-link.patch
 URL:           http://www.tcl.tk/
@@ -136,7 +136,7 @@ Narzędzia Tk GUI - programy demonstracyjne.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
+
 %patch11 -p1
 %patch12 -p1