From d2c0a6431e436b98dc9bbad79e0487e6e34b4c62 Mon Sep 17 00:00:00 2001 From: David King Date: Jun 16 2022 13:12:44 +0000 Subject: Use pkgconfig for BuildRequires https://fedoraproject.org/wiki/Packaging:PkgConfigBuildRequires --- diff --git a/gnome-software.spec b/gnome-software.spec index 102f7d1..45d45ed 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -1,13 +1,13 @@ %global appstream_version 0.14.0 -%global libadwaita_version 1.0.1 -%global libxmlb_version 0.1.7 +%global flatpak_version 1.5.1 +%global fwupd_version 1.3.3 %global glib2_version 2.61.1 %global gtk4_version 4.4.0 %global json_glib_version 1.2.0 +%global libadwaita_version 1.0.1 %global libsoup_version 2.52.0 +%global libxmlb_version 0.1.7 %global packagekit_version 1.1.1 -%global fwupd_version 1.3.3 -%global flatpak_version 1.5.1 # this is not a library version %define gs_plugin_version 18 @@ -29,36 +29,36 @@ Patch01: 0001-crash-with-broken-theme.patch Patch02: 0002-shell-setup-order.patch Patch03: 0003-crash-under-gs-flatpak-refine-app-unlocked.patch -BuildRequires: appstream-devel >= %{appstream_version} +BuildRequires: docbook-style-xsl +BuildRequires: desktop-file-utils BuildRequires: gcc BuildRequires: gettext +BuildRequires: gtk-doc BuildRequires: libxslt -BuildRequires: docbook-style-xsl -BuildRequires: desktop-file-utils -BuildRequires: fwupd-devel >= %{fwupd_version} -BuildRequires: glib2-devel >= %{glib2_version} -BuildRequires: gnome-online-accounts-devel -BuildRequires: gsettings-desktop-schemas-devel -BuildRequires: gspell-devel +BuildRequires: meson +BuildRequires: pkgconfig(appstream) >= %{appstream_version} +BuildRequires: pkgconfig(flatpak) >= %{flatpak_version} +BuildRequires: pkgconfig(fwupd) >= %{fwupd_version} +BuildRequires: pkgconfig(gdk-pixbuf-2.0) +BuildRequires: pkgconfig(gio-unix-2.0) >= %{glib2_version} +BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} +BuildRequires: pkgconfig(gmodule-2.0) >= %{glib2_version} +BuildRequires: pkgconfig(gsettings-desktop-schemas) BuildRequires: pkgconfig(gtk4) >= %{gtk4_version} -BuildRequires: gtk-doc -BuildRequires: json-glib-devel >= %{json_glib_version} -BuildRequires: libdnf-devel +BuildRequires: pkgconfig(gudev-1.0) +BuildRequires: pkgconfig(json-glib-1.0) >= %{json_glib_version} BuildRequires: pkgconfig(libadwaita-1) >= %{libadwaita_version} -BuildRequires: libsoup-devel -BuildRequires: libxmlb-devel >= %{libxmlb_version} -BuildRequires: malcontent-devel -BuildRequires: malcontent-ui-devel -BuildRequires: meson -BuildRequires: PackageKit-glib-devel >= %{packagekit_version} -BuildRequires: polkit-devel -BuildRequires: flatpak-devel >= %{flatpak_version} -BuildRequires: ostree-devel -BuildRequires: rpm-devel -BuildRequires: rpm-ostree-devel -BuildRequires: libgudev1-devel -BuildRequires: sysprof-capture-devel -BuildRequires: valgrind-devel +BuildRequires: pkgconfig(libdnf) +BuildRequires: pkgconfig(libsoup-2.4) +BuildRequires: pkgconfig(malcontent-0) +BuildRequires: pkgconfig(ostree-1) +BuildRequires: pkgconfig(packagekit-glib2) >= %{packagekit_version} +BuildRequires: pkgconfig(polkit-gobject-1) +BuildRequires: pkgconfig(rpm) +BuildRequires: pkgconfig(rpm-ostree-1) +BuildRequires: pkgconfig(sysprof-capture-4) +BuildRequires: pkgconfig(valgrind) +BuildRequires: pkgconfig(xmlb) >= %{libxmlb_version} Requires: appstream-data Requires: appstream%{?_isa} >= %{appstream_version} @@ -204,6 +204,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %changelog * Thu Jun 16 2022 David King - 42.2-3 - Filter private libraries from Provides +- Use pkgconfig for BuildRequires * Mon Jun 13 2022 Milan Crha - 42.2-2 - Add patch for crash under gs_flatpak_refine_app_unlocked()