From 239d1a1d82750a5f9a53b8da69013a5886a5a9c1 Mon Sep 17 00:00:00 2001 From: Alec Leamas Date: Fri, 12 Oct 2018 21:07:45 +0200 Subject: [PATCH] 0.10.0-13: Add fix for lirc-setup crash on start. --- ...rash-on-start-on-missing-lirc.config.patch | 25 +++++++++++++++++++ lirc.spec | 6 ++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 0002-lirc-setup-Fix-crash-on-start-on-missing-lirc.config.patch diff --git a/0002-lirc-setup-Fix-crash-on-start-on-missing-lirc.config.patch b/0002-lirc-setup-Fix-crash-on-start-on-missing-lirc.config.patch new file mode 100644 index 0000000..b716d7a --- /dev/null +++ b/0002-lirc-setup-Fix-crash-on-start-on-missing-lirc.config.patch @@ -0,0 +1,25 @@ +From d64c949fd95f5ce4c7dedaba98e07af2f0bc8c35 Mon Sep 17 00:00:00 2001 +From: Alec Leamas +Date: Fri, 12 Oct 2018 20:49:58 +0200 +Subject: [PATCH] lirc-setup: Fix crash on start on missing lirc.config. + +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index aafb4e8ca..22106c496 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -80,7 +80,7 @@ py_PYTHON = python-pkg/lirc/__init__.py \ + python-pkg/lirc/database.py \ + python-pkg/lirc/paths.py + +-nodist_py_pkg_PYTHON = python-pkg/lirc/config.py ++nodist_py_PYTHON = python-pkg/lirc/config.py + + if HAVE_PYTHON35 + py_PYTHON += python-pkg/lirc/async_client.py \ +-- +2.14.4 + diff --git a/lirc.spec b/lirc.spec index 887fb03..7a8d2a6 100644 --- a/lirc.spec +++ b/lirc.spec @@ -6,7 +6,7 @@ Name: lirc Version: 0.10.0 -Release: 12%{?tag:.}%{?tag}%{?dist} +Release: 13%{?tag:.}%{?tag}%{?dist} Summary: The Linux Infrared Remote Control package %global repo http://downloads.sourceforge.net/lirc/LIRC/%{version} @@ -20,6 +20,7 @@ Source0: %{?released:%{repo}%{?tag:-}%{?tag}/}%{tarball} Source1: README.fedora Source2: 99-remote-control-lirc.rules Patch1: 0001-build-install-media-lirc.h-BTS-872074.patch +Patch2: 0002-lirc-setup-Fix-crash-on-start-on-missing-lirc.config.patch BuildRequires: gcc-c++ @@ -383,6 +384,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf %{_udevrulesdir}/99-remote-control-lirc.rules %changelog +* Fri Oct 12 2018 Alec Leamas - 0.10.0-13 +- Added patch for lirc-setup crash on startup. + * Fri Jul 13 2018 Fedora Release Engineering - 0.10.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild