diff --git a/0003-fix-build-with-gettext-0.26.patch b/0003-fix-build-with-gettext-0.26.patch
new file mode 100644
index 0000000000000000000000000000000000000000..e17b757ff4c056121548ef48488fd178c0a690bd
--- /dev/null
+++ b/0003-fix-build-with-gettext-0.26.patch
@@ -0,0 +1,25 @@
+From 6de8c96c6a7640519146749bbae05c4f5c7afc7d Mon Sep 17 00:00:00 2001
+From: Funda Wang <fundawang@yeah.net>
+Date: Fri, 25 Jul 2025 14:16:34 +0800
+Subject: [PATCH] fix build with gettext 0.26
+
+---
+ translation-canary/xgettext_werror.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/translation-canary/xgettext_werror.sh b/translation-canary/xgettext_werror.sh
+index ff74daa..2ae0ee5 100755
+--- a/translation-canary/xgettext_werror.sh
++++ b/translation-canary/xgettext_werror.sh
+@@ -37,7 +37,7 @@ returncode=0
+ xgettext_output="$(LC_MESSAGES=C xgettext "$@" 2>&1)" || returncode=$?
+ 
+ # Look for warnings
+-if echo "$xgettext_output" | awk '/warning: / && !/fallback ITS rule/{rc=1}; END {exit !rc}'; then
++if echo "$xgettext_output" | grep -v 'Message contains an embedded URL' | awk '/warning: / && !/fallback ITS rule/{rc=1}; END {exit !rc}'; then
+     returncode=1
+ fi
+ 
+-- 
+2.47.1
+
diff --git a/anaconda.spec b/anaconda.spec
index e40071a1fa570a31c5253486e4274ea1b9477a45..5ab35372ee430b0cd4aa3256625ef790c59c02e9 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,6 +1,6 @@
 Name:    anaconda
 Version: 36.16.5
-Release: 48
+Release: 49
 Summary: Graphical system installer
 License: GPL-2.0-or-later and MIT
 URL:     https://fedoraproject.org/wiki/Anaconda
@@ -62,6 +62,7 @@ Patch10000:    0001-add-loongarch-support-for-anaconda.patch
 Patch10001:    0001-check-that-the-password-contains-the-username.patch
 
 Patch10002:    anaconda-36.16.5-add-support-for-sw_64.patch
+Patch10003:    0003-fix-build-with-gettext-0.26.patch
 
 %if ! 0%{?openEuler}
 Patch9027:    disable-disk-encryption.patch
@@ -252,10 +253,10 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
 %ldconfig_scriptlets
 
 %ifarch %{ix86} x86_64
-%post
+%post core
 update-desktop-database &> /dev/null || :
 
-%postun
+%postun core
 update-desktop-database &> /dev/null || :
 %endif
 
@@ -264,7 +265,6 @@ update-desktop-database &> /dev/null || :
 #However, the removal will affect the test cases.
 
 %files
-%defattr(-,root,root)
 %license COPYING
 %{_libdir}/libAnacondaWidgets.so.*
 %{_libdir}/girepository*/AnacondaWidgets*typelib
@@ -273,7 +273,6 @@ update-desktop-database &> /dev/null || :
 %exclude %{python3_sitearch}/pyanaconda/ui/gui/spokes/blivet_gui.*
 
 %files core
-%defattr(-,root,root)
 %license COPYING
 %{_sbindir}/anaconda
 %{_sbindir}/handle-sshpw
@@ -286,7 +285,7 @@ update-desktop-database &> /dev/null || :
 %{_prefix}/lib/systemd/system-generators/*
 %{_unitdir}/*
 %{_datadir}/anaconda
-%{_datadir}/locale/*
+%{_datadir}/locale/*/LC_MESSAGES/%{name}.mo
 %{python3_sitearch}/pyanaconda
 %exclude %{_prefix}/libexec/anaconda/dd_*
 %exclude %{_libdir}/libAnacondaWidgets.so
@@ -297,14 +296,12 @@ update-desktop-database &> /dev/null || :
 %exclude %{python3_sitearch}/pyanaconda/__pycache__/rescue.*
 %exclude %{python3_sitearch}/pyanaconda/ui/gui/*
 %exclude %{python3_sitearch}/pyanaconda/ui/tui/*
-%{_bindir}/analog
-%{_bindir}/anaconda-cleanup
 %dir %{_sysconfdir}/%{name}
-%config %{_sysconfdir}/%{name}/*
+%config %{_sysconfdir}/%{name}/*.conf
 %dir %{_sysconfdir}/%{name}/conf.d
-%config %{_sysconfdir}/%{name}/conf.d/*
+%config %{_sysconfdir}/%{name}/conf.d/*.conf
 %dir %{_sysconfdir}/%{name}/profile.d
-%config %{_sysconfdir}/%{name}/profile.d/*
+%config %{_sysconfdir}/%{name}/profile.d/*.conf
 %{_sbindir}/liveinst 
 %{_bindir}/liveinst
 %{_libexecdir}/liveinst-setup.sh
@@ -331,6 +328,14 @@ update-desktop-database &> /dev/null || :
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+* Fri Jul 25 2025 Funda Wang <fundawang@yeah.net> - 36.16.5-49
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC: fix build with gettext 0.26
+- DESC: cleanup duplicate file list
+- DESC: move update-desktop-database into core sub package which contains real desktop file
+
 * Sun Mar 16 2025 yueyuankun <yueyuankun@kylinos.cn> - 36.16.5-48
 - Type:update
 - ID:NA
@@ -355,7 +360,7 @@ update-desktop-database &> /dev/null || :
 - SUG:NA
 - DESC: Fix duplicate alt-D accelerator on root account screen
 
-* Wed Dec 05 2024 sunhai <sunhai10@huawei.com> - 36.16.5-44
+* Thu Dec 05 2024 sunhai <sunhai10@huawei.com> - 36.16.5-44
 - Type:bugfix
 - ID:NA
 - SUG:NA