From 7920979859c9c8e6d3bf4249319046db565dfc1c20163d4bdffa4eade1a7826e Mon Sep 17 00:00:00 2001 From: David Sterba Date: Tue, 18 Nov 2014 09:22:35 +0000 Subject: [PATCH 1/2] Accepting request 261734 from home:Ledest:bashisms fix bashism in btrfsmaintenance-refresh-cron.sh script OBS-URL: https://build.opensuse.org/request/show/261734 OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsmaintenance?expand=0&rev=7 --- btrfsmaintenance-0.1-fix-bashisms.patch | 12 ++++++++++++ btrfsmaintenance.changes | 7 +++++++ btrfsmaintenance.spec | 2 ++ 3 files changed, 21 insertions(+) create mode 100644 btrfsmaintenance-0.1-fix-bashisms.patch diff --git a/btrfsmaintenance-0.1-fix-bashisms.patch b/btrfsmaintenance-0.1-fix-bashisms.patch new file mode 100644 index 0000000..f99257a --- /dev/null +++ b/btrfsmaintenance-0.1-fix-bashisms.patch @@ -0,0 +1,12 @@ +diff -Ndur btrfsmaintenance-0.1/btrfsmaintenance-refresh-cron.sh btrfsmaintenance-0.1-fix-bashisms/btrfsmaintenance-refresh-cron.sh +--- btrfsmaintenance-0.1/btrfsmaintenance-refresh-cron.sh 2014-10-29 18:36:45.000000000 +0200 ++++ btrfsmaintenance-0.1-fix-bashisms/btrfsmaintenance-refresh-cron.sh 2014-11-15 06:52:30.882955935 +0200 +@@ -31,7 +31,7 @@ + . /etc/sysconfig/btrfsmaintenance + fi + +-function refresh_period() { ++refresh_period() { + EXPECTED="$1" + SCRIPT="$2" + echo "Refresh script $SCRIPT for $EXPECTED" diff --git a/btrfsmaintenance.changes b/btrfsmaintenance.changes index f9ea148..614b59c 100644 --- a/btrfsmaintenance.changes +++ b/btrfsmaintenance.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Nov 15 04:55:00 UTC 2014 - Led + +- fix bashism in btrfsmaintenance-refresh-cron.sh script +- add patches: + * btrfsmaintenance-0.1-fix-bashisms.patch + ------------------------------------------------------------------- Wed Oct 29 00:00:00 CET 2014 - dsterba@suse.cz diff --git a/btrfsmaintenance.spec b/btrfsmaintenance.spec index b45f3b2..366b6ba 100644 --- a/btrfsmaintenance.spec +++ b/btrfsmaintenance.spec @@ -24,6 +24,7 @@ License: GPL-2.0 Group: System/Base Url: https://github.com/kdave/btrfsmaintenance Source0: %{name}-%{version}.tar.bz2 +Patch0: %{name}-0.1-fix-bashisms.patch Requires: zypp-plugin-python Requires: libzypp(plugin:commit) Recommends: cron @@ -41,6 +42,7 @@ on selected mountpoints or directories. %prep %setup -q +%patch0 -p1 %build From c33aea3cc887c6e46b33f912845518205df0cb4b0166672bc24a4197814f91f4 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Wed, 19 Nov 2014 16:40:45 +0000 Subject: [PATCH 2/2] Accepting request 262334 from home:dsterba:branches:filesystems - cron refresh: remove bashism - cron refresh: remove debugging messages - post installation must create the cron links (bsc#904518) - Removed patches: * btrfsmaintenance-0.1-fix-bashisms.patch OBS-URL: https://build.opensuse.org/request/show/262334 OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsmaintenance?expand=0&rev=8 --- btrfsmaintenance-0.1-fix-bashisms.patch | 12 ------------ btrfsmaintenance-0.1.tar.bz2 | 4 ++-- btrfsmaintenance.changes | 9 +++++++++ btrfsmaintenance.spec | 3 +-- 4 files changed, 12 insertions(+), 16 deletions(-) delete mode 100644 btrfsmaintenance-0.1-fix-bashisms.patch diff --git a/btrfsmaintenance-0.1-fix-bashisms.patch b/btrfsmaintenance-0.1-fix-bashisms.patch deleted file mode 100644 index f99257a..0000000 --- a/btrfsmaintenance-0.1-fix-bashisms.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Ndur btrfsmaintenance-0.1/btrfsmaintenance-refresh-cron.sh btrfsmaintenance-0.1-fix-bashisms/btrfsmaintenance-refresh-cron.sh ---- btrfsmaintenance-0.1/btrfsmaintenance-refresh-cron.sh 2014-10-29 18:36:45.000000000 +0200 -+++ btrfsmaintenance-0.1-fix-bashisms/btrfsmaintenance-refresh-cron.sh 2014-11-15 06:52:30.882955935 +0200 -@@ -31,7 +31,7 @@ - . /etc/sysconfig/btrfsmaintenance - fi - --function refresh_period() { -+refresh_period() { - EXPECTED="$1" - SCRIPT="$2" - echo "Refresh script $SCRIPT for $EXPECTED" diff --git a/btrfsmaintenance-0.1.tar.bz2 b/btrfsmaintenance-0.1.tar.bz2 index 6e76d54..d0e8440 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:6a9d6d140da190db62806764ad61559acfecaf6a93aad52aef47098c195e11d9 -size 10623 +oid sha256:03e7fd8264cc2d2eba767043bf171d613bd40a66c30fd654afafb6cd2c67772d +size 10618 diff --git a/btrfsmaintenance.changes b/btrfsmaintenance.changes index 614b59c..6af037d 100644 --- a/btrfsmaintenance.changes +++ b/btrfsmaintenance.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Nov 19 00:00:00 CET 2014 - dsterba@suse.cz + +- cron refresh: remove bashism +- cron refresh: remove debugging messages +- post installation must create the cron links (bsc#904518) +- Removed patches: + * btrfsmaintenance-0.1-fix-bashisms.patch + ------------------------------------------------------------------- Sat Nov 15 04:55:00 UTC 2014 - Led diff --git a/btrfsmaintenance.spec b/btrfsmaintenance.spec index 366b6ba..fe84a06 100644 --- a/btrfsmaintenance.spec +++ b/btrfsmaintenance.spec @@ -24,7 +24,6 @@ License: GPL-2.0 Group: System/Base Url: https://github.com/kdave/btrfsmaintenance Source0: %{name}-%{version}.tar.bz2 -Patch0: %{name}-0.1-fix-bashisms.patch Requires: zypp-plugin-python Requires: libzypp(plugin:commit) Recommends: cron @@ -42,7 +41,6 @@ on selected mountpoints or directories. %prep %setup -q -%patch0 -p1 %build @@ -81,6 +79,7 @@ install -m 644 -D sysconfig.btrfsmaintenance %{buildroot}%{_localstatedir}/adm/f %if 0%{?suse_version} >= 1210 %service_add_post btrfsmaintenance-refresh.service %endif +%{_datadir}/%{name}/btrfsmaintenance-refresh-cron.sh %if 0%{?suse_version} >= 1210