diff --git a/0001-mkfontscale-examine-all-encodings.patch b/0001-mkfontscale-examine-all-encodings.patch
deleted file mode 100644
index 1913915ca2c3ff0fba71cf3f66dc810357c0f5fd..0000000000000000000000000000000000000000
--- a/0001-mkfontscale-examine-all-encodings.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mkfontscale.c b/mkfontscale.c
-index a67f283..96e19a3 100644
---- a/mkfontscale.c
-+++ b/mkfontscale.c
-@@ -317,7 +317,7 @@ getName(FT_Face face, int nid)
-     int i;
- 
-     if(getNameHelper(face, nid,
--                     TT_PLATFORM_MICROSOFT, TT_MS_ID_UNICODE_CS, &name) ||
-+                     TT_PLATFORM_MICROSOFT, -1, &name) ||
-        getNameHelper(face, nid,
-                      TT_PLATFORM_APPLE_UNICODE, -1, &name)) {
-         string = malloc(name.string_len / 2 + 1);
diff --git a/bdftopcf-1.1.tar.bz2 b/bdftopcf-1.1.tar.bz2
deleted file mode 100644
index 3b6bd3b0253022cfc5c6376e49bd125990578319..0000000000000000000000000000000000000000
Binary files a/bdftopcf-1.1.tar.bz2 and /dev/null differ
diff --git a/font-util-1.3.2.tar.bz2 b/font-util-1.3.2.tar.bz2
deleted file mode 100644
index c0f46288ec445426f96d784a518a5128c2be6062..0000000000000000000000000000000000000000
Binary files a/font-util-1.3.2.tar.bz2 and /dev/null differ
diff --git a/font-util-1.4.1.tar.xz b/font-util-1.4.1.tar.xz
new file mode 100644
index 0000000000000000000000000000000000000000..d69b85906ff8b358db9e20c2d2179af5794fd57c
Binary files /dev/null and b/font-util-1.4.1.tar.xz differ
diff --git a/fonttosfnt-1.1.0.tar.bz2 b/fonttosfnt-1.1.0.tar.bz2
deleted file mode 100644
index 65a72fd7d2d32b11ff18d0d0c6cc371bee02b752..0000000000000000000000000000000000000000
Binary files a/fonttosfnt-1.1.0.tar.bz2 and /dev/null differ
diff --git a/mkfontdir-1.0.7.tar.bz2 b/mkfontdir-1.0.7.tar.bz2
deleted file mode 100644
index bd4f237013e5f574d65b680c2376f14828202656..0000000000000000000000000000000000000000
Binary files a/mkfontdir-1.0.7.tar.bz2 and /dev/null differ
diff --git a/mkfontscale-1.1.3.tar.bz2 b/mkfontscale-1.1.3.tar.bz2
deleted file mode 100644
index 86e5dc64a37e253f2cb6c27c62a1db5f65cd6f7a..0000000000000000000000000000000000000000
Binary files a/mkfontscale-1.1.3.tar.bz2 and /dev/null differ
diff --git a/xorg-x11-font-utils.spec b/xorg-x11-font-utils.spec
index 002f83a70c70db70da224d59f352b02ad68d9eae..194ca40ce0a6f851c1ddd3606a8c5c13f692a8b7 100644
--- a/xorg-x11-font-utils.spec
+++ b/xorg-x11-font-utils.spec
@@ -2,40 +2,22 @@
 
 Summary:    X.Org X11 font utilities
 Name:       xorg-x11-font-utils
-Epoch:      1
-Version:    7.5
-Release:    45
-License:    MIT
-URL:        http://www.x.org
-
-Source0:    http://www.x.org/pub/individual/app/bdftopcf-1.1.tar.bz2
-Source1:    http://www.x.org/pub/individual/app/fonttosfnt-1.1.0.tar.bz2
-Source2:    http://www.x.org/pub/individual/app/mkfontdir-1.0.7.tar.bz2
-Source3:    http://www.x.org/pub/individual/app/mkfontscale-1.1.3.tar.bz2
-Source4:    http://www.x.org/pub/individual/font/font-util-1.3.2.tar.bz2
+Epoch:      2
+Version:    1.4.1
+Release:    1
+License:    MIT AND BSD-2-Clause AND MIT-open-group AND Unicode-TOU
+URL:        https://www.x.org
+
+Source0:    https://www.x.org/releases/individual/font/font-util-%{version}.tar.xz
 Source5:    xorg-x11-fonts-update-dirs
 Source6:    xorg-x11-fonts-update-dirs.1
 
-Patch0:     0001-mkfontscale-examine-all-encodings.patch
-
-BuildRequires: libtool pkgconfig(fontenc) pkgconfig(freetype2)
-BuildRequires: pkgconfig(x11) pkgconfig(xorg-macros) >= 1.8 zlib-devel
-
-Provides:   bdftopcf = 1.1
-Obsoletes:  bdftopcf < 1.1
-Provides:   fonttosfnt = 1.1.0
-Obsoletes:  fonttosfnt < 1.1.0
-Provides:   mkfontdir = 1.0.7
-Obsoletes:  mkfontdir < 1.0.7
-Provides:   mkfontscale = 1.1.3
-Obsoletes:  mkfontscale < 1.1.3
-Provides:   font-util = 1.3.2
-Obsoletes:  font-util < 1.3.2
+BuildRequires:  gcc make
+BuildRequires:  pkgconfig(xorg-macros) >= 1.8
 Provides:   font-utils = %{epoch}:%{version}-%{release}
 Obsoletes:  font-utils < %{epoch}:%{version}-%{release}
-Provides:   ucs2any = 1.3.1
-Obsoletes:  ucs2any < 1.3.1
-
+Provides:   ucs2any = %{epoch}:%{version}-%{release}
+Obsoletes:  ucs2any < %{epoch}:%{version}-%{release}
 
 %description
 X.Org X11 font utilities required for font installation, conversion, and generation.
@@ -43,57 +25,27 @@ X.Org X11 font utilities required for font installation, conversion, and generat
 %package_help
 
 %prep
-%setup -q -c xorg-x11-font-utils-%{version} -a1 -a2 -a3 -a4
-pushd mkfontscale-*
-%patch0 -p1 -b .all-encodings
-popd
+%autosetup -p1 -n font-util-%{version}
 
 %build
-{
-for app in * ; do
-    pushd $app
-        autoreconf -vif
-        case $app in
-            font-util-*)
-                %configure --with-fontrootdir=%{_x11fontdir}
-                ;;
-            *)
-                %configure
-                ;;
-        esac
-        %{make_build}
-    popd
-done
-}
+%configure --with-fontrootdir=%{_x11fontdir}
+%make_build
 
 %install
