From 23476bbc8c54e11116d7321307a7672f27ab9b32 Mon Sep 17 00:00:00 2001 From: Alec Leamas Date: Tue, 15 Aug 2017 20:39:25 +0200 Subject: [PATCH] 0.10.0-2 --- ...uild-install-media-lirc.h-BTS-872074.patch | 60 +++++++++++++++++++ lirc.spec | 7 ++- 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 0001-build-install-media-lirc.h-BTS-872074.patch diff --git a/0001-build-install-media-lirc.h-BTS-872074.patch b/0001-build-install-media-lirc.h-BTS-872074.patch new file mode 100644 index 0000000..e442d8a --- /dev/null +++ b/0001-build-install-media-lirc.h-BTS-872074.patch @@ -0,0 +1,60 @@ +From 11e1e9ee6b353c6e7c68f92f89c49d52f396cfc7 Mon Sep 17 00:00:00 2001 +From: Alec Leamas +Date: Mon, 14 Aug 2017 10:31:55 +0200 +Subject: [PATCH] build: install media/lirc.h (BTS #872074). + +The plugin builds references this file. Basically, this should be +resolved by lirc_driver.h, testing if the kernel header is +available and using it if so, but without including config.h + +This fix adds an evil symlink to not remove anything. The proper +fix includes actually moving the file and also streamlining the +HAVE_KERNEL_LIRC_H to the generic HAVE_LINUX_LIRC_H. +--- + Makefile.am | 5 ++++- + configure.ac | 3 +++ + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index aafb4e8..9f3dd14 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -138,12 +138,15 @@ install-data-hook: + $(SED) -i -e '/^plugindir/s|/usr/lib|$(libdir)|' \ + $(DESTDIR)$(lirc_confdir)/lirc_options.conf + cp -pr $(srcdir)/contrib $(DESTDIR)$(pkgdatadir) ++ chmod u+w $(DESTDIR)$(includedir) ++ cd $(DESTDIR)$(includedir)/lirc; ln -s include/media . + + uninstall-hook: + -chmod -R u+w $(DESTDIR)/$(pkgdatadir)/contrib + -rm -rf $(DESTDIR)/$(pkgdatadir) \ + $(DESTDIR)/$(pkgpythondir) \ +- $(DESTDIR)/$(pkgdatadir)/contrib ++ $(DESTDIR)/$(pkgdatadir)/contrib \ ++ $(DESTDIR)$(includedir)/lirc + + dist-hook: ChangeLog fix-version + cp -pr $(srcdir)/contrib $(distdir) +diff --git a/configure.ac b/configure.ac +index 321a61f..4108688 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -511,11 +511,14 @@ AC_DEFINE(LIRC_OPTIONS_VAR, ["LIRC_OPTIONS_PATH"],[ + Environment variable overriding options file path]) + + AH_TOP([ ++#ifndef ROOT_CONFIG_H ++#define ROOT_CONFIG_H + #include "paths.h" + ]) + + AH_BOTTOM([ + #include "lirc/lirc_config.h" ++#endif // ROOT_CONFIG_H + ]) + + dnl write these decisions out to the Makefiles +-- +2.9.3 + diff --git a/lirc.spec b/lirc.spec index f63267a..d4247c6 100644 --- a/lirc.spec +++ b/lirc.spec @@ -6,7 +6,7 @@ Name: lirc Version: 0.10.0 -Release: 1%{?tag:.}%{?tag}%{?dist} +Release: 2%{?tag:.}%{?tag}%{?dist} Summary: The Linux Infrared Remote Control package %global repo http://downloads.sourceforge.net/lirc/LIRC/%{version} @@ -19,6 +19,8 @@ URL: http://www.lirc.org/ 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 + BuildRequires: /usr/bin/xsltproc BuildRequires: alsa-lib-devel @@ -377,6 +379,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf %{_udevrulesdir}/99-remote-control-lirc.rules %changelog +* Tue Aug 15 2017 Alec Leamas - 0.10.0-2 +- Fix Debian BTS 872074, FTBS on external plugins e. g. libirman. + * Sat Aug 12 2017 Alec Leamas - 0.10.0-1 - New upstream release - All patches upstreamed.