diff --git a/gnome-font-viewer.spec b/gnome-font-viewer.spec
index 1c9d9a9..521a3ab 100644
--- a/gnome-font-viewer.spec
+++ b/gnome-font-viewer.spec
@@ -10,12 +10,17 @@ License:        GPLv2+
 URL:            http://www.gnome.org/gnome-3/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gnome-font-viewer/%{release_version}/%{name}-%{version}.tar.xz
 
-BuildRequires:  gnome-desktop3-devel
+BuildRequires:  meson >= 0.40.1
+BuildRequires:  gcc
+BuildRequires:  pkgconfig(glib-2.0) >= 2.35.1
+BuildRequires:  pkgconfig(gtk+-3.0) >= 3.20.0
+BuildRequires:  pkgconfig(harfbuzz) >= 0.9.9
+BuildRequires:  pkgconfig(fontconfig)
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(gnome-desktop-3.0)
 BuildRequires:  gettext
-BuildRequires:  gtk3-devel
-BuildRequires:  desktop-file-utils
-BuildRequires:  libappstream-glib
-BuildRequires:  meson
+BuildRequires:  %{_bindir}/desktop-file-validate
+BuildRequires:  %{_bindir}/appstream-util
 
 %description
 Use gnome-font-viewer, the Font Viewer, to preview fonts and display
@@ -35,13 +40,8 @@ name, style, type, size, version and copyright of the font.
 %find_lang %{name} --with-gnome
 
 %check
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.font-viewer.desktop
-
-%post
-update-desktop-database &> /dev/null || :
-
-%postun
-update-desktop-database &> /dev/null || :
+desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.font-viewer.desktop
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.gnome.font-viewer.appdata.xml
 
 %files -f %{name}.lang
 %license COPYING