revive on Fedora/s390x and drop some Requires there (#876184)

Fedora rel-eng tools doesn't support per arch excludes, so we need gnome-bluetooth
to fulfil the dependencies. It is listed as required by the Gnome group in comps.
This commit is contained in:
Dan Horák 2012-11-29 15:24:56 +01:00
parent 996a4c8680
commit 01eb9c77bc

View File

@ -1,7 +1,7 @@
Name: gnome-bluetooth Name: gnome-bluetooth
Epoch: 1 Epoch: 1
Version: 3.6.1 Version: 3.6.1
Release: 1%{?dist} Release: 2%{?dist}
Summary: Bluetooth graphical utilities Summary: Bluetooth graphical utilities
Group: Applications/Communications Group: Applications/Communications
@ -10,7 +10,9 @@ URL: http://live.gnome.org/GnomeBluetooth
Source0: http://download.gnome.org/sources/gnome-bluetooth/3.6/gnome-bluetooth-%{version}.tar.xz Source0: http://download.gnome.org/sources/gnome-bluetooth/3.6/gnome-bluetooth-%{version}.tar.xz
Source1: 61-gnome-bluetooth-rfkill.rules Source1: 61-gnome-bluetooth-rfkill.rules
%if 0%{?rhel}
ExcludeArch: s390 s390x ExcludeArch: s390 s390x
%endif
BuildRequires: gtk3-devel >= 3.0 BuildRequires: gtk3-devel >= 3.0
BuildRequires: GConf2-devel BuildRequires: GConf2-devel
@ -30,11 +32,13 @@ Obsoletes: bluez-gnome <= 1.8
# Otherwise we might end up with mismatching version # Otherwise we might end up with mismatching version
Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: gvfs-obexftp
Requires: bluez >= 4.42 Requires: bluez >= 4.42
%ifnarch s390 s390x
Requires: gvfs-obexftp
Requires: obexd Requires: obexd
Requires: desktop-notification-daemon
Requires: pulseaudio-module-bluetooth Requires: pulseaudio-module-bluetooth
%endif
Requires: desktop-notification-daemon
Requires: control-center Requires: control-center
Requires(post): desktop-file-utils Requires(post): desktop-file-utils
@ -177,6 +181,9 @@ fi
%{_datadir}/gtk-doc %{_datadir}/gtk-doc
%changelog %changelog
* Thu Nov 29 2012 Dan Horák <dan[at]danny.cz> - 1:3.6.1-2
- revive on Fedora/s390x, but drop Requires there - it's needed to fulfil compose dependencies
* Thu Nov 15 2012 Kalev Lember <kalevlember@gmail.com> - 1:3.6.1-1 * Thu Nov 15 2012 Kalev Lember <kalevlember@gmail.com> - 1:3.6.1-1
- Update to 3.6.1 - Update to 3.6.1