From bb3e8f36d1f2672e86f051b2ed1e3c081eb6af21 Mon Sep 17 00:00:00 2001
From: Dmitry Butskoy <dmitry@butskoy.name>
Date: Mon, 17 May 2021 02:10:41 +0300
Subject: [PATCH] Fix #1960900

---
 irda-utils-0.9.18-run.patch | 11 +++++++++++
 irda-utils.spec             | 11 ++++++++++-
 irda.service                |  6 +++---
 3 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 irda-utils-0.9.18-run.patch

diff --git a/irda-utils-0.9.18-run.patch b/irda-utils-0.9.18-run.patch
new file mode 100644
index 0000000..aa67ea7
--- /dev/null
+++ b/irda-utils-0.9.18-run.patch
@@ -0,0 +1,11 @@
+--- irda-utils-0.9.18/irattach/irattach.c.orig	2021-05-17 01:58:48.781587723 +0300
++++ irda-utils-0.9.18/irattach/irattach.c	2021-05-17 02:01:21.738344238 +0300
+@@ -68,7 +68,7 @@
+ static int termvalid = -1;	/* If termsave is valid */
+ 
+ /* Default path for pid file */
+-char *pidfile = "/var/run/irattach.pid";
++char *pidfile = "/run/irattach.pid";
+ 
+ /* Used by ioctl to the tty to obtain the network device name */
+ struct irtty_info {
diff --git a/irda-utils.spec b/irda-utils.spec
index e3bb002..35f5574 100644
--- a/irda-utils.spec
+++ b/irda-utils.spec
@@ -3,7 +3,7 @@
 Summary:         Utilities for infrared communication between devices
 Name:            irda-utils
 Version:         0.9.18
-Release:         38%{?dist}
+Release:         40%{?dist}
 Url:             http://irda.sourceforge.net
 License:         GPLv2+
 ExcludeArch:     s390 s390x
@@ -19,6 +19,7 @@ Patch6: irda-utils-0.9.18-root.patch
 Patch7: irda-utils-0.9.18-man.patch
 Patch8: irda-utils-0.9.18-PIE.patch
 Patch9: irda-utils-0.9.18-no-inline.patch
+Patch10: irda-utils-0.9.18-run.patch
 BuildRequires: gcc
 BuildRequires: glib2-devel, pciutils-devel
 BuildRequires: systemd-units
@@ -59,6 +60,7 @@ gunzip man/irnet.4.gz man/irda.7.gz
 gzip -9 man/irnet.4 man/irda.7
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 
 %build
@@ -121,6 +123,13 @@ chmod -x etc/ifcfg-irlan0
 
 
 %changelog
+* Mon May 17 2021 Dmitry Butskoy <Dmitry@Butskoy.name> - 0.9.18-40
+- move /var/run to /run and fix systemd service file (#1960900)
+
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.9.18-39
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.18-38
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/irda.service b/irda.service
index ad48ef4..85ec7bb 100644
--- a/irda.service
+++ b/irda.service
@@ -4,12 +4,12 @@ After=syslog.target
 
 [Service]
 Type=forking
-PIDFile=/var/run/irattach.pid
+PIDFile=/run/irattach.pid
 EnvironmentFile=-/etc/sysconfig/irda
 ExecStartPre=-/sbin/modprobe -qab ircomm-tty irtty-sir irnet
 ExecStart=/usr/sbin/irattach ${DEVICE} ${OPTIONS}
-StandardOutput=syslog
-StandardError=syslog
+StandardOutput=journal
+StandardError=journal
 
 
 [Install]