From dca607494b708e6d9645bc35818a4f5efd82f914db36217204799b8c7b7d8189 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Tue, 4 Feb 2014 12:46:17 +0000
Subject: [PATCH] Accepting request 220660 from home:jengelh:branches:hardware

- Use libnl3 instead of libnl1
- Remove redundant %clean section, more robust make install call,
  and a simplified file list

OBS-URL: https://build.opensuse.org/request/show/220660
OBS-URL: https://build.opensuse.org/package/show/hardware/neard?expand=0&rev=10
---
 neard.changes |  7 +++++++
 neard.spec    | 50 +++++++++++++++++++++-----------------------------
 2 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/neard.changes b/neard.changes
index fcb81ac..18f1f58 100644
--- a/neard.changes
+++ b/neard.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Feb  2 21:54:37 UTC 2014 - jengelh@inai.de
+
+- Use libnl3 instead of libnl1
+- Remove redundant %clean section, more robust make install call,
+  and a simplified file list
+
 -------------------------------------------------------------------
 Wed Jan 22 02:53:02 UTC 2014 - acho@suse.com
 
diff --git a/neard.spec b/neard.spec
index 2d1f36a..49b103f 100644
--- a/neard.spec
+++ b/neard.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package neard
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2010-2012 B1 Systems GmbH, Vohburg, Germany
 #
 # All modifications and additions to the file contributed by third parties
@@ -20,30 +20,38 @@
 Name:           neard
 Version:        0.13
 Release:        0
-Summary:	NFC for Linux
+Summary:        NFC for Linux
 License:        GPL-2.0
 Group:          Hardware/Mobile
 Url:            http://01.org/linux-nfc/
+
+#Git-Clone:	git://git.kernel.org/pub/scm/network/nfc/neard
 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
+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
-BuildRequires:  libudev-devel
 BuildRequires:  libtool
+BuildRequires:  libudev-devel
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(dbus-1) >= 1.4
 BuildRequires:  pkgconfig(glib-2.0) >= 2.28
-BuildRequires:  pkgconfig(libnl-1)
+BuildRequires:  pkgconfig(libnl-3.0)
+BuildRequires:  pkgconfig(libnl-genl-3.0)
+%if 0%{?suse_version} > 1140
+BuildRequires:  systemd
+BuildRequires:  systemd-devel
+%{?systemd_requires}
+%define has_systemd 1
+%endif
 
 %description
 NFC support for Linux. 
 
 %package devel
 Summary:        Files needed for NFC development
-License:        GPL-2.0
 Group:          Development/Sources
 
 %description devel
@@ -51,7 +59,6 @@ Files needed to develop applications for the NFC stack.
 
 %package test
 Summary:        Files needed for NFC development
-License:        GPL-2.0
 Group:          Development/Tools/Debuggers
 
 %description test
@@ -63,7 +70,7 @@ Files needed to test applications for the NFC stack.
 
 %build
 autoreconf -fiv
-%configure  --prefix=%_prefix \
+%configure --prefix="%_prefix" \
 		--enable-tools \
 		--enable-test
 
@@ -87,8 +94,8 @@ install --mode=0644 -D %{SOURCE2} %{buildroot}%{_prefix}/lib/udev/rules.d/99-nea
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog README
 %config %{_sysconfdir}/dbus-1/system.d/org.neard.conf
-%dir %{_prefix}/lib/nfc
-%{_prefix}/lib/nfc/neard
+%dir %_libexecdir/nfc/
+%_libexecdir/nfc/neard
 %{_prefix}/lib/udev/rules.d/99-neard.rules
 %{_unitdir}/neard.service
 %doc %{_mandir}/man1/nfctool.1.gz
@@ -97,28 +104,13 @@ install --mode=0644 -D %{SOURCE2} %{buildroot}%{_prefix}/lib/udev/rules.d/99-nea
 
 %files devel
 %defattr(-, root, root)
-%dir %{_prefix}/include/near
-%{_prefix}/include/near/*
+%_includedir/near/
 %{_libdir}/pkgconfig/neard.pc
 
 %files test
 %defattr(-, root, root)
 %{_bindir}/nfctool
 %dir %{_libdir}/neard/
-%dir %{_libdir}/neard/test
-%{_libdir}/neard/test/bt-handover
-%{_libdir}/neard/test/disable-adapter
-%{_libdir}/neard/test/dump-device
-%{_libdir}/neard/test/dump-record
-%{_libdir}/neard/test/dump-tag
-%{_libdir}/neard/test/enable-adapter
-%{_libdir}/neard/test/handover-agent
-%{_libdir}/neard/test/list-adapters
-%{_libdir}/neard/test/monitor-near
-%{_libdir}/neard/test/phdc-simple-manager
-%{_libdir}/neard/test/push-device
-%{_libdir}/neard/test/start-poll
-%{_libdir}/neard/test/stop-poll
-%{_libdir}/neard/test/write-tag
+%{_libdir}/neard/test/
 
 %changelog