From 375c384ac4cd33857865cff352b56ac2ded26b86 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 8 Jan 2018 21:50:13 +0100 Subject: [PATCH] Drop unused --without packagekit option We do packagekit/rpm-ostree detection at runtime, not at compile time. --- gnome-software.spec | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/gnome-software.spec b/gnome-software.spec index 2855a66..dcced35 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -9,9 +9,6 @@ %global fwupd_version 0.9.7 %global flatpak_version 0.9.4 -# this should be set using "--without packagekit" when atomic -%bcond_without packagekit - Name: gnome-software Version: 3.27.4 Release: 1%{?dist} @@ -36,9 +33,7 @@ BuildRequires: json-glib-devel >= %{json_glib_version} BuildRequires: libappstream-glib-devel >= %{appstream_glib_version} BuildRequires: libsoup-devel BuildRequires: meson -%if %{with packagekit} BuildRequires: PackageKit-glib-devel >= %{packagekit_version} -%endif BuildRequires: polkit-devel BuildRequires: libsecret-devel BuildRequires: flatpak-devel >= %{flatpak_version} @@ -108,11 +103,7 @@ Adds support for Snap packages from the Snap store. %meson \ -Denable-snap=true \ -Denable-gudev=true \ -%if %{with packagekit} -Denable-packagekit=true \ -%else - -Denable-packagekit=false \ -%endif -Denable-external-appstream=false \ -Denable-rpm-ostree=true \ -Denable-tests=false \ @@ -178,7 +169,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_odrs.so %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_os-release.so %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_ostree.so -%if %{with packagekit} %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-history.so %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-local.so %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-offline.so @@ -188,7 +178,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-upgrade.so %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-url-to-app.so %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit.so -%endif %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_provenance-license.so %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_provenance.so %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_repos.so @@ -197,13 +186,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_rpm.so %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_shell-extensions.so %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_steam.so -%if %{with packagekit} %{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_systemd-updates.so -%endif %{_sysconfdir}/xdg/autostart/gnome-software-service.desktop -%if %{with packagekit} %{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service -%endif %{_datadir}/dbus-1/services/org.gnome.Software.service %{_datadir}/gnome-shell/search-providers/org.gnome.Software-search-provider.ini %{_datadir}/glib-2.0/schemas/org.gnome.software.gschema.xml @@ -230,6 +215,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %changelog * Mon Jan 08 2018 Kalev Lember - 3.27.4-1 - Update to 3.27.4 +- Drop unused --without packagekit option * Fri Jan 05 2018 Igor Gnatenko - 3.27.3-2 - Remove obsolete scriptlets