re-enable smcinit

irda-utils-0.9.18-smcdisable.patch

@@ -1,24 +0,0 @@
-diff -Nrbu irda-utils-0.9.18/Makefile irda-utils-0.9.18-OK/Makefile
---- irda-utils-0.9.18/Makefile	2011-07-15 20:16:14.000000000 +0400
-+++ irda-utils-0.9.18-OK/Makefile	2011-07-15 20:15:38.000000000 +0400
-@@ -27,7 +27,7 @@
- 
- TARGET = test
- 
--DIRS = irattach irdaping etc man irnetd psion tekram findchip irdadump smcinit
-+DIRS = irattach irdaping etc man irnetd psion tekram findchip irdadump
- CFLAGS = -O2 -W -Wall
- INCLUDES = -I/usr/include/glib-2.0 -I./include -I.
- 
-diff -Nrbu irda-utils-0.9.18/man/Makefile irda-utils-0.9.18-OK/man/Makefile
---- irda-utils-0.9.18/man/Makefile	2006-07-11 10:16:06.000000000 +0400
-+++ irda-utils-0.9.18-OK/man/Makefile	2011-07-15 20:16:01.000000000 +0400
-@@ -18,7 +18,7 @@
- MANPAGES4=irnet.4.gz
- MANPAGES7=irda.7.gz
- MANPAGES8=irattach.8.gz irdaping.8.gz irdadump.8.gz irpsion5.8.gz \
--	findchip.8.gz irnetd.8.gz smcinit.8.gz tosh1800-smcinit.8.gz
-+	findchip.8.gz irnetd.8.gz
- 
- # Man pages generated by DOCBOOK
- SGMLMAN=irattach.8 irdaping.8 irdadump.8 irpsion5.8 findchip.8

irda-utils.spec

@@ -1,7 +1,7 @@
 Summary:         Utilities for infrared communication between devices
 Name:            irda-utils
 Version:         0.9.18
-Release:         13%{?dist}
+Release:         12%{?dist}
 Url:             http://irda.sourceforge.net
 License:         GPLv2+
 Group:           Applications/System
@@ -9,21 +9,17 @@ BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:     s390 s390x
 Source0: http://downloads.sourceforge.net/irda/%{name}/%{version}/%{name}-%{version}.tar.gz
 Source1: irda.init
-Source2: irda.service
-Source3: irda.sysconfig
 Patch1: irda-utils-0.9.17-rootonly.patch
 Patch2: irda-utils-0.9.15-rh1.patch
 Patch3: irda-utils-0.9.16-io.patch
 Patch4: irda-utils-0.9.17-makefile.patch
-Patch5: irda-utils-0.9.18-smcdisable.patch
 Patch6: irda-utils-0.9.18-root.patch
 Patch7: irda-utils-0.9.18-man.patch
-BuildRequires: glib2-devel
-BuildRequires: systemd-units
+BuildRequires:   glib2-devel, pciutils-devel
 
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig, /sbin/service
+Requires(postun): /sbin/service
 
 
 %description
@@ -50,7 +46,6 @@ actually implemented outside the kernel.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 %patch6 -p1
 gunzip man/irnet.4.gz man/irda.7.gz
 %patch7 -p1
@@ -72,13 +67,8 @@ done
 
 make install  ROOT="$RPM_BUILD_ROOT" MANDIR="$RPM_BUILD_ROOT/%{_mandir}"
 
-#install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/irda
-#chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/irda
-rm -f $RPM_BUILD_ROOT/%{_initrddir}/irda
-
-install -d $RPM_BUILD_ROOT%{_unitdir}
-install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/irda.service
-install -p -m644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/irda
+install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/irda
+chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/irda
 
 rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/network-scripts/ifcfg-irlan0
 
@@ -97,22 +87,19 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post
-if [ $1 = 1 ]; then
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+/sbin/chkconfig --add irda
 
 
 %preun
 if [ $1 = 0 ]; then
-    /bin/systemctl --no-reload disable irda.service >/dev/null 2>&1 || :
-    /bin/systemctl stop irda.service >/dev/null 2>&1 || :
+   /sbin/service irda stop >/dev/null 2>&1
+   /sbin/chkconfig --del irda
 fi
 
 
 %postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
 if [ $1 != 0 ]; then
-    /bin/systemctl try-restart irda.service >/dev/null 2>&1 || :
+   /sbin/service irda condrestart >/dev/null 2>&1
 fi
 
 
@@ -121,26 +108,22 @@ fi
 %{_sbindir}/*
 %{_bindir}/*
 %{_mandir}/*/*
-#%{_initrddir}/irda
-%{_unitdir}/*
+%{_initrddir}/irda
 %config(noreplace) %{_sysconfdir}/sysconfig/irda
 %doc README* etc/ifcfg-irlan0 etc/modprobe.conf.irda
 
 
 %changelog
-* Mon Jul 18 2011 Dmitry Butskoy <Dmitry@Butskoy.name> - 0.9.18-13
-- migrate from SysV to Systemd init system (#694940)
+* Tue Feb 14 2017 Dmitry Butskoy <Dmitry@Butskoy.name> - 0.9.18-12
+- re-enable smcinit (#1421387)
 
-* Fri Jul 15 2011 Dmitry Butskoy <Dmitry@Butskoy.name> - 0.9.18-12
+* Fri Jul 15 2011 Dmitry Butskoy <Dmitry@Butskoy.name> - 0.9.18-11
 - spec file cleanup
 - add own init script instead of huge patched original one
   (and fix #242468)
 - disable smcinit manuals in smcdisable patch as well
 - fix typos in man pages (#668122, #675677)
 
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.18-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
 * Tue Oct 20 2009 Orion Poplawski <orion@cora.nwra.com> - 0.9.18-10
 - Add patch to fix installing of initscript into buildroot
 

irda.service

@@ -1,16 +0,0 @@
-[Unit]
-Description=Irda Support
-After=syslog.target
-
-[Service]
-Type=forking
-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=syslog
-StandardError=syslog
-
-
-[Install]
-WantedBy=multi-user.target

irda.sysconfig

@@ -1,8 +0,0 @@
-# Either a tty name, or IrDA interface name, or FIR module name.
-# See irattach(8) for more info
-DEVICE=/dev/ttyS2
-
-# `-s' starts discovery of remote devices
-# `-d dongle' attaches an additional dongle driver `dobgle' to the IrDA port
-#OPTIONS="-s -d actisys+"
-OPTIONS="-s"