diff --git a/99-neard.rules b/99-neard.rules new file mode 100644 index 0000000..acc87e1 --- /dev/null +++ b/99-neard.rules @@ -0,0 +1,5 @@ +# This file is part of neard + +# run a command on remove events +SUBSYSTEM=="nfc", TAG+="systemd", ENV{SYSTEMD_WANTS}+="neard.service" + diff --git a/neard.changes b/neard.changes index 3ad7ea9..2d20e30 100644 --- a/neard.changes +++ b/neard.changes @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Wed Jan 15 06:43:49 UTC 2014 - acho@suse.com + +- use --prefix=%_prefix, kill the %clean section. kill has_systemd. + (bnc#837978) + +- add udev rules to enable this service by systemd. + +- remove systemctl from %post. +------------------------------------------------------------------- Wed Dec 18 12:36:37 UTC 2013 - cfarrell@suse.com - license update: GPL-2.0 diff --git a/neard.spec b/neard.spec index c80d359..3b8d439 100644 --- a/neard.spec +++ b/neard.spec @@ -21,8 +21,6 @@ Name: neard BuildRequires: pkgconfig(dbus-1) >= 1.4 %if 0%{?suse_version} >= 1210 BuildRequires: systemd -%{?systemd_requires} -%define has_systemd 1 %endif Version: 0.13 Release: 0 @@ -32,9 +30,11 @@ Group: Hardware/Mobile 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: automake BuildRequires: check-devel +BuildRequires: libudev-devel BuildRequires: libtool BuildRequires: pkg-config BuildRequires: systemd-devel @@ -65,7 +65,7 @@ Files needed to test applications for the NFC stack. %build autoreconf -fiv -%configure --prefix=/usr \ +%configure --prefix=%_prefix \ --enable-tools \ --enable-test @@ -74,37 +74,25 @@ make %{?_smp_mflags} all V=1 %install %make_install install --mode=0644 -D %{SOURCE1} %{buildroot}%{_unitdir}/neard.service - -%clean -rm -rf %{buildroot} +install --mode=0644 -D %{SOURCE2} %{buildroot}%{_prefix}/lib/udev/rules.d/99-neard.rules %pre -%if 0%{?has_systemd} %service_add_pre neard.service -%endif %post -# todo: check if this is still obeyed / needed with systemd -%{fillup_only -n neard} -/bin/systemctl enable neard.service 2>&1 || : -/bin/systemctl daemon-reload >/dev/null 2>&1 || : %preun %service_del_preun neard.service %postun -%{insserv_cleanup} -%if 0%{?has_systemd} %service_del_postun neard.service -%else -%{insserv_cleanup} -%endif %files %defattr(-, root, root) %config %{_sysconfdir}/dbus-1/system.d/org.neard.conf %dir %{_prefix}/lib/nfc %{_prefix}/lib/nfc/neard +%{_prefix}/lib/udev/rules.d/99-neard.rules %{_unitdir}/neard.service %doc %{_mandir}/man1/nfctool.1.gz %doc %{_mandir}/man5/neard.conf.5.gz