[owfs/f21] add two upstream patches fixing systemd unit (RHBZ#1162874)

[Tomasz Torcz]

commit 908a71c43be025884f7a9b279ecc74cecbbc7868
Author: Tomasz Torcz <tomek at pipebreaker.pl>
Date:   Wed Nov 12 18:46:33 2014 +0100

    add two upstream patches fixing systemd unit (RHBZ#1162874)

 ...0002-use-RuntimeDirectory-in-owfs.service.patch |   26 +++++++++++++++++
 ...ghtly-generalize-owfs-the-filesystem-syst.patch |   29 ++++++++++++++++++++
 owfs.spec                                          |   10 ++++++-
 3 files changed, 64 insertions(+), 1 deletions(-)
---
diff --git a/owfs-0002-use-RuntimeDirectory-in-owfs.service.patch b/owfs-0002-use-RuntimeDirectory-in-owfs.service.patch
new file mode 100644
index 0000000..231563f
--- /dev/null
+++ b/owfs-0002-use-RuntimeDirectory-in-owfs.service.patch
@@ -0,0 +1,26 @@
+From c3b9c0d3a383939294b985ef9aec160ff765f321 Mon Sep 17 00:00:00 2001
+From: Tomasz Torcz <tomek at pipebreaker.pl>
+Date: Thu, 16 Oct 2014 16:18:13 +0200
+Subject: [PATCH] use RuntimeDirectory= in owfs.service
+
+  Let systemd create and remove /run/owfs mountpoint.
+This removes need for packagers to provide tmpfiles.d snippet.
+---
+ src/scripts/systemd/owfs.service.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/scripts/systemd/owfs.service.in b/src/scripts/systemd/owfs.service.in
+index 224b525..8fb2f76 100644
+--- a/src/scripts/systemd/owfs.service.in
++++ b/src/scripts/systemd/owfs.service.in
+@@ -5,6 +5,7 @@ Documentation=man:owfs(1)
+ [Service]
+ ExecStart=@bindir@/owfs --server=127.0.0.1 --allow_other /run/owfs
+ ExecStop=/usr/bin/umount /run/owfs
++RuntimeDirectory=owfs
+ 
+ [Install]
+ WantedBy=multi-user.target
+-- 
+1.9.3
+
diff --git a/owfs-0003-fix-and-slightly-generalize-owfs-the-filesystem-syst.patch b/owfs-0003-fix-and-slightly-generalize-owfs-the-filesystem-syst.patch
new file mode 100644
index 0000000..639c1d1
--- /dev/null
+++ b/owfs-0003-fix-and-slightly-generalize-owfs-the-filesystem-syst.patch
@@ -0,0 +1,29 @@
+From 798385b455929d7a67206eb4ef1997480c911edb Mon Sep 17 00:00:00 2001
+From: Tomasz Torcz <tomek at pipebreaker.pl>
+Date: Wed, 12 Nov 2014 18:28:51 +0100
+Subject: [PATCH] fix and slightly generalize owfs' (the filesystem) systemd
+ unit
+
+---
+ src/scripts/systemd/owfs.service.in | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/scripts/systemd/owfs.service.in b/src/scripts/systemd/owfs.service.in
+index 8fb2f76..378ea79 100644
+--- a/src/scripts/systemd/owfs.service.in
++++ b/src/scripts/systemd/owfs.service.in
+@@ -3,8 +3,9 @@ Description=1-wire filesystem FUSE mount
+ Documentation=man:owfs(1)
+ 
+ [Service]
+-ExecStart=@bindir@/owfs --server=127.0.0.1 --allow_other /run/owfs
+-ExecStop=/usr/bin/umount /run/owfs
++Type=forking
++ExecStart=@bindir@/owfs --server=127.0.0.1 --allow_other %t/owfs
++ExecStop=/usr/bin/umount %t/owfs
+ RuntimeDirectory=owfs
+ 
+ [Install]
+-- 
+1.9.3
+
diff --git a/owfs.spec b/owfs.spec
index a9e786b..0c95941 100644
--- a/owfs.spec
+++ b/owfs.spec
@@ -3,7 +3,7 @@
 
 Name:		owfs
 Version:	2.9p8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	1-Wire Virtual File System
 
 # some parts licensed differently, see http://owfs.org/index.php?page=license
@@ -12,6 +12,9 @@ URL:		http://www.owfs.org/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # install into 'vendor' perl directories; not suitable for upstream
 Patch0:		owfs-0001-install-into-vendor-perl-directories.patch
+# post 2.9p8
+Patch1:		owfs-0002-use-RuntimeDirectory-in-owfs.service.patch
+Patch2:		owfs-0003-fix-and-slightly-generalize-owfs-the-filesystem-syst.patch
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires(post): systemd
@@ -184,6 +187,8 @@ and owpresent.
 %setup -q
 # Perl dirs
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 sed -i -e 's/) Makefile.PL/& INSTALLDIRS=vendor/' \
 	module/swig/perl5/Makefile.am \
@@ -384,6 +389,9 @@ exit 0
 
 
 %changelog
+* Wed Nov 12 2014 Tomasz Torcz <ttorcz at fedoraproject.org> - 2.9p8-2
+- add two upstream patches fixing systemd unit (RHBZ#1162874)
+
 * Tue Oct 21 2014 Tomasz Torcz <ttorcz at fedoraproject.org> - 2.9p8-1
 - new upstream release
 - dropped tmpfiles snippet - /run/owfs is now managed by RuntimeDirectory=