From e7d9784f698e8f4813c50434750a75cdedecd3ae Mon Sep 17 00:00:00 2001
From: yangchenguang <yangchenguang@kylinsec.com.cn>
Date: Wed, 17 Jul 2024 09:53:44 +0800
Subject: [PATCH] Modify sw_64 patch use all arch

Signed-off-by: yangchenguang <yangchenguang@kylinsec.com.cn>
(cherry picked from commit 432f16a3b6c5ff3c04a858d58fd8cb18e26d8fbf)
---
 libXt-1.2.1-sw.patch      | 11 -----------
 libXt-support-sw_64.patch | 25 +++++++++++++++++++++++++
 libXt.spec                | 10 ++++++----
 3 files changed, 31 insertions(+), 15 deletions(-)
 delete mode 100755 libXt-1.2.1-sw.patch
 create mode 100644 libXt-support-sw_64.patch

diff --git a/libXt-1.2.1-sw.patch b/libXt-1.2.1-sw.patch
deleted file mode 100755
index 787b605..0000000
--- a/libXt-1.2.1-sw.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur libXt-1.2.1.org/include/X11/Xtos.h libXt-1.2.1.sw/include/X11/Xtos.h
---- libXt-1.2.1.org/include/X11/Xtos.h	2022-02-26 01:04:27.600000000 +0000
-+++ libXt-1.2.1.sw/include/X11/Xtos.h	2022-02-26 01:05:17.470000000 +0000
-@@ -55,6 +55,7 @@
- 
- #if defined (_LP64) || \
-     defined(__alpha) || defined(__alpha__) || \
-+    defined(__sw_64) || defined(__sw_64__) || \
-     defined(__ia64__) || defined(ia64) || \
-     defined(__sparc64__) || \
-     defined(__s390x__) || \
diff --git a/libXt-support-sw_64.patch b/libXt-support-sw_64.patch
new file mode 100644
index 0000000..90d3dbb
--- /dev/null
+++ b/libXt-support-sw_64.patch
@@ -0,0 +1,25 @@
+From d900b21bed8c9ed15c85e2e87f76fbe4d656a3b2 Mon Sep 17 00:00:00 2001
+From: yangchenguang <yangchenguang@kylinsec.com.cn>
+Date: Wed, 17 Jul 2024 10:09:14 +0800
+Subject: [PATCH] libXt support sw_64
+
+Signed-off-by: yangchenguang <yangchenguang@kylinsec.com.cn>
+---
+ include/X11/Xtos.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/X11/Xtos.h b/include/X11/Xtos.h
+index 84910c0..9a3844d 100644
+--- a/include/X11/Xtos.h
++++ b/include/X11/Xtos.h
+@@ -59,6 +59,7 @@ SOFTWARE.
+ # endif
+ # elif defined (_LP64) || \
+     defined(__alpha) || defined(__alpha__) || \
++    defined(__sw_64) || defined(__sw_64__) || \
+     defined(__ia64__) || defined(ia64) || \
+     defined(__sparc64__) || \
+     defined(__s390x__) || \
+-- 
+2.39.1
+
diff --git a/libXt.spec b/libXt.spec
index 39d87ad..4529ab5 100644
--- a/libXt.spec
+++ b/libXt.spec
@@ -2,14 +2,13 @@
 
 Name:           libXt
 Version:        1.3.0
-Release:        1
+Release:        2
 License:        MIT
 Summary:        X.Org X11 libXt runtime library
 URL:            https://www.x.org
 Source0:        https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.gz
-%ifarch sw_64
-Patch1:         libXt-1.2.1-sw.patch
-%endif
+
+Patch1000:      libXt-support-sw_64.patch
 
 BuildRequires:  xorg-x11-util-macros autoconf automake libtool make glib2-devel
 BuildRequires:  pkgconfig(xproto) pkgconfig(x11) pkgconfig(sm)
@@ -72,6 +71,9 @@ mkdir -p -m 0755 $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
 %{_docdir}/%{name}/*.xml
 
 %changelog
+* Wed Jul 17 2024 yangchenguang <yangchenguang@kylinsec.com.cn> - 1.3.0-2
+- Modify sw_64 patch use all arch
+
 * Thu Jul 20 2023 zhangpan <zhangpan103@h-partners.com> - 1.3.0-1
 - update to 1.3.0