[packages/neard] - updated to 0.15 - added am patch to fix version.h install

qboosh qboosh at pld-linux.org
Sat Dec 20 15:48:53 CET 2014


commit f5679ae58a8256884b153ed2b577555efbc78462
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Dec 20 15:49:45 2014 +0100

    - updated to 0.15
    - added am patch to fix version.h install

 neard-am.patch | 16 ++++++++++++++++
 neard.spec     | 23 ++++++++++++++++++++---
 2 files changed, 36 insertions(+), 3 deletions(-)
---
diff --git a/neard.spec b/neard.spec
index c499412..5096810 100644
--- a/neard.spec
+++ b/neard.spec
@@ -1,16 +1,21 @@
 Summary:	Near Field Communication manager
 Summary(pl.UTF-8):	Zarządca połączeń NFC (Near Field Communication)
 Name:		neard
-Version:	0.14
+Version:	0.15
 Release:	1
 License:	GPL v2
 Group:		Networking/Daemons
 Source0:	https://www.kernel.org/pub/linux/network/nfc/%{name}-%{version}.tar.xz
-# Source0-md5:	692ba2653d60155255244c87396c486b
+# Source0-md5:	b746ce62eeef88e8de90765e00a75a1c
+Patch0:		%{name}-am.patch
 URL:		https://01.org/linux-nfc
+BuildRequires:	autoconf >= 2.60
+BuildRequires:	automake
 BuildRequires:	dbus-devel >= 1.2
+BuildRequires:	gcc >= 5:3.4
 BuildRequires:	glib2-devel >= 1:2.28
 BuildRequires:	libnl-devel >= 3.2
+BuildRequires:	libtool >= 2:2
 BuildRequires:	linux-libc-headers >= 7:3.6
 BuildRequires:	pkgconfig
 BuildRequires:	tar >= 1:1.22
@@ -57,11 +62,21 @@ Pliki nagłówkowe dla wtyczek neard.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
 	--disable-silent-rules \
-	--enable-tools
+	--enable-ese \
+	--enable-pie \
+	--enable-tools \
+	--with-systemdsystemunitdir=%{systemdunitdir} \
+	--with-systemduserunitdir=%{systemduserunitdir}
 
 %{__make}
 
@@ -83,11 +98,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/nfctool
 %dir %{_libexecdir}/nfc
 %attr(755,root,root) %{_libexecdir}/nfc/neard
+%attr(755,root,root) %{_libexecdir}/nfc/seeld
 %dir %{_libdir}/near
 %dir %{_libdir}/near/plugins
 # not used yet
 #%dir %{_sysconfdir}/neard
 /etc/dbus-1/system.d/org.neard.conf
+%{systemdunitdir}/neard.service
 %{_mandir}/man1/nfctool.1*
 %{_mandir}/man5/neard.conf.5*
 %{_mandir}/man8/neard.8*
diff --git a/neard-am.patch b/neard-am.patch
new file mode 100644
index 0000000..64422d4
--- /dev/null
+++ b/neard-am.patch
@@ -0,0 +1,16 @@
+--- neard-0.15/Makefile.am.orig	2014-12-08 11:02:07.000000000 +0100
++++ neard-0.15/Makefile.am	2014-12-20 13:32:14.336233139 +0100
+@@ -10,11 +10,11 @@
+ 			include/tlv.h include/setting.h include/device.h \
+ 			include/nfc_copy.h include/snep.h
+ 
+-nodist_include_HEADERS = include/version.h
++nodist_pkginclude_HEADERS = include/version.h
+ 
+ noinst_HEADERS = include/dbus.h
+ 
+-local_headers = $(foreach file,$(pkginclude_HEADERS) $(nodist_include_HEADERS) \
++local_headers = $(foreach file,$(pkginclude_HEADERS) $(nodist_pkginclude_HEADERS) \
+ 			$(noinst_HEADERS), include/near/$(notdir $(file)))
+ 
+ gdbus_sources = gdbus/gdbus.h gdbus/mainloop.c gdbus/watch.c \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/neard.git/commitdiff/f5679ae58a8256884b153ed2b577555efbc78462



More information about the pld-cvs-commit mailing list