From 7b9ac276ad4cf50cc41f641a55ea3fb7bf818d4f Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 28 Jul 2016 14:58:53 +0100 Subject: [PATCH] Allow building without PackageKit for the atomic workstation --- gnome-software.spec | 62 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 59 insertions(+), 3 deletions(-) diff --git a/gnome-software.spec b/gnome-software.spec index 032ddfd..e004c37 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -9,10 +9,13 @@ %global fwupd_version 0.6.3 %global flatpak_version 0.5.2 +# this should be set using "--without packagekit" when atomic +%bcond_without packagekit + Summary: A software center for GNOME Name: gnome-software Version: 3.21.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: https://wiki.gnome.org/Apps/Software @@ -32,7 +35,9 @@ BuildRequires: gtkspell3-devel BuildRequires: json-glib-devel >= %{json_glib_version} BuildRequires: libappstream-glib-devel >= %{appstream_glib_version} BuildRequires: libsoup-devel +%if %{with packagekit} BuildRequires: PackageKit-glib-devel >= %{packagekit_version} +%endif BuildRequires: polkit-devel BuildRequires: libsecret-devel BuildRequires: flatpak-devel >= %{flatpak_version} @@ -75,7 +80,14 @@ the source tree. Most users do not need this subpackage installed. %setup -q %build -%configure --disable-static --disable-silent-rules +%configure \ + --disable-static \ +%if %{with packagekit} + --enable-packagekit \ +%else + --disable-packagekit \ +%endif + --disable-silent-rules make %{?_smp_mflags} %install @@ -125,9 +137,50 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/gnome-software/featured-*.svg %{_datadir}/gnome-software/featured-*.jpg %dir %{_libdir}/gs-plugins-%{gs_plugin_version} -%{_libdir}/gs-plugins-%{gs_plugin_version}/*.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_appstream.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_desktop-categories.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_desktop-menu-path.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_dpkg.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_dummy.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_epiphany.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_fedora-distro-upgrades.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_fedora-tagger-usage.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_flatpak-system.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_flatpak-user.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_fwupd.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_hardcoded-blacklist.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_hardcoded-featured.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_hardcoded-popular.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_icons.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_key-colors.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_odrs.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 +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-origin.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-proxy.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-refine.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-refresh.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-upgrade.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 +%{_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_snap.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 +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_ubuntuone.so %{_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 @@ -140,6 +193,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/gtk-doc/html/gnome-software %changelog +* Thu Jul 28 2016 Richard Hughes - 3.21.4-2 +- Allow building without PackageKit for the atomic workstation. + * Mon Jul 18 2016 Richard Hughes - 3.21.4-1 - Update to 3.21.4