Remove unnecessary arch-specific conditional for snap subpackage
This commit is contained in:
parent
3f39f16fb5
commit
8844a1785e
@ -9,19 +9,12 @@
|
|||||||
%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: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
Summary: A software center for GNOME
|
Summary: A software center for GNOME
|
||||||
|
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
@ -53,10 +46,8 @@ 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: liboauth-devel
|
||||||
BuildRequires: snapd-glib-devel
|
BuildRequires: snapd-glib-devel
|
||||||
%endif
|
|
||||||
|
|
||||||
Requires: appstream-data
|
Requires: appstream-data
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
@ -101,7 +92,6 @@ 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
|
%package snap
|
||||||
Summary: Support for Ubuntu Snap packages
|
Summary: Support for Ubuntu Snap packages
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||||
@ -110,7 +100,6 @@ Supplements: (gnome-software%{?_isa} and snapd%{?_isa})
|
|||||||
|
|
||||||
%description snap
|
%description snap
|
||||||
Adds support for Snap packages from the Snap store.
|
Adds support for Snap packages from the Snap store.
|
||||||
%endif
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1
|
%autosetup -p1
|
||||||
@ -258,6 +247,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
|
||||||
|
* 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
|
* Tue Jun 27 2017 Neal Gompa <ngompa13@gmail.com> - 3.25.3-3
|
||||||
- Ensure snap subpackage is installed if snapd is installed
|
- Ensure snap subpackage is installed if snapd is installed
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user