From bd1f68c4dfa4c4587d12caee69ba630d56c592a4 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 06:24:01 +0100 Subject: [PATCH] update to 0.9.4 [release 0.9.4-1mamba;Thu Aug 11 2016] --- lirc-0.9.3a-run_dir.patch | 14 ------- lirc-0.9.4-run_dir.patch | 24 ++++++++++++ lirc.spec | 80 ++++++++++++++++++++++----------------- 3 files changed, 70 insertions(+), 48 deletions(-) delete mode 100644 lirc-0.9.3a-run_dir.patch create mode 100644 lirc-0.9.4-run_dir.patch diff --git a/lirc-0.9.3a-run_dir.patch b/lirc-0.9.3a-run_dir.patch deleted file mode 100644 index b9ba940..0000000 --- a/lirc-0.9.3a-run_dir.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nru lirc-0.9.3a.orig/lirc_options.conf lirc-0.9.3a/lirc_options.conf ---- lirc-0.9.3a.orig/lirc_options.conf 2015-10-14 18:23:44.000000000 +0200 -+++ lirc-0.9.3a/lirc_options.conf 2016-07-27 16:58:54.007431761 +0200 -@@ -6,8 +6,8 @@ - nodaemon = False - driver = default - device = /dev/lirc0 --output = /var/run/lirc/lircd --pidfile = /var/run/lirc/lircd.pid -+output = /run/lirc/lircd -+pidfile = /run/lirc/lircd.pid - plugindir = /usr/lib/lirc/plugins - permission = 666 - allow-simulate = No diff --git a/lirc-0.9.4-run_dir.patch b/lirc-0.9.4-run_dir.patch new file mode 100644 index 0000000..2fdd873 --- /dev/null +++ b/lirc-0.9.4-run_dir.patch @@ -0,0 +1,24 @@ +--- lirc-0.9.4/lirc_options.conf.orig 2016-08-11 16:23:50.927031912 +0200 ++++ lirc-0.9.4/lirc_options.conf 2016-08-11 16:25:05.137115690 +0200 +@@ -10,8 +10,8 @@ + nodaemon = False + driver = devinput + device = auto +-output = /var/run/lirc/lircd +-pidfile = /var/run/lirc/lircd.pid ++output = /run/lirc/lircd ++pidfile = /run/lirc/lircd.pid + plugindir = /usr/lib/lirc/plugins + permission = 666 + allow-simulate = No +--- lirc-0.9.4/Makefile.am.orig 2016-08-11 16:43:40.059632349 +0200 ++++ lirc-0.9.4/Makefile.am 2016-08-11 16:43:46.059629485 +0200 +@@ -81,7 +81,7 @@ + @echo "#define PATHS_H" >>$@ + @echo '#define DATADIR "$(datadir)"' >>$@ + @echo '#define SYSCONFDIR "$(sysconfdir)"' >>$@ +- @echo '#define VARRUNDIR "$(localstatedir)/run"' >>$@ ++ @echo '#define VARRUNDIR "/run"' >>$@ + @echo '#define LOCALSTATEDIR "$(localstatedir)"' >>$@ + @echo '#define LIBDIR "$(libdir)"' >>$@ + @echo "#endif" >>$@ diff --git a/lirc.spec b/lirc.spec index 9c816c6..2dc89de 100644 --- a/lirc.spec +++ b/lirc.spec @@ -1,7 +1,7 @@ Name: lirc -Version: 0.9.3a +Version: 0.9.4 Epoch: 1 -Release: 2mamba +Release: 1mamba Summary: A package that allows you to decode and send infra-red signals Group: System/Hardware Vendor: openmamba @@ -12,22 +12,34 @@ URL: http://www.lirc.org/ #Source: http://downloads.sourceforge.net/project/lirc/LIRC/%{version}/lirc-debian-src-%{version}.tar.gz 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.3a-run_dir.patch +Patch0: lirc-0.9.4-run_dir.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel BuildRequires: libICE-devel -BuildRequires: libpthread-stubs-devel BuildRequires: libSM-devel -BuildRequires: libuuid-devel BuildRequires: libX11-devel BuildRequires: libXau-devel -BuildRequires: libxcb-devel BuildRequires: libXdmcp-devel +BuildRequires: libalsa-devel +BuildRequires: libbsd-devel +BuildRequires: libcap-devel +BuildRequires: libdw-devel +BuildRequires: libftdi1-devel +BuildRequires: libgcc +BuildRequires: libjack-devel +BuildRequires: libpcre-devel +BuildRequires: libportaudio-devel +BuildRequires: libselinux-devel +BuildRequires: libsepol-devel +BuildRequires: libstdc++6-devel +BuildRequires: libudev-devel +BuildRequires: libusb-compat-devel +BuildRequires: libusb-devel +BuildRequires: libuuid-devel +BuildRequires: libxcb-devel ## AUTOBUILDREQ-END BuildRequires: help2man >= 1.36.3 -## FIXME: lirc has portaudio v.18 support but system has 19, patch needed -#BuildConflicts: libportaudio-devel %systemd_requires BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -48,13 +60,8 @@ This package contains static libraries and header files need for development. %patch0 -p1 %build -%configure \ - --localstatedir=/ \ - --with-driver=none - -# --with-driver=all -# --with-kerneldir=/usr/src/linux-%{KERNEL_VER}%{KERNEL_TARGET} \ -# --with-moduledir=/lib/modules/%{KERNEL_VER}%{KERNEL_TARGET}/misc +./autogen.sh +%configure %make systemddir=%{_unitdir} #make -C drivers %{BUILD_OPTS} -j1 @@ -88,11 +95,11 @@ fi : %preun -%systemd_preun +%systemd_preun lircd : %postun -%systemd_postun_with_restart +%systemd_postun_with_restart lircd : %files @@ -101,15 +108,21 @@ fi %config %{_sysconfdir}/lirc/lirc_options.conf %config(noreplace) %{_sysconfdir}/lirc/lircd.conf %config(noreplace) %{_sysconfdir}/lirc/lircmd.conf +%config %{_sysconfdir}/lirc/irexec.lircrc %dir %{_sysconfdir}/lirc/lircd.conf.d +%config %{_sysconfdir}/lirc/lircd.conf.d/devinput.lircd.conf %{_sysconfdir}/lirc/lircd.conf.d/README.conf.d %{_bindir}/* %{_sbindir}/lircd %{_sbindir}/lircmd %{_sbindir}/lirc-lsplugins +%{_sbindir}/lircd-setup +%{_sbindir}/lircd-uinput %{_unitdir}/lircd.service %{_unitdir}/lircd.socket %{_unitdir}/lircmd.service +%{_unitdir}/irexec.service +%{_unitdir}/lircd-uinput.service %{_tmpfilesdir}/lircd.conf %{_libdir}/liblirc_client.so.* %{_libdir}/liblirc.so.* @@ -119,32 +132,25 @@ fi %dir %{_libdir}/lirc/plugins %{_libdir}/lirc/plugins/* %dir %{python3_sitelib}/lirc -%dir %{python3_sitelib}/lirc/__pycache__ -%{python3_sitelib}/lirc/__pycache__/* -%{python3_sitelib}/lirc/baseview.py -%{python3_sitelib}/lirc/choosers.py -%{python3_sitelib}/lirc/configs -%{python3_sitelib}/lirc/lirc-setup -%{python3_sitelib}/lirc/lirc-setup.ui -%{python3_sitelib}/lirc/mvc_control.py -%{python3_sitelib}/lirc/mvc_model.py -%{python3_sitelib}/lirc/mvc_view.py -#%{python3_sitelib}/lirc/selectors.py +%{python3_sitelib}/lirc/* %dir %{_datadir}/lirc %dir %{_datadir}/lirc/configs %{_datadir}/lirc/configs/* %dir %{_datadir}/lirc/contrib %{_datadir}/lirc/contrib/* -%dir %{_datadir}/lirc/plugindocs -%{_datadir}/lirc/plugindocs/README %{_mandir}/man1/*.1* -%{_mandir}/man4/lirc.4* %{_mandir}/man5/lircd.conf.5* +%{_mandir}/man5/lircrc.5* +%{_mandir}/man8/lircd-setup.8* +%{_mandir}/man8/lircd-uinput.8* %{_mandir}/man8/lircd.8* %{_mandir}/man8/lircmd.8* %{_mandir}/man8/lircrcd.8* -#/var/run/lirc/lircd -#/var/run/lirc/lircm +%dir %{_localstatedir}/lib/lirc +%dir %{_localstatedir}/lib/lirc/images +%{_localstatedir}/lib/lirc/images/* +%dir %{_localstatedir}/lib/lirc/plugins +%{_localstatedir}/lib/lirc/plugins/* %doc AUTHORS COPYING %files devel @@ -168,9 +174,15 @@ fi %{_libdir}/pkgconfig/lirc.pc %dir %{_docdir}/lirc %{_docdir}/lirc/* -#%doc ChangeLog NEWS README TODO +%doc ChangeLog NEWS README %changelog +* Thu Aug 11 2016 Silvan Calarco 0.9.4-1mamba +- update to 0.9.4 + +* Thu Aug 11 2016 Silvan Calarco 0.9.3a-3mamba +- rebuilt with libirman-devel + * Wed Jul 27 2016 Silvan Calarco 0.9.3a-2mamba - move rundir to /run and add tmpfiles.d file