diff --git a/0001-fix-shebangs.patch b/0001-fix-shebangs.patch deleted file mode 100644 index 532e875..0000000 --- a/0001-fix-shebangs.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 9a886f57d1c5b1adce78b33aac21b71d14e75feb Mon Sep 17 00:00:00 2001 -From: leigh123linux -Date: Thu, 11 Jan 2018 23:30:59 +0000 -Subject: [PATCH] fix shebangs - ---- - usr/bin/blueberry | 2 +- - usr/bin/blueberry-tray | 2 +- - usr/lib/blueberry/BlueberrySettingsWidgets.py | 4 ++-- - usr/lib/blueberry/blueberry-tray.py | 2 +- - usr/lib/blueberry/blueberry.py | 2 +- - usr/lib/blueberry/rfkillMagic.py | 1 + - usr/lib/blueberry/safechild | 2 +- - 7 files changed, 8 insertions(+), 7 deletions(-) - -diff --git a/usr/bin/blueberry b/usr/bin/blueberry -index d3d4f5b..813e33a 100755 ---- a/usr/bin/blueberry -+++ b/usr/bin/blueberry -@@ -1,4 +1,4 @@ --#!/usr/bin/python3 -+#!/usr/bin/python2 - - import os - os.system("/usr/lib/blueberry/blueberry.py") -diff --git a/usr/bin/blueberry-tray b/usr/bin/blueberry-tray -index 874df69..f96a5c6 100755 ---- a/usr/bin/blueberry-tray -+++ b/usr/bin/blueberry-tray -@@ -1,4 +1,4 @@ --#!/usr/bin/python3 -+#!/usr/bin/python2 - - import os - os.system("/usr/lib/blueberry/blueberry-tray.py") -diff --git a/usr/lib/blueberry/BlueberrySettingsWidgets.py b/usr/lib/blueberry/BlueberrySettingsWidgets.py -index 8d92fbc..e805e87 100644 ---- a/usr/lib/blueberry/BlueberrySettingsWidgets.py -+++ b/usr/lib/blueberry/BlueberrySettingsWidgets.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python2 -+#!/usr/bin/python2 - - import gi - gi.require_version('Gtk', '3.0') -@@ -107,4 +107,4 @@ class SettingsRow(Gtk.ListBoxRow): - - def show_alternative_widget(self): - if self.alternative_widget is not None: -- self.stack.set_visible_child(self.alternative_widget) -\ No newline at end of file -+ self.stack.set_visible_child(self.alternative_widget) -diff --git a/usr/lib/blueberry/blueberry-tray.py b/usr/lib/blueberry/blueberry-tray.py -index 6a2a1f1..75ab919 100755 ---- a/usr/lib/blueberry/blueberry-tray.py -+++ b/usr/lib/blueberry/blueberry-tray.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python2 -+#!/usr/bin/python2 - - import sys - import gettext -diff --git a/usr/lib/blueberry/blueberry.py b/usr/lib/blueberry/blueberry.py -index 99d7a71..261463c 100755 ---- a/usr/lib/blueberry/blueberry.py -+++ b/usr/lib/blueberry/blueberry.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python2 -+#!/usr/bin/python2 - - import sys, os, commands - import gettext -diff --git a/usr/lib/blueberry/rfkillMagic.py b/usr/lib/blueberry/rfkillMagic.py -index 9ef3be3..aabd60c 100644 ---- a/usr/lib/blueberry/rfkillMagic.py -+++ b/usr/lib/blueberry/rfkillMagic.py -@@ -1,3 +1,4 @@ -+#!/usr/bin/python2 - - import thread - import subprocess -diff --git a/usr/lib/blueberry/safechild b/usr/lib/blueberry/safechild -index 9d6918c..acfd8ad 100755 ---- a/usr/lib/blueberry/safechild -+++ b/usr/lib/blueberry/safechild -@@ -1,4 +1,4 @@ --#!/usr/bin/env python2 -+#!/usr/bin/python2 - - import subprocess - import sys --- -2.15.1 - diff --git a/blueberry.spec b/blueberry.spec index 669bc3b..d33cea2 100644 --- a/blueberry.spec +++ b/blueberry.spec @@ -1,16 +1,14 @@ Name: blueberry Version: 1.1.20 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Bluetooth configuration tool License: GPLv3+ URL: https://github.com/linuxmint/%{name} Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -# Remove the python3 dep -Patch0: 0001-fix-shebangs.patch -Patch1: %{url}/commit/e1b0efa62a097a130a8d5a72c789fb8c1fefa19a.patch#/Fix_PyGIDeprecationWarning_1.patch -Patch2: %{url}/commit/ee6acb86a42f81025704a3e5e53a68decf03640a.patch#/Fix_PyGIDeprecationWarning_2.patch -Patch3: %{url}/commit/87b1f2c2b24439c236c2ded873dedb4bdf33be8c.patch#/Remove_unused_applet_label.patch +Patch0: %{url}/commit/e1b0efa62a097a130a8d5a72c789fb8c1fefa19a.patch#/Fix_PyGIDeprecationWarning_1.patch +Patch1: %{url}/commit/ee6acb86a42f81025704a3e5e53a68decf03640a.patch#/Fix_PyGIDeprecationWarning_2.patch +Patch2: %{url}/commit/87b1f2c2b24439c236c2ded873dedb4bdf33be8c.patch#/Remove_unused_applet_label.patch BuildArch: noarch @@ -64,7 +62,6 @@ do %{__rm} -f ${file}.orig done -%if (0%{?rhel} && 0%{?rhel} >= 7) for f in $(%{__grep} -Rl '#!.*python3') ; do %{__sed} -e 's~#!.*python3~#!/usr/bin/python2~g' < ${f} > ${f}.new /bin/touch -r ${f}.new ${f} @@ -72,7 +69,6 @@ for f in $(%{__grep} -Rl '#!.*python3') ; do %{__mv} -f ${f}.new ${f} %{__chmod} -c ${mode} ${f} done -%endif # (0%%{?rhel} && 0%%{?rhel} >= 7) %build @@ -132,6 +128,9 @@ fi %changelog +* Thu Feb 15 2018 Leigh Scott - 1.1.20-6 +- Do it better + * Thu Feb 15 2018 Leigh Scott - 1.1.20-5 - Add some upstream fixes - Remove the python3 dep