- systemd is passe
authorMarcin Krol <hawk@tld-linux.org>
Mon, 27 Apr 2015 06:05:47 +0000 (06:05 +0000)
committerMarcin Krol <hawk@tld-linux.org>
Mon, 27 Apr 2015 06:05:47 +0000 (06:05 +0000)
bluetooth.upstart [deleted file]
bluez.spec

diff --git a/bluetooth.upstart b/bluetooth.upstart
deleted file mode 100644 (file)
index 080c781..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-description "Bluetooth subsystem starting and stopping. Turn HID adapters into Bluetooth ones."
-
-start on pld.sysinit-done
-stop on pld.shutdown-started
-
-script
-       /sbin/udevadm trigger --subsystem-match=bluetooth --action=add
-end script
index 28959552a3a0aa13b9dabf87812f07ea1f28520c..511c05c905be72c9ceb917bc0890e344fe54298d 100644 (file)
@@ -26,13 +26,11 @@ BuildRequires:      rpmbuild(macros) >= 1.682
 BuildRequires: tar >= 1:1.22
 BuildRequires: udev-devel >= 1:172
 BuildRequires: xz
-Requires(post,preun,postun):   systemd-units >= 38
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      dbus-libs >= 1.6
 Requires:      glib2 >= 1:2.28
 Requires:      hwdata >= 0.225
 Requires:      rc-scripts
-Requires:      systemd-units >= 38
 Requires:      udev >= 1:172
 Provides:      bluez-hcidump = %{version}
 Provides:      bluez-utils = %{version}-%{release}
@@ -159,8 +157,7 @@ aplikacji Bluetooth.
        --enable-library \
        --enable-sixaxis \
        --enable-static \
-       --with-systemdsystemunitdir=%{systemdunitdir} \
-       --with-systemduserunitdir=%{systemduserunitdir}
+       --disable-systemd
 
 %{__make} \
        cupsdir=%{cupsdir} \
@@ -195,20 +192,16 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /sbin/chkconfig --add bluetooth
 %service bluetooth restart
-%systemd_post bluetooth.service
 
 %preun
 if [ "$1" = "0" ]; then
        %service bluetooth stop
        /sbin/chkconfig --del bluetooth
 fi
-%systemd_preun bluetooth.service
 
 %postun
-%systemd_reload
 
 %triggerpostun -- bluez < 4.98-3
-%systemd_trigger bluetooth.service
 
 %triggerpostun -- bluez < 5.13-1
 %service rfcomm stop
@@ -250,10 +243,6 @@ fi
 %attr(754,root,root) /etc/rc.d/init.d/bluetooth
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/bluetooth
 %config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/bluetooth.conf
-%{systemdunitdir}/bluetooth.service
-%{systemduserunitdir}/obex.service
-%{_datadir}/dbus-1/services/org.bluez.obex.service
-%{_datadir}/dbus-1/system-services/org.bluez.service
 %attr(755,root,root) %{udevdir}/hid2hci
 %{udevdir}/rules.d/97-hid2hci.rules
 %{_mandir}/man1/bccmd.1*