From 3a6a164fff0ac3066c33e1c56291039f3139dcd6 Mon Sep 17 00:00:00 2001 From: Alec Leamas Date: Apr 04 2017 08:51:31 +0000 Subject: 0.9.4c-8: Fix missing patches, tracking bug --- diff --git a/0030-doc-Fix-python-import-paths.patch b/0030-doc-Fix-python-import-paths.patch new file mode 100644 index 0000000..7d8d4f7 --- /dev/null +++ b/0030-doc-Fix-python-import-paths.patch @@ -0,0 +1,60 @@ +From ec8704b21b722183af42982c3fa8edf92fee9209 Mon Sep 17 00:00:00 2001 +From: Alec Leamas +Date: Wed, 25 Jan 2017 13:23:23 +0100 +Subject: [PATCH] doc: Fix python import paths. + +--- + doc/Makefile.am | 4 ++-- + doc/data2hwdb | 2 +- + doc/data2table | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 658ea14..777482f 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -135,13 +135,13 @@ $(srcdir)/manpage.xsl: $(abs_builddir)/driver-toc.xsl + + table.html: docpage.xsl + test -e lirc || ln -s $(top_srcdir)/tools/lirc-setup lirc || : +- PYTHONPATH=.:$(top_srcdir)/tools \ ++ PYTHONPATH=.:$(top_srcdir)/tools/lirc-setup:$(top_srcdir)/tools \ + $(PYTHON) $(srcdir)/data2table $(top_srcdir)/configs ../configs \ + | xsltproc --html docpage.xsl - > table.html + + lirc.hwdb: + test -e lirc || ln -s $(top_srcdir)/tools/lirc-setup lirc || : +- PYTHONPATH=.:$(top_srcdir)/tools \ ++ PYTHONPATH=.:$(top_srcdir)/tools/lirc-setup:$(top_srcdir)/tools \ + $(PYTHON) $(srcdir)/data2hwdb $(top_srcdir)/configs ../configs \ + > lirc.hwdb + +diff --git a/doc/data2hwdb b/doc/data2hwdb +index 2f0c1c9..8455f4a 100755 +--- a/doc/data2hwdb ++++ b/doc/data2hwdb +@@ -7,7 +7,7 @@ import os + import sys + import yaml + +-from lirc import database ++import database + + HEADER = ''' + # LIRC - Hardware DataBase +diff --git a/doc/data2table b/doc/data2table +index 05fb1e2..62a1e86 100755 +--- a/doc/data2table ++++ b/doc/data2table +@@ -7,7 +7,7 @@ import os + import sys + import yaml + +-from lirc import database ++import database + + + MENUS = {'home_brew': 'Home-brew serial and parallel devices', +-- +2.9.3 + diff --git a/lirc.spec b/lirc.spec index 8921096..4d3f712 100644 --- a/lirc.spec +++ b/lirc.spec @@ -357,7 +357,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf * Tue Apr 4 2017 Alec Leamas - 0.9.4c-8 - Fix bad include paths causing FTBS in packages using -devel. - Fix bad python import path. -- Fix missing socket activation (upstream #274). +- Fix missing socket activation - #1438702 * Fri Feb 10 2017 Fedora Release Engineering - 0.9.4c-7.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild