[phodav/f20] Remove systemd target, use only service. rhbz#1087907

[Marc-André Lureau]

commit 446ebd29aed075fbe21c0e09c549b5c409d2c6fb
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date:   Mon May 5 15:53:12 2014 +0200

    Remove systemd target, use only service. rhbz#1087907

 ...vd-remove-systemd-target-use-only-service.patch |   56 ++++++++++++++++++++
 phodav.spec                                        |    9 +++-
 2 files changed, 63 insertions(+), 2 deletions(-)
---
diff --git a/0001-webdavd-remove-systemd-target-use-only-service.patch b/0001-webdavd-remove-systemd-target-use-only-service.patch
new file mode 100644
index 0000000..4375397
--- /dev/null
+++ b/0001-webdavd-remove-systemd-target-use-only-service.patch
@@ -0,0 +1,56 @@
+From d2a11492d9bbfebdea31ec477d62dc747af0510c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau at gmail.com>
+Date: Mon, 5 May 2014 15:44:30 +0200
+Subject: [PATCH] webdavd: remove systemd target, use only service
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1087907
+---
+ Makefile.am                 | 2 +-
+ data/70-spice-webdavd.rules | 2 +-
+ data/spice-webdavd.service  | 3 ---
+ data/spice-webdavd.target   | 2 --
+ 4 files changed, 2 insertions(+), 7 deletions(-)
+ delete mode 100644 data/spice-webdavd.target
+
+diff --git a/Makefile.am b/Makefile.am
+index e9ce4a7..680371d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -142,7 +142,7 @@ if HAVE_SYSTEMD
+ systemdunitdir = $(SYSTEMDSYSTEMUNITDIR)
+ dist_systemdunit_DATA = \
+ 	$(top_srcdir)/data/spice-webdavd.service \
+-	$(top_srcdir)/data/spice-webdavd.target
++	$(NULL)
+ endif
+ 
+ if HAVE_UDEV
+diff --git a/data/70-spice-webdavd.rules b/data/70-spice-webdavd.rules
+index 0088be3..0fd894d 100644
+--- a/data/70-spice-webdavd.rules
++++ b/data/70-spice-webdavd.rules
+@@ -1 +1 @@
+-ACTION=="add", SUBSYSTEM=="virtio-ports", ENV{DEVLINKS}=="/dev/virtio-ports/org.spice-space.webdav.0", ENV{SYSTEMD_WANTS}="spice-webdavd.target"
++ACTION=="add", SUBSYSTEM=="virtio-ports", ENV{DEVLINKS}=="/dev/virtio-ports/org.spice-space.webdav.0", ENV{SYSTEMD_WANTS}="spice-webdavd.service"
+diff --git a/data/spice-webdavd.service b/data/spice-webdavd.service
+index 328a84d..a7c3104 100644
+--- a/data/spice-webdavd.service
++++ b/data/spice-webdavd.service
+@@ -8,6 +8,3 @@ Type=simple
+ EnvironmentFile=-/etc/sysconfig/spice-webdavd
+ ExecStart=/usr/sbin/spice-webdavd -p 9843 $SPICE_WEBDAVD_EXTRA_ARGS
+ Restart=on-success
+-
+-[Install]
+-WantedBy=spice-webdavd.target
+diff --git a/data/spice-webdavd.target b/data/spice-webdavd.target
+deleted file mode 100644
+index 7417025..0000000
+--- a/data/spice-webdavd.target
++++ /dev/null
+@@ -1,2 +0,0 @@
+-[Unit]
+-Description=webdav daemon for Spice guests
+-- 
+1.8.5.3
+
diff --git a/phodav.spec b/phodav.spec
index 7f2d1d9..be8f362 100644
--- a/phodav.spec
+++ b/phodav.spec
@@ -1,12 +1,14 @@
 Name:           phodav
 Version:        0.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A WebDAV server using libsoup
 Group:          Applications/Internet
 License:        LGPLv2+
 URL:            https://wiki.gnome.org/phodav
 Source0:        http://download.gnome.org/sources/%{name}/0.3/%{name}-%{version}.tar.xz
 
+Patch1:         0001-webdavd-remove-systemd-target-use-only-service.patch
+ 
 BuildRequires:  systemd-devel
 BuildRequires:  systemd-units
 BuildRequires:  libsoup-devel
@@ -53,6 +55,7 @@ the Spice virtio channel.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %configure --with-avahi
@@ -98,8 +101,10 @@ rm -f %{buildroot}%{_libdir}/*.la
 %{_sbindir}/spice-webdavd
 /usr/lib/udev/rules.d/70-spice-webdavd.rules
 %{_unitdir}/spice-webdavd.service
-%{_unitdir}/spice-webdavd.target
 
 %changelog
+* Mon May 5 2014 Marc-André Lureau <marcandre.lureau at redhat.com> - 0.4-2
+- Remove systemd target, use only service. rhbz#1087907
+
 * Mon Jan 27 2014 Marc-André Lureau <marcandre.lureau at redhat.com> - 0.4-1
 - Initial packaging. rhbz#1059708