From 666f694d350a3a25bbd540b82965e718a4d9208c2666199b819e02836a4c4bca Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Tue, 15 May 2018 17:45:55 +0000 Subject: [PATCH] Accepting request 596371 from home:LPechacek:branches:filesystems - In openSUSE the defrag plugin must explicitly refer to Python 3. (bsc#1070322) - Added patch: python3-support-bsc1070322.diff OBS-URL: https://build.opensuse.org/request/show/596371 OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsmaintenance?expand=0&rev=40 --- btrfsmaintenance.changes | 7 +++++++ btrfsmaintenance.spec | 2 ++ python3-support-bsc1070322.diff | 12 ++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 python3-support-bsc1070322.diff diff --git a/btrfsmaintenance.changes b/btrfsmaintenance.changes index c74f78a..3f12695 100644 --- a/btrfsmaintenance.changes +++ b/btrfsmaintenance.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 13 13:48:40 UTC 2018 - lpechacek@suse.com + +- In openSUSE the defrag plugin must explicitly refer to Python 3. + (bsc#1070322) +- Added patch: python3-support-bsc1070322.diff + ------------------------------------------------------------------- Thu Mar 15 00:00:00 CET 2018 - dsterba@suse.cz diff --git a/btrfsmaintenance.spec b/btrfsmaintenance.spec index 952080f..6ed4ce0 100644 --- a/btrfsmaintenance.spec +++ b/btrfsmaintenance.spec @@ -29,6 +29,7 @@ License: GPL-2.0-only Group: System/Base Url: https://github.com/kdave/btrfsmaintenance Source0: %{name}-%{version}.tar.bz2 +Patch0: python3-support-bsc1070322.diff BuildRequires: systemd Requires: btrfsprogs Requires: python3-zypp-plugin @@ -44,6 +45,7 @@ for snapper). %prep %setup -q +%patch0 -p1 %build diff --git a/python3-support-bsc1070322.diff b/python3-support-bsc1070322.diff new file mode 100644 index 0000000..0d27a1c --- /dev/null +++ b/python3-support-bsc1070322.diff @@ -0,0 +1,12 @@ +As per explanation in https://bugzilla.suse.com/show_bug.cgi?id=1070322#c10 +python3 must be called. +Index: btrfsmaintenance-0.4.1/btrfs-defrag-plugin.py +=================================================================== +--- btrfsmaintenance-0.4.1.orig/btrfs-defrag-plugin.py ++++ btrfsmaintenance-0.4.1/btrfs-defrag-plugin.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + + # This plugin defragments rpm files after update. + #