diff --git a/0001-xorg-cf-files-1.0.6-for-Invoke-ar-cq-with-binutils.patch b/0001-xorg-cf-files-1.0.6-for-Invoke-ar-cq-with-binutils.patch
deleted file mode 100644
index aa9ea8446881948e9a68e3c043023ed129a937ce..0000000000000000000000000000000000000000
--- a/0001-xorg-cf-files-1.0.6-for-Invoke-ar-cq-with-binutils.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 42e91e64378aad306614d1b9793933b83dcead6d Mon Sep 17 00:00:00 2001
-From: houlifei <houlifei@uniontech.com>
-Date: Fri, 21 Jul 2023 17:20:54 +0800
-Subject: [PATCH] xorg-cf-files-1.0.6-for-Invoke-ar-cq-with-binutils
-
----
- Imake.tmpl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Imake.tmpl b/Imake.tmpl
-index 0f8832f..3467242 100644
---- a/Imake.tmpl
-+++ b/Imake.tmpl
-@@ -1078,7 +1078,7 @@ TCLIBDIR = TclLibDir
- #define ArCmdBase ar
- #endif
- #ifndef ArCmd
--#if HasLargeTmp || SystemV4 || HasGnuAr
-+#if HasLargeTmp || SystemV4 || HasGnuAr || LinuxBinUtilsMajorVersion
- #define ArCmd ArCmdBase cq
- #else
- #define ArCmd ArCmdBase clq
--- 
-2.33.0
-
diff --git a/gccmakedep-1.0.3.tar.bz2 b/gccmakedep-1.0.3.tar.bz2
deleted file mode 100644
index afdb667837643f5f345d7e4214acd9d23360f02e..0000000000000000000000000000000000000000
Binary files a/gccmakedep-1.0.3.tar.bz2 and /dev/null differ
diff --git a/imake-1.0.10.tar.xz b/imake-1.0.10.tar.xz
new file mode 100644
index 0000000000000000000000000000000000000000..1cd6682b2497cab86f8bbc23b1007ded14144cbf
Binary files /dev/null and b/imake-1.0.10.tar.xz differ
diff --git a/imake-1.0.9.tar.gz b/imake-1.0.9.tar.gz
deleted file mode 100644
index 41a8a64c5872dd5a4ca149f88af6e9467076c589..0000000000000000000000000000000000000000
Binary files a/imake-1.0.9.tar.gz and /dev/null differ
diff --git a/imake.spec b/imake.spec
index 2520818902a2f72b8885eb7c56da48ac397b3a3e..221a33d45cdd6de51c245eb8d8908414b2f12098 100644
--- a/imake.spec
+++ b/imake.spec
@@ -1,26 +1,27 @@
 Summary: imake source code configuration and build system
 Name: imake
-Version: 1.0.9
+Version: 1.0.10
 Release: 1
 License: MIT
-URL: http://www.x.org
-
-Source0: https://www.x.org/pub/individual/util/imake-1.0.9.tar.gz
-Source1: https://www.x.org/pub/individual/util/makedepend-1.0.8.tar.gz
-Source2: https://www.x.org/pub/individual/util/gccmakedep-1.0.3.tar.bz2
-Source3: https://www.x.org/pub/individual/util/xorg-cf-files-1.0.8.tar.gz
-Source4: https://www.x.org/pub/individual/util/lndir-1.0.4.tar.gz
-# Adapt ar invocation to binutils 2.36, bug #1943274, in upstream after 1.0.6,
-# <https://gitlab.freedesktop.org/xorg/util/cf/-/merge_requests/2>
-Patch1: 0001-xorg-cf-files-1.0.6-for-Invoke-ar-cq-with-binutils.patch
-Patch2: 0001-imake-1.0.2-for-abort.patch
-
-BuildRequires: pkgconfig gcc gcc-c++ xorg-x11-util-macros xorg-x11-proto-devel
-
-Requires:      gcc
-
-Provides: ccmakedep cleanlinks gccmakedep lndir makedepend
-Provides: makeg mergelib mkdirhier mkhtmlindex revpath xmkmf
+URL: https://www.x.org
+Source0: https://www.x.org/pub/individual/util/%{name}-%{version}.tar.xz
+Patch1: 0001-imake-1.0.2-for-abort.patch
+
+BuildRequires: make
+BuildRequires: gcc gcc-c++
+BuildRequires: perl
+BuildRequires: pkgconfig(xorg-macros) >= 1.8
+BuildRequires: pkgconfig(xproto)
+Requires: gcc
+Provides: ccmakedep
+Provides: cleanlinks
+Provides: makeg
+Provides: mergelib
+Provides: mkdirhier
+Provides: mkhtmlindex
+Provides: revpath
+Provides: xmkmf
+Requires: xorg-cf-files
 
 %description
 imake is a build automation system written for the X Window System.
@@ -32,51 +33,25 @@ Brunhoff at Tektronix.
 %package_help
 
 %prep
-%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4
-
-pushd xorg-cf-files-1.0.8
-%patch1 -p1 -b .ar
-popd
-
-pushd %{name}-%{version}
-%patch2 -p1 -b .abort
-popd
+%autosetup -p1
 
 %build
-{
-   for i in %{name} makedepend gccmakedep lndir xorg-cf-files ; do
-      pushd $i-*
-      case $i in
-         %{name}|xorg-cf-files)
-            %configure --with-config-dir=%{_datadir}/X11/config
-            ;;
-         *)
-            %configure
-            ;;
-      esac
-      %{__make}
-      popd
-   done
-}
+%configure
+%make_build
 
 %install
-{
-   for i in %{name} makedepend gccmakedep lndir xorg-cf-files ; do
-      pushd $i-*
-      %make_install
-      popd
-   done
-}
+%make_install
 
 %files
 %{_bindir}/*
-%dir %{_datadir}/X11/config
-%{_datadir}/X11/config/*
 
 %files help
 %{_mandir}/man1/*
 
 %changelog
+* Thu Apr 17 2025 Funda Wang <fundawang@yeah.net> - 1.0.10-1
+- Update to 1.0.10
+
 * Fri Jul 21 2023 houlifei <houlifei@uniontech.com> - 1.0.9-1
 - Upgrade to version 1.0.9
 
diff --git a/imake.yaml b/imake.yaml
index 755211ca10b59de38468d74f472037e354909a8c..c3ac7682eebca769f23f214d40ef5208f250c341 100644
--- a/imake.yaml
+++ b/imake.yaml
@@ -1,4 +1,4 @@
 version_control: git
 src_repo: https://gitlab.freedesktop.org/xorg/util/imake.git
-tag_prefix: imake-
-seperator: .
+tag_prefix: ^imake-
+separator: .
diff --git a/lndir-1.0.4.tar.gz b/lndir-1.0.4.tar.gz
deleted file mode 100644
index 018596cdc7759ee5fe4e5c0e55b0b6cd758170ec..0000000000000000000000000000000000000000
Binary files a/lndir-1.0.4.tar.gz and /dev/null differ
diff --git a/makedepend-1.0.8.tar.gz b/makedepend-1.0.8.tar.gz
deleted file mode 100644
index 7740a668dd647025312bab4c376e00c92330e322..0000000000000000000000000000000000000000
Binary files a/makedepend-1.0.8.tar.gz and /dev/null differ
diff --git a/xorg-cf-files-1.0.8.tar.gz b/xorg-cf-files-1.0.8.tar.gz
deleted file mode 100644
index b896bf453eac0370ee76259247ab4992161a6a3b..0000000000000000000000000000000000000000
Binary files a/xorg-cf-files-1.0.8.tar.gz and /dev/null differ