From 26330aa26884cb35ecd7d21d203a550399be4bed47f98866531380430c18eb50 Mon Sep 17 00:00:00 2001
From: David Sterba <dsterba@suse.com>
Date: Wed, 29 Oct 2014 16:47:07 +0000
Subject: [PATCH] Accepting request 258826 from
 home:dsterba:branches:filesystems

OBS-URL: https://build.opensuse.org/request/show/258826
OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsmaintenance?expand=0&rev=5
---
 btrfsmaintenance-0.1.tar.bz2 |  4 ++--
 btrfsmaintenance.changes     | 12 ++++++++++
 btrfsmaintenance.spec        | 44 ++++++++++++++++++++----------------
 3 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/btrfsmaintenance-0.1.tar.bz2 b/btrfsmaintenance-0.1.tar.bz2
index dd357aa..6e76d54 100644
--- a/btrfsmaintenance-0.1.tar.bz2
+++ b/btrfsmaintenance-0.1.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c990c2dea18aadc4f120b975ab0e41a6f01e643efe553c1598e6443dc2a9a35
-size 3621
+oid sha256:6a9d6d140da190db62806764ad61559acfecaf6a93aad52aef47098c195e11d9
+size 10623
diff --git a/btrfsmaintenance.changes b/btrfsmaintenance.changes
index 46aac0a..f9ea148 100644
--- a/btrfsmaintenance.changes
+++ b/btrfsmaintenance.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Oct 29 00:00:00 CET 2014 - dsterba@suse.cz
+
+- add COPYING, README.md
+- add config option to specify log target (stdout, or journal)
+
+-------------------------------------------------------------------
+Thu Oct  9 18:33:44 CEST 2014 - dsterba@suse.cz
+
+- clean spec
+- add Url tag
+
 -------------------------------------------------------------------
 Thu Oct  9 16:47:46 CEST 2014 - dsterba@suse.cz
 
diff --git a/btrfsmaintenance.spec b/btrfsmaintenance.spec
index 82700f8..b45f3b2 100644
--- a/btrfsmaintenance.spec
+++ b/btrfsmaintenance.spec
@@ -22,20 +22,21 @@ Release:        0
 Summary:        Scripts for btrfs periodic maintenance tasks
 License:        GPL-2.0
 Group:          System/Base
+Url:            https://github.com/kdave/btrfsmaintenance
 Source0:        %{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildArch:      noarch
-Recommends:     cron
 Requires:       zypp-plugin-python
 Requires:       libzypp(plugin:commit)
+Recommends:     cron
+Supplements:    btrfsprogs
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
+%{?systemd_requires}
 %if 0%{?suse_version} >= 1210
 BuildRequires:  systemd
 %endif
-%{?systemd_requires}
-Supplements:    btrfsprogs
 
 %description
-Scripts for btrfs maintenance taks like periodic scrub, balance, trim or defrag
+Scripts for btrfs maintenance tasks like periodic scrub, balance, trim or defrag
 on selected mountpoints or directories.
 
 %prep
@@ -49,22 +50,22 @@ mkdir -p %{buildroot}%{_sysconfdir}/cron.daily/
 mkdir -p %{buildroot}%{_sysconfdir}/cron.weekly/
 mkdir -p %{buildroot}%{_sysconfdir}/cron.monthly/
 
-install -m 755 -d %{buildroot}/usr/share/%{name}
-install -m 755 btrfs-defrag.sh %{buildroot}/usr/share/%{name}
-install -m 755 btrfs-balance.sh %{buildroot}/usr/share/%{name}
-install -m 755 btrfs-scrub.sh %{buildroot}/usr/share/%{name}
-install -m 755 btrfs-trim.sh %{buildroot}/usr/share/%{name}
-install -m 755 btrfsmaintenance-refresh-cron.sh %{buildroot}/usr/share/%{name}
+install -m 755 -d %{buildroot}%{_datadir}/%{name}
+install -m 755 btrfs-defrag.sh %{buildroot}%{_datadir}/%{name}
+install -m 755 btrfs-balance.sh %{buildroot}%{_datadir}/%{name}
+install -m 755 btrfs-scrub.sh %{buildroot}%{_datadir}/%{name}
+install -m 755 btrfs-trim.sh %{buildroot}%{_datadir}/%{name}
+install -m 755 btrfsmaintenance-refresh-cron.sh %{buildroot}%{_datadir}/%{name}
 
 %if 0%{?suse_version} >= 1210
 install -m 755 -d %{buildroot}%{_unitdir}
 install -m 644 -D btrfsmaintenance-refresh.service %{buildroot}%{_unitdir}
 install -m 755 -d %{buildroot}%{_sbindir}
-ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcbtrfsmaintenance-refresh
+ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcbtrfsmaintenance-refresh
 %else
 # just a hack, but sufficient
-install -m 755 -d %{buildroot}/etc/cron.hourly
-ln -s /usr/share/%{name}/btrfsmaintenance-refresh-cron.sh %{buildroot}/etc/cron.hourly/
+install -m 755 -d %{buildroot}%{_sysconfdir}/cron.hourly
+ln -s %{_datadir}/%{name}/btrfsmaintenance-refresh-cron.sh %{buildroot}%{_sysconfdir}/cron.hourly/
 %endif
 
 install -m 755 -d %{buildroot}/usr/lib/zypp/plugins/commit
@@ -80,27 +81,30 @@ install -m 644 -D sysconfig.btrfsmaintenance %{buildroot}%{_localstatedir}/adm/f
 %endif
 
 %if 0%{?suse_version} >= 1210
+
 %pre
 %service_add_pre btrfsmaintenance-refresh.service
 
 %preun
 %service_del_preun btrfsmaintenance-refresh.service
-/usr/share/%{name}/btrfsmaintenance-refresh-cron.sh uninstall
+%{_datadir}/%{name}/btrfsmaintenance-refresh-cron.sh uninstall
 
 %postun
 %service_del_postun btrfsmaintenance-refresh.service
 %endif
 
 %if 0%{?suse_version} < 1210
+
 %preun
-/usr/share/%{name}/btrfsmaintenance-refresh-cron.sh uninstall
+%{_datadir}/%{name}/btrfsmaintenance-refresh-cron.sh uninstall
 %endif
 
 %files
 %defattr(-,root,root)
+%doc COPYING README.md
 %{_localstatedir}/adm/fillup-templates/sysconfig.btrfsmaintenance
-%dir /usr/share/%{name}
-/usr/share/%{name}/*
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/*
 %dir /usr/lib/zypp/
 %dir /usr/lib/zypp/plugins
 %dir /usr/lib/zypp/plugins/commit
@@ -110,7 +114,7 @@ install -m 644 -D sysconfig.btrfsmaintenance %{buildroot}%{_localstatedir}/adm/f
 %{_unitdir}/btrfsmaintenance-refresh.service
 %{_sbindir}/rcbtrfsmaintenance-refresh
 %else
-/etc/cron.hourly/btrfsmaintenance-refresh-cron.sh
+%{_sysconfdir}/cron.hourly/btrfsmaintenance-refresh-cron.sh
 %endif
 
 %changelog