Enable the snap subpackage

This commit is contained in:
Richard Hughes 2017-06-24 07:55:03 +01:00
parent d21eebf3a4
commit 78ecb2d712

View File

@ -9,12 +9,19 @@
%global fwupd_version 0.9.3 %global fwupd_version 0.9.3
%global flatpak_version 0.8.0 %global flatpak_version 0.8.0
# verified arches from snapd upstream
%global snap_archs %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
%ifarch %{snap_archs}
%global have_snap 1
%endif
# this should be set using "--without packagekit" when atomic # this should be set using "--without packagekit" when atomic
%bcond_without packagekit %bcond_without packagekit
Name: gnome-software Name: gnome-software
Version: 3.25.3 Version: 3.25.3
Release: 1%{?dist} Release: 2%{?dist}
Summary: A software center for GNOME Summary: A software center for GNOME
License: GPLv2+ License: GPLv2+
@ -46,6 +53,10 @@ BuildRequires: ostree-devel
BuildRequires: rpm-devel BuildRequires: rpm-devel
BuildRequires: libgudev1-devel BuildRequires: libgudev1-devel
BuildRequires: valgrind-devel BuildRequires: valgrind-devel
%ifarch %{snap_archs}
BuildRequires: liboauth-devel
BuildRequires: snapd-glib-devel
%endif
Requires: appstream-data Requires: appstream-data
%if 0%{?fedora} %if 0%{?fedora}
@ -90,11 +101,26 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description editor %description editor
Editor for designing banners for GNOME Software. Editor for designing banners for GNOME Software.
%ifarch %{snap_archs}
%package snap
Summary: Support for Ubuntu Snap packages
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: snapd-login-service
%description snap
Adds support for Snap packages from the Ubuntu store.
%endif
%prep %prep
%autosetup -p1 %autosetup -p1
%build %build
%meson \ %meson \
%if 0%{?have_snap}
-Denable-snap=true \
%else
-Denable-snap=false \
%endif
-Denable-gudev=true \ -Denable-gudev=true \
%if %{with packagekit} %if %{with packagekit}
-Denable-packagekit=true \ -Denable-packagekit=true \
@ -212,6 +238,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%{_libexecdir}/gnome-software-cmd %{_libexecdir}/gnome-software-cmd
%{_libexecdir}/gnome-software-restarter %{_libexecdir}/gnome-software-restarter
%ifarch %{snap_archs}
%files snap
%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_snap.so
%{_datadir}/metainfo/org.gnome.Software.Plugin.Snap.metainfo.xml
%endif
%files devel %files devel
%{_libdir}/pkgconfig/gnome-software.pc %{_libdir}/pkgconfig/gnome-software.pc
%dir %{_includedir}/gnome-software %dir %{_includedir}/gnome-software
@ -225,6 +257,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%{_mandir}/man1/gnome-software-editor.1* %{_mandir}/man1/gnome-software-editor.1*
%changelog %changelog
* Fri Jun 23 2017 Richard Hughes <rhughes@redhat.com> - 3.24.3-2
- Enable the snap subpackage
* Fri Jun 23 2017 Kalev Lember <klember@redhat.com> - 3.25.3-1 * Fri Jun 23 2017 Kalev Lember <klember@redhat.com> - 3.25.3-1
- Update to 3.25.3 - Update to 3.25.3
- Switch to the meson build system - Switch to the meson build system