[bluez/f14/master] - Clean up systemd hookup

[Bastien Nocera]

commit ab04f06eb0f4ee97c7c98d8d86dd86e596d2f485
Author: Bastien Nocera <hadess at hadess.net>
Date:   Tue Sep 14 11:39:27 2010 +0100

    - Clean up systemd hookup

 bluez.spec |   23 +++++------------------
 1 files changed, 5 insertions(+), 18 deletions(-)
---
diff --git a/bluez.spec b/bluez.spec
index 9e83cca..8cc03eb 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -1,11 +1,10 @@
 Summary: Bluetooth utilities
 Name: bluez
 Version: 4.71
-Release: 2%{?dist}
+Release: 3%{?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
@@ -150,7 +149,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 bluetooth dund pand rfcomm ; do
+for a in 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
@@ -166,26 +165,17 @@ 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
 
 install -d -m0755 $RPM_BUILD_ROOT/%{_localstatedir}/lib/bluetooth
 
-rm -f $RPM_BUILD_ROOT/lib/udev/rules.d/97-bluetooth.rules
-rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/bluetooth
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post libs -p /sbin/ldconfig
 
 %post
-#/sbin/chkconfig --add bluetooth
-#if [ "$1" -ge "1" ]; then
-#	/sbin/service bluetooth condrestart >/dev/null 2>&1 || :
-#fi
-#exit 0
 if [ $1 -eq 1 ]; then
         /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 fi
@@ -193,10 +183,6 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %preun
-#if [ "$1" = "0" ]; then
-#	/sbin/service bluetooth stop >/dev/null 2>&1 || :
-#	/sbin/chkconfig --del bluetooth
-#fi
 if [ $1 -eq 0 ]; then
         /bin/systemctl disable bluetooth.service >/dev/null 2>&1 || :
         /bin/systemctl stop bluetooth.service >/dev/null 2>&1 || :
@@ -255,9 +241,7 @@ 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
@@ -303,6 +287,9 @@ fi
 %{_mandir}/man1/pand.1.gz
 
 %changelog
+* Tue Sep 14 2010 Bastien Nocera <bnocera at redhat.com> 4.71-3
+- Clean up systemd hookup
+
 * Mon Sep 13 2010 Lennart Poettering <lpoetter at redhat.com> - 4.71-2
 - systemd hookup