-{
-    for app in * ; do
-        pushd $app
-            %make_install
-        popd
-    done
-    for i in */README ; do
-        [ -s $i ] && cp $i README-$(echo $i | sed 's/-[0-9].*//')
-    done
-    for i in */COPYING ; do
-        grep -q stub $i || cp $i COPYING-$(echo $i | sed 's/-[0-9].*//')
-    done
-}
-
-install -m 744 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/xorg-x11-fonts-update-dirs
-sed -i "s:@DATADIR@:%{_datadir}:" $RPM_BUILD_ROOT%{_bindir}/xorg-x11-fonts-update-dirs
-
-install -m 744 -p -D %{SOURCE6} $RPM_BUILD_ROOT%{_mandir}/man1/xorg-x11-fonts-update-dirs.1
-
-find $RPM_BUILD_ROOT -name bdftruncate\* -print0 | xargs -0 rm -f
+%make_install
+
+install -m 744 -D %{S:5} %{buildroot}%{_bindir}/xorg-x11-fonts-update-dirs
+sed -i "s:@DATADIR@:%{_datadir}:" %{buildroot}%{_bindir}/xorg-x11-fonts-update-dirs
+
+mkdir -p %{buildroot}%{_mandir}/man1/
+install -m 744 -p -D %{S:6} %{buildroot}%{_mandir}/man1/xorg-x11-fonts-update-dirs.1
+
+rm -f %{buildroot}%{_bindir}/bdftruncate
+rm -f %{buildroot}%{_mandir}/man1/bdftruncate.1
 
 %files
-%doc README-* COPYING-bdftopcf COPYING-[c-z]*
-%{_bindir}/bdftopcf
-%{_bindir}/fonttosfnt
-%{_bindir}/mkfontdir
-%{_bindir}/mkfontscale
+%doc README.md
+%license COPYING
 %{_bindir}/ucs2any
 %{_bindir}/xorg-x11-fonts-update-dirs
 %{_datadir}/aclocal/fontutil.m4
@@ -103,14 +55,14 @@ find $RPM_BUILD_ROOT -name bdftruncate\* -print0 | xargs -0 rm -f
 %{_x11fontdir}/util/map-*
 
 %files help
-%{_mandir}/man1/bdftopcf.1*
-%{_mandir}/man1/fonttosfnt.1*
-%{_mandir}/man1/mkfontdir.1*
-%{_mandir}/man1/mkfontscale.1*
 %{_mandir}/man1/ucs2any.1*
 %{_mandir}/man1/xorg-x11-fonts-update-dirs.1*
 
 %changelog
+* Tue Aug 20 2024 Funda Wang <fundawang@yeah.net> - 2:1.4.1-1
+- update to 1.4.1
+- deaggregation of xorg-x11-*
+
 * Thu Aug 01 2024 lingsheng <lingsheng1@h-partners.com> - 1:7.5-45
 - Replace tabs with spaces, fix changelog version