Remove unnecessary arch-specific conditional for snap subpackage

This commit is contained in:
Neal Gompa 2017-06-28 10:27:35 -04:00
parent 3f39f16fb5
commit 8844a1785e

View File

@ -9,19 +9,12 @@
%global fwupd_version 0.9.3
%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
%bcond_without packagekit
Name: gnome-software
Version: 3.25.3
Release: 3%{?dist}
Release: 4%{?dist}
Summary: A software center for GNOME
License: GPLv2+
@ -53,10 +46,8 @@ BuildRequires: ostree-devel
BuildRequires: rpm-devel
BuildRequires: libgudev1-devel
BuildRequires: valgrind-devel
%ifarch %{snap_archs}
BuildRequires: liboauth-devel
BuildRequires: snapd-glib-devel
%endif
Requires: appstream-data
%if 0%{?fedora}
@ -101,7 +92,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description editor
Editor for designing banners for GNOME Software.
%ifarch %{snap_archs}
%package snap
Summary: Support for Ubuntu Snap packages
Requires: %{name}%{?_isa} = %{version}-%{release}
@ -110,7 +100,6 @@ Supplements: (gnome-software%{?_isa} and snapd%{?_isa})
%description snap
Adds support for Snap packages from the Snap store.
%endif
%prep
%autosetup -p1
@ -258,6 +247,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%{_mandir}/man1/gnome-software-editor.1*
%changelog
* Wed Jun 28 2017 Neal Gompa <ngompa13@gmail.com> - 3.25.3-4
- Remove unnecessary arch-specific conditional for snap subpackage
* Tue Jun 27 2017 Neal Gompa <ngompa13@gmail.com> - 3.25.3-3
- Ensure snap subpackage is installed if snapd is installed