From 9284691f15074f3ac0cc36c0d9907854b23ead2e Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Feb 07 2018 11:46:52 +0000 Subject: [PATCH 1/2] Update Python 2 dependency declarations to new packaging standards --- diff --git a/blueberry.spec b/blueberry.spec index a545a57..728b7b2 100644 --- a/blueberry.spec +++ b/blueberry.spec @@ -1,6 +1,6 @@ Name: blueberry Version: 1.1.20 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Bluetooth configuration tool License: GPLv3+ @@ -15,12 +15,12 @@ BuildRequires: python2-devel Requires: bluez-obexd Requires: bluez-tools -Requires: dbus-python +Requires: python2-dbus Requires: filesystem Requires: gnome-bluetooth Requires: hicolor-icon-theme -Requires: pygobject3 -Requires: python-setproctitle +Requires: python2-gobject +Requires: python2-setproctitle Requires: rfkill Requires: wmctrl @@ -121,6 +121,10 @@ fi %changelog +* Wed Feb 07 2018 Iryna Shcherbina - 1.1.20-4 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Wed Feb 07 2018 Fedora Release Engineering - 1.1.20-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From c5202d581abac1c83d0b6796a4644c48d5ff4cd2 Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Feb 07 2018 11:46:52 +0000 Subject: [PATCH 2/2] Conditionalize requirements for epel and f26/f27 --- diff --git a/blueberry.spec b/blueberry.spec index 728b7b2..e03c767 100644 --- a/blueberry.spec +++ b/blueberry.spec @@ -15,15 +15,21 @@ BuildRequires: python2-devel Requires: bluez-obexd Requires: bluez-tools -Requires: python2-dbus Requires: filesystem Requires: gnome-bluetooth Requires: hicolor-icon-theme -Requires: python2-gobject -Requires: python2-setproctitle Requires: rfkill Requires: wmctrl +%if (0%{?fedora} && 0%{?fedora} <= 27) || (0%{?rhel} && 0%{?rhel} <= 7) +Requires: dbus-python +Requires: pygobject3 +Requires: python-setproctitle +%else +Requires: python2-dbus +Requires: python2-gobject +Requires: python2-setproctitle +%endif %description %{summary} depending on gnome-bluetooth.