Changes - SailfishOS Open Build Service

Changes of Revision 3

[-] [+]	Changed	_service:tar_git:nfcd-pn54x-plugin.changes
@@ -1,3 +1,6 @@ +* Tue Jul 21 2020 Slava Monich <slava.monich@jolla.com> - 1.0.2 +- [install] Install nfcd plugins in arch specific place. JB#50027 + * Fri Apr 03 2020 Slava Monich <slava.monich@jolla.com> - 1.0.1 - [pn54x-plugin] Dump output NCI packets. JB#48413
[-] [+]	Changed	_service:tar_git:nfcd-pn54x-plugin.spec ^
@@ -1,8 +1,7 @@ Name: nfcd-pn54x-plugin -Version: 1.0.1 +Version: 1.0.2 Release: 0 Summary: NFC plugin for pn54x -Group: Development/Libraries License: BSD URL: https://github.com/mer-hybris/nfcd-pn54x-plugin Source: %{name}-%{version}.tar.bz2 @@ -14,6 +13,8 @@ BuildRequires: pkgconfig(nfcd-plugin) >= %{nfcd_version} Requires: nfcd >= %{nfcd_version} +%define plugin_dir %{_libdir}/nfcd/plugins + %description NFC plugin that talks directly to pn54x driver. @@ -25,7 +26,7 @@ %install rm -rf %{buildroot} -make install DESTDIR=%{buildroot} +make DESTDIR=%{buildroot} PLUGIN_DIR=%{plugin_dir} install %check make test @@ -38,5 +39,5 @@ %files %defattr(-,root,root,-) -%dir %{_libdir}/nfcd/plugins -%{_libdir}/nfcd/plugins/.so +%dir %{plugin_dir} +%{plugin_dir}/.so
[-] [+]	Changed	_service:tar_git:nfcd-pn54x-plugin-1.0.2.tar.bz2/Makefile ^
@@ -178,14 +178,16 @@ # Install # -INSTALL_PERM = 755 +PLUGIN_DIR ?= usr/lib/nfcd/plugins +ABS_PLUGIN_DIR := $(shell echo /$(PLUGIN_DIR) \| sed -r 's\|/+\|/\|g') + INSTALL = install INSTALL_DIRS = $(INSTALL) -d -INSTALL_FILES = $(INSTALL) -m $(INSTALL_PERM) -INSTALL_LIB_DIR = $(DESTDIR)/usr/lib/nfcd/plugins +INSTALL_FILES = $(INSTALL) -m 644 +INSTALL_PLUGIN_DIR = $(DESTDIR)$(ABS_PLUGIN_DIR) -install: $(INSTALL_LIB_DIR) - $(INSTALL_FILES) $(RELEASE_LIB) $(INSTALL_LIB_DIR) +install: $(INSTALL_PLUGIN_DIR) + $(INSTALL_FILES) $(RELEASE_LIB) $(INSTALL_PLUGIN_DIR) -$(INSTALL_LIB_DIR): +$(INSTALL_PLUGIN_DIR): $(INSTALL_DIRS) $@