diff --git a/irda-utils-0.9.18-run.patch b/irda-utils-0.9.18-run.patch deleted file mode 100644 index aa67ea7..0000000 --- a/irda-utils-0.9.18-run.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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-0.9.18-sbin.patch b/irda-utils-0.9.18-sbin.patch deleted file mode 100644 index 55e8b70..0000000 --- a/irda-utils-0.9.18-sbin.patch +++ /dev/null @@ -1,123 +0,0 @@ -diff -Nrbu irda-utils-0.9.18/README irda-utils-0.9.18-OK/README ---- irda-utils-0.9.18/README 2006-07-11 10:16:06.000000000 +0400 -+++ irda-utils-0.9.18-OK/README 2025-01-23 18:58:15.456409010 +0300 -@@ -28,7 +28,7 @@ - - First of all you need to install the tools in this package. Make and - make install should do that for you. By default it will install the --files in /etc/irda, and in /usr/sbin. If you don't like that, you -+files in /etc/irda, and in /usr/bin. If you don't like that, you - should edit the makefile. - - 2.2 irattach -diff -Nrbu irda-utils-0.9.18/etc/irda.rc irda-utils-0.9.18-OK/etc/irda.rc ---- irda-utils-0.9.18/etc/irda.rc 2006-07-11 10:16:06.000000000 +0400 -+++ irda-utils-0.9.18-OK/etc/irda.rc 2025-01-23 18:59:07.746012761 +0300 -@@ -17,7 +17,7 @@ - # Check that irda is up. - [ ${IRDA} = "no" ] && exit 0 - --[ -f /usr/sbin/irattach ] || exit 0 -+[ -f /usr/bin/irattach ] || exit 0 - - ARGS= - if [ $DONGLE ]; then -@@ -32,7 +32,7 @@ - start) - # Attach irda device - echo -n "Starting IrDA: " -- daemon /usr/sbin/irattach ${DEVICE} ${ARGS} -+ daemon /usr/bin/irattach ${DEVICE} ${ARGS} - touch /var/lock/subsys/irda - echo - ;; -diff -Nrbu irda-utils-0.9.18/findchip/Makefile irda-utils-0.9.18-OK/findchip/Makefile ---- irda-utils-0.9.18/findchip/Makefile 2025-01-23 18:49:11.278515528 +0300 -+++ irda-utils-0.9.18-OK/findchip/Makefile 2025-01-23 18:58:49.747149179 +0300 -@@ -60,7 +60,7 @@ - - install: findchip - $(prn_install) -- $(ECMD)install findchip $(ROOT)/usr/sbin/ -+ $(ECMD)install findchip $(ROOT)/usr/bin/ - - - gfindchip: gfindchip.c -diff -Nrbu irda-utils-0.9.18/irattach/Makefile irda-utils-0.9.18-OK/irattach/Makefile ---- irda-utils-0.9.18/irattach/Makefile 2025-01-23 18:49:11.278515528 +0300 -+++ irda-utils-0.9.18-OK/irattach/Makefile 2025-01-23 19:00:28.246402814 +0300 -@@ -60,8 +60,8 @@ - - install: $(TARGETS) - $(prn_install) -- $(ECMD)install irattach $(ROOT)/usr/sbin -- $(ECMD)install dongle_attach $(ROOT)/usr/sbin -+ $(ECMD)install irattach $(ROOT)/usr/bin -+ $(ECMD)install dongle_attach $(ROOT)/usr/bin - - - clean: -diff -Nrbu irda-utils-0.9.18/irattach/irattach.c irda-utils-0.9.18-OK/irattach/irattach.c ---- irda-utils-0.9.18/irattach/irattach.c 2025-01-23 18:49:11.285515475 +0300 -+++ irda-utils-0.9.18-OK/irattach/irattach.c 2025-01-23 19:00:18.207478893 +0300 -@@ -262,7 +262,7 @@ - int ret; - - sprintf(msg, "Trying to load module %s", name); -- sprintf(cmd, "/sbin/modprobe %s", name); -+ sprintf(cmd, "modprobe %s", name); - - ret = execute(msg, cmd); - -diff -Nrbu irda-utils-0.9.18/irdadump/Makefile irda-utils-0.9.18-OK/irdadump/Makefile ---- irda-utils-0.9.18/irdadump/Makefile 2025-01-23 18:49:11.278515528 +0300 -+++ irda-utils-0.9.18-OK/irdadump/Makefile 2025-01-23 18:58:43.057199840 +0300 -@@ -50,7 +50,7 @@ - - install: $(IRDADUMP_TARGET) - $(prn_install) -- $(ECMD)install $(IRDADUMP_TARGET) $(ROOT)/usr/sbin -+ $(ECMD)install $(IRDADUMP_TARGET) $(ROOT)/usr/bin - - clean: - $(RM_CMD) -diff -Nrbu irda-utils-0.9.18/irdaping/Makefile irda-utils-0.9.18-OK/irdaping/Makefile ---- irda-utils-0.9.18/irdaping/Makefile 2025-01-23 18:49:11.278515528 +0300 -+++ irda-utils-0.9.18-OK/irdaping/Makefile 2025-01-23 19:00:00.446613473 +0300 -@@ -65,7 +65,7 @@ - - install: $(TARGETS) - $(prn_install) -- $(ECMD)install irdaping $(ROOT)/usr/sbin -+ $(ECMD)install irdaping $(ROOT)/usr/bin - - clean: - $(RM_CMD) -diff -Nrbu irda-utils-0.9.18/irnetd/Makefile irda-utils-0.9.18-OK/irnetd/Makefile ---- irda-utils-0.9.18/irnetd/Makefile 2025-01-23 18:49:11.279515520 +0300 -+++ irda-utils-0.9.18-OK/irnetd/Makefile 2025-01-23 18:58:29.216304738 +0300 -@@ -55,7 +55,7 @@ - - install: irnetd - $(prn_install) -- $(ECMD) install irnetd $(ROOT)/usr/sbin/ -+ $(ECMD) install irnetd $(ROOT)/usr/bin/ - - - clean: -diff -Nrbu irda-utils-0.9.18/smcinit/Makefile irda-utils-0.9.18-OK/smcinit/Makefile ---- irda-utils-0.9.18/smcinit/Makefile 2006-07-11 10:16:06.000000000 +0400 -+++ irda-utils-0.9.18-OK/smcinit/Makefile 2025-01-23 18:59:49.557695945 +0300 -@@ -45,9 +45,9 @@ - - install: $(SMCINIT_TARGETS) - $(prn_install) -- $(ECMD)install smcinit $(ROOT)/usr/sbin -- $(ECMD)install tosh1800-smcinit $(ROOT)/usr/sbin -- $(ECMD)install tosh2450-smcinit $(ROOT)/usr/sbin -+ $(ECMD)install smcinit $(ROOT)/usr/bin -+ $(ECMD)install tosh1800-smcinit $(ROOT)/usr/bin -+ $(ECMD)install tosh2450-smcinit $(ROOT)/usr/bin - - clean: - $(RM_CMD) diff --git a/irda-utils.spec b/irda-utils.spec index 7af8a05..974a894 100644 --- a/irda-utils.spec +++ b/irda-utils.spec @@ -3,10 +3,10 @@ Summary: Utilities for infrared communication between devices Name: irda-utils Version: 0.9.18 -Release: 52%{?dist} +Release: 33%{?dist} Url: http://irda.sourceforge.net -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later +License: GPLv2+ +Group: Applications/System ExcludeArch: s390 s390x Source0: http://downloads.sourceforge.net/irda/%{name}/%{version}/%{name}-%{version}.tar.gz Source1: irda.init @@ -20,12 +20,9 @@ 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 -Patch11: irda-utils-0.9.18-sbin.patch BuildRequires: gcc BuildRequires: glib2-devel, pciutils-devel BuildRequires: systemd-units -BuildRequires: make Requires(post): systemd-units Requires(preun): systemd-units @@ -52,18 +49,16 @@ actually implemented outside the kernel. %prep %setup -q -%patch -P1 -p1 -%patch -P2 -p1 -%patch -P3 -p1 -%patch -P4 -p1 -%patch -P6 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch6 -p1 gunzip man/irnet.4.gz man/irda.7.gz -%patch -P7 -p1 +%patch7 -p1 gzip -9 man/irnet.4 man/irda.7 -%patch -P8 -p1 -%patch -P9 -p1 -%patch -P10 -p1 -%patch -P11 -p1 +%patch8 -p1 +%patch9 -p1 %build @@ -76,7 +71,7 @@ make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS -std=gnu89" ROOT="$RPM_BUILD_ROOT" \ %install rm -rf $RPM_BUILD_ROOT -for dir in %{_bindir} %{_initrddir} %{_sysconfdir}/sysconfig +for dir in %{_sbindir} %{_bindir} %{_initrddir} %{_sysconfdir}/sysconfig do install -d $RPM_BUILD_ROOT$dir done @@ -117,6 +112,7 @@ chmod -x etc/ifcfg-irlan0 %files +%{_sbindir}/* %{_bindir}/* %{_mandir}/*/* %{_unitdir}/* @@ -125,64 +121,6 @@ chmod -x etc/ifcfg-irlan0 %changelog -* Thu Jul 24 2025 Fedora Release Engineering - 0.9.18-52 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 23 2025 Dmitry Butskoy - 0.9.18-51 -- Use /usr/bin instead of /usr/sbin (#2340661) - -* Fri Jan 17 2025 Fedora Release Engineering - 0.9.18-50 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 26 2024 Miroslav Suchý - 0.9.18-49 -- convert license to SPDX - -* Thu Jul 18 2024 Fedora Release Engineering - 0.9.18-48 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jan 24 2024 Fedora Release Engineering - 0.9.18-47 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jan 20 2024 Fedora Release Engineering - 0.9.18-46 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jul 20 2023 Fedora Release Engineering - 0.9.18-45 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 0.9.18-44 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 0.9.18-43 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 0.9.18-42 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 0.9.18-41 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 17 2021 Dmitry Butskoy - 0.9.18-40 -- move /var/run to /run and fix systemd service file (#1960900) - -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 0.9.18-39 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - -* Tue Jan 26 2021 Fedora Release Engineering - 0.9.18-38 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 0.9.18-37 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jan 29 2020 Fedora Release Engineering - 0.9.18-36 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 0.9.18-35 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 0.9.18-34 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - * Fri Jul 13 2018 Fedora Release Engineering - 0.9.18-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/irda.service b/irda.service index 85ec7bb..ad48ef4 100644 --- a/irda.service +++ b/irda.service @@ -4,12 +4,12 @@ After=syslog.target [Service] Type=forking -PIDFile=/run/irattach.pid +PIDFile=/var/run/irattach.pid EnvironmentFile=-/etc/sysconfig/irda ExecStartPre=-/sbin/modprobe -qab ircomm-tty irtty-sir irnet ExecStart=/usr/sbin/irattach ${DEVICE} ${OPTIONS} -StandardOutput=journal -StandardError=journal +StandardOutput=syslog +StandardError=syslog [Install]