diff --git a/PackageKit.spec b/PackageKit.spec
index c97fbf26f603985432466a9b9fd9b06771236eb7..0f8a33765ae0d2cec96be0c05ebb153d15d3eb1e 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
@@ -1,20 +1,37 @@
 Name:           PackageKit
 Version:        1.2.8
-Release:        3
-License:        GPLv2+ and LGPLv2+
+Release:        4
+License:        GPL-2.0-or-later AND LGPL-2.1-or-later AND FSFAP
 Summary:        Package management service
 URL:            https://www.freedesktop.org/software/PackageKit/
 Source0:        https://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.tar.xz
 
 Patch6000:      backport-pkcon-Use-appropriate-callbacks-for-client-task-asyn.patch
 Patch6001:      Revert-PkClient-Replace-the-GSimpleAsyncResult-with-.patch
-
-BuildRequires:  glib2-devel xmlto gtk-doc sqlite-devel polkit-devel libtool gtk2-devel gtk3-devel docbook-utils
-BuildRequires:  gnome-doc-utils intltool gettext vala gstreamer1-devel gstreamer1-plugins-base-devel pango-devel
-BuildRequires:  fontconfig-devel libappstream-glib-devel libdnf-devel systemd-devel gobject-introspection-devel bash-completion
-BuildRequires:  meson appstream-devel
-
-Requires:       glib2 libdnf shared-mime-info systemd gobject-introspection crontabs pango
+BuildRequires:  meson >= 0.50
+BuildRequires:  pkgconfig(appstream) >= 0.14.0
+BuildRequires:  pkgconfig(bash-completion) >= 2.0
+BuildRequires:  pkgconfig(fontconfig)
+BuildRequires:  pkgconfig(gio-2.0)
+BuildRequires:  pkgconfig(gio-unix-2.0) >= 2.16.1
+BuildRequires:  pkgconfig(glib-2.0) >= 2.62
+BuildRequires:  pkgconfig(gmodule-2.0) >= 2.16.1
+BuildRequires:  pkgconfig(gobject-2.0)
+BuildRequires:  pkgconfig(gobject-introspection-1.0)
+BuildRequires:  pkgconfig(gstreamer-1.0)
+BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0)
+BuildRequires:  pkgconfig(gtk+-3.0) >= 3.0.0
+BuildRequires:  pkgconfig(libdnf) >= 0.43.1
+BuildRequires:  pkgconfig(libsystemd) >= 213
+BuildRequires:  pkgconfig(pangoft2)
+BuildRequires:  pkgconfig(polkit-gobject-1) >= 0.98
+BuildRequires:  pkgconfig(rpm)
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  gtk-doc
+BuildRequires:  vala
+BuildRequires:  /usr/bin/msgfmt
+
+Requires:       crontabs
 
 Obsoletes:      PackageKit-udev-helper < %{version}-%{release}
 Obsoletes:      udev-packagekit < %{version}-%{release}
@@ -45,6 +62,7 @@ Obsoletes:      PackageKit-cron
 Provides:       PackageKit-cron
 Obsoletes:      codeina < 0.10.1-10
 Provides:       codeina = 0.10.1-10
+Conflicts:      %{name}-help < %{version}-%{release}
 
 %description
 PackageKit is a D-Bus abstraction layer that allows the session user
@@ -59,12 +77,20 @@ Obsoletes:      PackageKit-glib-devel < %{version}-%{release}
 Provides:       PackageKit-glib-devel = %{version}-%{release}
 Obsoletes:      PackageKit-docs < %{version}-%{release}
 Provides:       PackageKit-docs = %{version}-%{release}
-Obsoletes:      PackageKit-gtk3-module
-Provides:       PackageKit-gtk3-module
 
 %description    devel
 headers and libraries for PackageKit.
 
+%package gtk3-module
+Summary: Install fonts automatically using PackageKit
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Conflicts: %{name}-devel < %{version}-%{release}
+Supplements: (gtk3 and %{name})
+
+%description gtk3-module
+The PackageKit GTK3+ module allows any Pango application to install
+fonts from configured repositories using PackageKit.
+
 %package_help
 
 %package        command-not-found
@@ -119,7 +145,6 @@ systemctl disable packagekit-offline-update.service > /dev/null 2>&1 || :
 %config(noreplace) %{_sysconfdir}/PackageKit/Vendor.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/packagekit-background
 %config %{_sysconfdir}/cron.daily/packagekit-background.cron
-##%config %{_sysconfdir}/dbus-1/system.d/*
 %{_metainfodir}/org.freedesktop.packagekit.metainfo.xml
 %{_libexecdir}/packagekitd
 %{_libexecdir}/packagekit-direct
@@ -129,9 +154,7 @@ systemctl disable packagekit-offline-update.service > /dev/null 2>&1 || :
 %{_bindir}/pk*
 %{_libdir}/*packagekit-glib2.so.*
 %{_libdir}/packagekit-backend/libpk_backend_*.so
-%{_libdir}/packagekit-backend/libpk_backend_test_*.so
 %{_libdir}/girepository-1.0/PackageKitGlib-1.0.typelib
-%{_datadir}/locale/*
 %{_datadir}/PackageKit/helpers/test_spawn/*
 %{_datadir}/polkit-1/*/*
 %{_datadir}/PackageKit/pk-upgrade-distro.sh
@@ -143,35 +166,37 @@ systemctl disable packagekit-offline-update.service > /dev/null 2>&1 || :
 %{_unitdir}/system-update.target.wants/
 %{python3_sitelib}/dnf-plugins/
 %{_libexecdir}/packagekit-dnf-refresh-repo
+%{_datadir}/dbus-1/interfaces/*.xml
 %{_datadir}/dbus-1/system.d/org.freedesktop.PackageKit.conf
 %{_datadir}/vala/vapi/packagekit-glib2.deps
 
+%files gtk3-module
+%{_libdir}/gtk-3.0/modules/*.so
+%{_libdir}/gnome-settings-daemon-3.0/gtk-modules/*.desktop
 
 %files devel
-%defattr(-,root,root)
 %{_libdir}/*.so
-##%{_libdir}/gtk-2.0/modules/*.so
-%{_libdir}/gtk-3.0/modules/*.so
-%{_libdir}/gnome-settings-daemon-3.0/gtk-modules/*.desktop
 %{_libdir}/pkgconfig/*.pc
-%{_includedir}/PackageKit/packagekit-glib*/*.h
+%{_includedir}/PackageKit
 %{_datadir}/gir-1.0/PackageKitGlib-1.0.gir
 %{_datadir}/vala/vapi/packagekit-glib2.vapi
 
 %files help
-%defattr(-,root,root)
 %doc NEWS README
-%{_datadir}/man/man1/*.1.gz
-%{_datadir}/gtk-doc/html/PackageKit
-%{_datadir}/dbus-1/interfaces/*.xml
+%{_mandir}/man1/*
+%doc %{_datadir}/gtk-doc/html/PackageKit
 
 %files command-not-found
-%defattr(-,root,root)
 %{_libexecdir}/pk-command-not-found
 %{_sysconfdir}/profile.d/*
 %config(noreplace) %{_sysconfdir}/PackageKit/CommandNotFound.conf
 
 %changelog
+* Tue Jul 29 2025 Funda Wang <fundawang@yeah.net> - 1.2.8-4
+- move dbus interface to main package
+- split out gtk module from devel sub package
+- cleanup buildrequires
+
 * Fri Aug 23 2024 lingsheng <lingsheng1@h-partners.com> - 1.2.8-3
 - Type: bugfix
 - ID: NA