[bluez/f14/master] Re-add sysv script
Bill Nottingham
notting at fedoraproject.org
Thu Sep 16 15:24:54 UTC 2010
commit 76f86291fd3546266e46100576d20c7410a0dd9e
Author: Bill Nottingham <notting at redhat.com>
Date: Thu Sep 16 11:22:48 2010 -0400
Re-add sysv script
bluez.spec | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/bluetooth.init b/bluetooth.init
old mode 100644
new mode 100755
diff --git a/bluez.spec b/bluez.spec
index 8cc03eb..fc7e76e 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -1,10 +1,11 @@
Summary: Bluetooth utilities
Name: bluez
Version: 4.71
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+
Group: Applications/System
Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
+Source1: bluetooth.init
Source3: dund.init
Source4: dund.conf
Source5: pand.init
@@ -149,7 +150,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la \
$RPM_BUILD_ROOT/%{_libdir}/bluetooth/plugins/*.la \
$RPM_BUILD_ROOT/%{_libdir}/gstreamer-0.10/*.la
-for a in dund pand rfcomm ; do
+for a in bluetooth dund pand rfcomm ; do
install -D -m0755 $RPM_SOURCE_DIR/$a.init $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/$a
if [ -e $RPM_SOURCE_DIR/$a.conf ] ; then
install -D -m0644 $RPM_SOURCE_DIR/$a.conf $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/$a
@@ -165,6 +166,7 @@ fi
rm -f ${RPM_BUILD_ROOT}/%{_sysconfdir}/udev/*.rules ${RPM_BUILD_ROOT}/lib/udev/rules.d/*.rules
install -D -m0644 scripts/bluetooth-serial.rules ${RPM_BUILD_ROOT}/%{_sysconfdir}/udev/rules.d/97-bluetooth-serial.rules
install -D -m0755 scripts/bluetooth_serial ${RPM_BUILD_ROOT}/lib/udev/bluetooth_serial
+install -D -m0644 scripts/97-bluetooth.rules ${RPM_BUILD_ROOT}/lib/udev/rules.d/97-bluetooth.rules
install -D -m0755 %{SOURCE8} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/modules/bluez-uinput.modules
@@ -176,14 +178,18 @@ rm -rf $RPM_BUILD_ROOT
%post libs -p /sbin/ldconfig
%post
+/sbin/chkconfig --add bluetooth
if [ $1 -eq 1 ]; then
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
fi
+exit 0
%postun libs -p /sbin/ldconfig
%preun
if [ $1 -eq 0 ]; then
+ /sbin/service bluetooth stop >/dev/null 2>&1 || :
+ /sbin/chkconfig --del bluetooth
/bin/systemctl disable bluetooth.service >/dev/null 2>&1 || :
/bin/systemctl stop bluetooth.service >/dev/null 2>&1 || :
fi
@@ -191,7 +197,7 @@ fi
%postun
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ] ; then
- /bin/systemctl try-restart bluetooth.service >/dev/null 2>&1 || :
+ /sbin/service bluetooth condrestart >/dev/null 2>&1 || :
fi
%triggerun -- bluez < 4.71-2
@@ -241,7 +247,9 @@ fi
%config %{_sysconfdir}/dbus-1/system.d/bluetooth.conf
%{_libdir}/bluetooth/
/lib/udev/bluetooth_serial
+/lib/udev/rules.d/97-bluetooth.rules
%{_sysconfdir}/udev/rules.d/97-bluetooth-serial.rules
+%{_sysconfdir}/rc.d/init.d/bluetooth
%{_localstatedir}/lib/bluetooth
/lib/systemd/system/bluetooth.service
%{_datadir}/dbus-1/system-services/org.bluez.service
@@ -287,6 +295,9 @@ fi
%{_mandir}/man1/pand.1.gz
%changelog
+* Thu Sep 16 2010 Bill Nottingham <notting at redhat.com> 4.71-4
+- re-add sysv script
+
* Tue Sep 14 2010 Bastien Nocera <bnocera at redhat.com> 4.71-3
- Clean up systemd hookup
More information about the scm-commits
mailing list