[packages/lirc] - remove incorrect python shebang munging from Makefile (/usr/bin//usr/bin/python3) - rel 8

baggins baggins at pld-linux.org
Sat Mar 6 09:35:02 CET 2021


commit 4a24cf761976abb74b3fbe64409f4480e1e2586b
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Mar 6 09:33:55 2021 +0100

    - remove incorrect python shebang munging from Makefile (/usr/bin//usr/bin/python3)
    - rel 8

 lirc.spec                     |  4 +++-
 no-python-shebang-munge.patch | 23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
---
diff --git a/lirc.spec b/lirc.spec
index 349d9d4..870cf42 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -12,7 +12,7 @@ Summary:	Linux Infrared Remote Control daemons
 Summary(pl.UTF-8):	Demony do zdalnego sterowania Linuksem za pomocą podczerwieni
 Name:		lirc
 Version:	0.10.1
-Release:	7
+Release:	8
 License:	GPL v2+
 Group:		Daemons
 Source0:	http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
@@ -26,6 +26,7 @@ Source5:	%{name}.tmpfiles
 Patch0:		%{name}-tmp.patch
 Patch1:		%{name}-remotes.patch
 Patch2:		%{name}-link.patch
+Patch3:		no-python-shebang-munge.patch
 URL:		http://www.lirc.org/
 BuildRequires:	alsa-lib-devel
 BuildRequires:	autoconf >= 2.50
@@ -148,6 +149,7 @@ Dokumentacja LIRC-a.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 grep -rl /usr/bin/env tools | xargs sed -i -e '1{
 	s,^#!.*bin/env .*python3,#!%{__python3},
diff --git a/no-python-shebang-munge.patch b/no-python-shebang-munge.patch
new file mode 100644
index 0000000..d65ba19
--- /dev/null
+++ b/no-python-shebang-munge.patch
@@ -0,0 +1,23 @@
+--- lirc-0.10.1/tools/Makefile.am~	2021-03-06 09:25:51.000000000 +0100
++++ lirc-0.10.1/tools/Makefile.am	2021-03-06 09:30:25.756693060 +0100
+@@ -100,20 +100,8 @@
+ 	$(SED) -i -e 's/@version@/$(VERSION)/' \
+ 	    $(DESTDIR)$(bindir)/lirc-config-tool \
+ 	    $(DESTDIR)$(bindir)/irdb-get
+-	cd $(DESTDIR)$(bindir);  \
+-	    $(SED) -i '\|^#!/usr/bin/env|s|python3|$(PYTHON)|' \
+-	    irdb-get \
+-	    irtext2udp \
+-	    lirc-init-db \
+-	    pronto2lirc
+-	cd $(DESTDIR)$(sbindir);  \
+-	    $(SED) -i '\|^#!/usr/bin/env|s|python3|$(PYTHON)|' lircd-setup
+-
+ 
+ install-data-hook:
+-	cd $(DESTDIR)/$(setupdir);  \
+-	    $(SED) -i '1s|python3[0-9\.]*|$(PYTHON)|' \
+-	        $(notdir $(dist_setup_SCRIPTS))
+ 	$(PYTHON) $(srcdir)/make_rel_symlink.py \
+ 	    $(DESTDIR)/$(setupdir)/lirc-setup \
+ 	    $(DESTDIR)/$(bindir)/lirc-setup
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lirc.git/commitdiff/4a24cf761976abb74b3fbe64409f4480e1e2586b



More information about the pld-cvs-commit mailing list