[irda-utils/el6] .
Dmitry Butskoy
buc at fedoraproject.org
Thu Sep 1 16:31:14 UTC 2011
commit 1a3dc477aa956602f2ca352d0bf3cdd1845f22cf
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date: Thu Sep 1 20:30:51 2011 +0400
.
irda-utils.spec | 44 +++++++++++++-------------------------------
irda.service | 16 ----------------
irda.sysconfig | 8 --------
3 files changed, 13 insertions(+), 55 deletions(-)
---
diff --git a/irda-utils.spec b/irda-utils.spec
index 81653d7..35a6ff8 100644
--- a/irda-utils.spec
+++ b/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: 11%{?dist}
Url: http://irda.sourceforge.net
License: GPLv2+
Group: Applications/System
@@ -9,8 +9,6 @@ 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
@@ -18,12 +16,11 @@ 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
-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
@@ -72,13 +69,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 +89,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 +110,19 @@ 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 at Butskoy.name> - 0.9.18-13
-- migrate from SysV to Systemd init system (#694940)
-
-* Fri Jul 15 2011 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.9.18-12
+* Fri Jul 15 2011 Dmitry Butskoy <Dmitry at 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 at lists.fedoraproject.org> - 0.9.18-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
* Tue Oct 20 2009 Orion Poplawski <orion at cora.nwra.com> - 0.9.18-10
- Add patch to fix installing of initscript into buildroot
More information about the scm-commits
mailing list