From 3704b78d8ce301fb6f3f9c5affe0d7008eeb6ead566d5254e87acd887bb835f7 Mon Sep 17 00:00:00 2001
From: Al Cho <acho@suse.com>
Date: Thu, 16 Jan 2014 05:41:12 +0000
Subject: [PATCH] Accepting request 214070 from
 home:acho-novell:branches:hardware

Clean empty %post.
Add 'send_destination' to org.neard.conf.
Add 'ACTION=="add"' for udev rule.(bnc#837978)

OBS-URL: https://build.opensuse.org/request/show/214070
OBS-URL: https://build.opensuse.org/package/show/hardware/neard?expand=0&rev=6
---
 99-neard.rules                                |  2 +-
 ....13-fix-dbus_send_destination_config.patch | 19 +++++++++++++++++++
 neard.changes                                 |  9 +++++++++
 neard.spec                                    |  4 ++--
 4 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 neard-0.13-fix-dbus_send_destination_config.patch

diff --git a/99-neard.rules b/99-neard.rules
index acc87e1..64a9074 100644
--- a/99-neard.rules
+++ b/99-neard.rules
@@ -1,5 +1,5 @@
 #  This file is part of neard
 
 # run a command on remove events
-SUBSYSTEM=="nfc", TAG+="systemd", ENV{SYSTEMD_WANTS}+="neard.service"
+ACTION=="add", SUBSYSTEM=="nfc", TAG+="systemd", ENV{SYSTEMD_WANTS}+="neard.service"
 
diff --git a/neard-0.13-fix-dbus_send_destination_config.patch b/neard-0.13-fix-dbus_send_destination_config.patch
new file mode 100644
index 0000000..753a47a
--- /dev/null
+++ b/neard-0.13-fix-dbus_send_destination_config.patch
@@ -0,0 +1,19 @@
+diff --git a/src/org.neard.conf b/src/org.neard.conf
+index 0844322..ec4cd5f 100644
+--- a/src/org.neard.conf
++++ b/src/org.neard.conf
+@@ -4,10 +4,10 @@
+     <policy user="root">
+         <allow own="org.neard"/>
+         <allow send_destination="org.neard"/>
+-        <allow send_interface="org.neard.NDEFAgent"/>
+-        <allow send_interface="org.neard.PHDC.Manager"/>
+-        <allow send_interface="org.neard.PHDC.Agent"/>
+-	<allow send_interface="org.neard.HandoverAgent"/>
++        <allow send_destination="org.neard" send_interface="org.neard.NDEFAgent"/>
++        <allow send_destination="org.neard" send_interface="org.neard.PHDC.Manager"/>
++        <allow send_destination="org.neard" send_interface="org.neard.PHDC.Agent"/>
++	<allow send_destination="org.neard" send_interface="org.neard.HandoverAgent"/>
+     </policy>
+     <policy at_console="true">
+         <allow send_destination="org.neard"/>
diff --git a/neard.changes b/neard.changes
index 2d20e30..8835c87 100644
--- a/neard.changes
+++ b/neard.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jan 16 05:06:00 UTC 2014 - acho@suse.com
+
+- Clean empty %post.(bnc#837978)
+
+- Add 'send_destination' to org.neard.conf.(bnc#837978)
+
+- Add 'ACTION=="add"' for udev rule.(bnc#837978)
+
 -------------------------------------------------------------------
 Wed Jan 15 06:43:49 UTC 2014 - acho@suse.com
 
diff --git a/neard.spec b/neard.spec
index 3b8d439..41cbffe 100644
--- a/neard.spec
+++ b/neard.spec
@@ -31,6 +31,7 @@ Url:            http://01.org/linux-nfc/
 Source:         https://www.kernel.org/pub/linux/network/nfc/neard-%{version}.tar.bz2
 Source1:	neard.service
 Source2:	99-neard.rules
+Patch1:		neard-0.13-fix-dbus_send_destination_config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  automake
 BuildRequires:  check-devel
@@ -62,6 +63,7 @@ Files needed to test applications for the NFC stack.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 autoreconf -fiv
@@ -79,8 +81,6 @@ install --mode=0644 -D %{SOURCE2} %{buildroot}%{_prefix}/lib/udev/rules.d/99-nea
 %pre
 %service_add_pre neard.service
 
-%post
-
 %preun
 %service_del_preun neard.service