From 97375200044dfe91973804e9d110327291f1d6beb253896d42e8a79c6a43edf5 Mon Sep 17 00:00:00 2001
From: David Sterba <dsterba@suse.com>
Date: Thu, 21 Dec 2017 16:11:23 +0000
Subject: [PATCH] Accepting request 559025 from home:kukuk:branches:filesystems

Since for the openSUSE Community changelogs are more important than
critical bug fixes ... :( :( :(

OBS-URL: https://build.opensuse.org/request/show/559025
OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsmaintenance?expand=0&rev=28
---
 btrfsmaintenance-switch-to-timer.patch | 24 ++++++++++++++++++++++++
 btrfsmaintenance.changes               |  6 ++++++
 btrfsmaintenance.spec                  |  4 +++-
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 btrfsmaintenance-switch-to-timer.patch

diff --git a/btrfsmaintenance-switch-to-timer.patch b/btrfsmaintenance-switch-to-timer.patch
new file mode 100644
index 0000000..7baa0bf
--- /dev/null
+++ b/btrfsmaintenance-switch-to-timer.patch
@@ -0,0 +1,24 @@
+--- btrfsmaintenance-refresh-cron.sh
++++ btrfsmaintenance-refresh-cron.sh	2017/12/17 11:12:22
+@@ -91,6 +91,10 @@
+ 
+ case "$BTRFS_TIMER_IMPLEMENTATION" in
+ 	systemd-timer)
++                # Deinstall cron jobs, don't run it twice.
++                for SCRIPT in btrfs-scrub btrfs-defrag btrfs-balance btrfs-trim; do
++                  refresh_cron uninstall ${SCRIPT}.sh
++                done
+ 		refresh_timer "$BTRFS_SCRUB_PERIOD" btrfs-scrub
+ 		refresh_timer "$BTRFS_DEFRAG_PERIOD" btrfs-defrag
+ 		refresh_timer "$BTRFS_BALANCE_PERIOD" btrfs-balance
+--- btrfsmaintenance-refresh.service
++++ btrfsmaintenance-refresh.service	2017/12/17 11:04:07
+@@ -3,7 +3,7 @@
+ After=local-fs.target
+ 
+ [Service]
+-ExecStart=/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh
++ExecStart=/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer
+ Type=oneshot
+ 
+ [Install]
diff --git a/btrfsmaintenance.changes b/btrfsmaintenance.changes
index a69ab59..18ade6b 100644
--- a/btrfsmaintenance.changes
+++ b/btrfsmaintenance.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Dec 17 12:18:45 CET 2017 - kukuk@suse.de
+
+- Switch default of btrfsmaintenance-refresh.service to systemd-timer, 
+  too (btrfsmaintenance-switch-to-timer.patch) [bsc#1073204]
+
 -------------------------------------------------------------------
 Wed Dec  6 15:55:53 CET 2017 - kukuk@suse.de
 
diff --git a/btrfsmaintenance.spec b/btrfsmaintenance.spec
index aec8d37..651a6fa 100644
--- a/btrfsmaintenance.spec
+++ b/btrfsmaintenance.spec
@@ -23,7 +23,7 @@
 
 Name:           btrfsmaintenance
 Version:        0.3.1
-Release:        10.2
+Release:        0
 Summary:        Scripts for btrfs periodic maintenance tasks
 License:        GPL-2.0
 Group:          System/Base
@@ -32,6 +32,7 @@ Source0:        %{name}-%{version}.tar.bz2
 # PATCH-FIX-OPENSUSE btrfsmaintenance-0.3.1-fix-rpm-db-path.patch -- Fix RPM database path for Tumbleweed
 Patch0:         btrfsmaintenance-0.3.1-fix-rpm-db-path.patch
 Patch1:         pull-request-36.patch
+Patch2:         btrfsmaintenance-switch-to-timer.patch
 Requires:       zypp-plugin-python
 Requires:       libzypp(plugin:commit)
 #Recommends:     cron
@@ -54,6 +55,7 @@ on selected mountpoints or directories.
 %patch0
 %endif
 %patch1 -p1
+%patch2 -p0
 
 %build