From 56b02aaf3fa91b736a4c81b6d649d206732e5241 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 06:24:01 +0100 Subject: [PATCH] patches for systemd service files and inpudev conf [release 0.9.4-3mamba;Fri Aug 12 2016] --- lirc-0.9.4-fix-devinput-conf.patch | 35 ++++++++++++++++++++++++++++++ lirc.spec | 35 ++++++++++++++++++++++++------ 2 files changed, 63 insertions(+), 7 deletions(-) create mode 100644 lirc-0.9.4-fix-devinput-conf.patch diff --git a/lirc-0.9.4-fix-devinput-conf.patch b/lirc-0.9.4-fix-devinput-conf.patch new file mode 100644 index 0000000..84c77a6 --- /dev/null +++ b/lirc-0.9.4-fix-devinput-conf.patch @@ -0,0 +1,35 @@ +diff -Nru lirc-0.9.4.orig/systemd/lircd-uinput.service lirc-0.9.4/systemd/lircd-uinput.service +--- lirc-0.9.4.orig/systemd/lircd-uinput.service 2016-05-23 19:18:48.000000000 +0200 ++++ lirc-0.9.4/systemd/lircd-uinput.service 2016-08-12 14:39:46.788459356 +0200 +@@ -1,9 +1,6 @@ + [Unit] + After=lircd.service + Description=Forward LIRC button presses as uinput events +-Documentation=Daemon which forwards LIRC button presses to the \ +-kernel uinput device, making LIRC-decoded IR remote input \ +-available as regular /dev/input events + + [Service] + Type=simple +diff -Nru lirc-0.9.4.orig/systemd/lircd.service lirc-0.9.4/systemd/lircd.service +--- lirc-0.9.4.orig/systemd/lircd.service 2016-05-23 19:18:48.000000000 +0200 ++++ lirc-0.9.4/systemd/lircd.service 2016-08-12 14:39:33.239443239 +0200 +@@ -1,7 +1,5 @@ + [Unit] + Description=LIRC Infrared Signal Decoder +-Documentation=Decodes input from IR remote controls, also supporting writes \ +-to the device + Wants=lircd-setup.service + After=network.target lircd-setup.service + +diff -Nru lirc-0.9.4.orig/systemd/lircmd.service lirc-0.9.4/systemd/lircmd.service +--- lirc-0.9.4.orig/systemd/lircmd.service 2016-05-23 19:18:48.000000000 +0200 ++++ lirc-0.9.4/systemd/lircmd.service 2016-08-12 14:40:17.587496145 +0200 +@@ -1,7 +1,6 @@ + [Unit] + Wants=lircd.socket + Description=LIRC Infrared Mouse Event Signal Decoder +-Documentation=Converts input decoded by lircd to mouse movements and clicks + + [Service] + Type=simple diff --git a/lirc.spec b/lirc.spec index 2dc89de..3a7764a 100644 --- a/lirc.spec +++ b/lirc.spec @@ -1,7 +1,9 @@ +%define user_lirc 67 +%define group_lirc 67 Name: lirc Version: 0.9.4 Epoch: 1 -Release: 1mamba +Release: 3mamba Summary: A package that allows you to decode and send infra-red signals Group: System/Hardware Vendor: openmamba @@ -13,6 +15,7 @@ URL: http://www.lirc.org/ Source: http://downloads.sourceforge.net/project/lirc/LIRC/%{version}/lirc-%{version}.tar.bz2 #http://downloads.sourceforge.net/project/lirc/LIRC/%{version}/lirc-%{version}.tar.gz Patch0: lirc-0.9.4-run_dir.patch +Patch1: lirc-0.9.4-fix-devinput-conf.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -40,6 +43,7 @@ BuildRequires: libuuid-devel BuildRequires: libxcb-devel ## AUTOBUILDREQ-END BuildRequires: help2man >= 1.36.3 +Requires: PyYAML-py3 %systemd_requires BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -58,6 +62,7 @@ This package contains static libraries and header files need for development. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build ./autogen.sh @@ -81,6 +86,7 @@ cat > %{buildroot}%{_tmpfilesdir}/lircd.conf << _EOF d /run/lirc 755 root root _EOF +:<< _EOF %clean [ "%{buildroot}" != / ] && rm -rf %{buildroot} @@ -88,14 +94,19 @@ _EOF if [ $1 -ge 1 ]; then systemctl -q daemon-reload fi -if [ $1 -ge 0 ]; then - %systemd_post lircd - %tmpfiles_create lircd.conf -fi +groupadd lirc -g %{group_lirc} 2>/dev/null +useradd -u %{user_lirc} -g lirc \ + -d /dev/null -s /sbin/nologin -c "Lirc user" lirc 2>/dev/null +%systemd_post lircd +%tmpfiles_create lircd.conf : %preun %systemd_preun lircd +if [ $1 -eq 0 ]; then + groupdel lirc 2>/dev/null + userdel lirc 2>/dev/null +fi : %postun @@ -135,6 +146,9 @@ fi %{python3_sitelib}/lirc/* %dir %{_datadir}/lirc %dir %{_datadir}/lirc/configs +%ifarch %{ix86} +%{_datadir}/lirc/lirc.hwdb +%endif %{_datadir}/lirc/configs/* %dir %{_datadir}/lirc/contrib %{_datadir}/lirc/contrib/* @@ -151,6 +165,8 @@ fi %{_localstatedir}/lib/lirc/images/* %dir %{_localstatedir}/lib/lirc/plugins %{_localstatedir}/lib/lirc/plugins/* +%dir %{_docdir}/lirc +%{_docdir}/lirc/* %doc AUTHORS COPYING %files devel @@ -172,11 +188,16 @@ fi %{_libdir}/liblirc_driver.so %{_libdir}/pkgconfig/lirc-driver.pc %{_libdir}/pkgconfig/lirc.pc -%dir %{_docdir}/lirc -%{_docdir}/lirc/* %doc ChangeLog NEWS README %changelog +* Fri Aug 12 2016 Silvan Calarco 0.9.4-3mamba +- patches for systemd service files and inpudev conf + +* Thu Aug 11 2016 Silvan Calarco 0.9.4-2mamba +- require PyYAML-py3 for lirc-setup and create lirc system user and group +- move docs required by lirc-setup from -devel to main package + * Thu Aug 11 2016 Silvan Calarco 0.9.4-1mamba - update to 0.9.4