rpm/bluez
SHA256
1
0
Fork 0
forked from pool/bluez
Code Pull Requests Activity

Accepting request 140261 from Base:System

Browse Source 
- bluez-coldplug init script is forced but it s not needed
  when using systemd with dbus activation. (forwarded request 139864 from elvigia)

OBS-URL: https://build.opensuse.org/request/show/140261
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bluez?expand=0&rev=101
This commit is contained in:
Stephan Kulow 2012-11-10 15:54:15 +00:00 committed by Git OBS Bridge
commit d019d10e56
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bluez.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Oct 31 14:50:01 UTC 2012 - crrodriguez@opensuse.org
- bluez-coldplug init script is forced but it s not needed
when using systemd with dbus activation.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 17 08:52:03 UTC 2012 - fcrozat@suse.com Wed Oct 17 08:52:03 UTC 2012 - fcrozat@suse.com

15
bluez.spec
View File

@ -147,7 +147,7 @@ Authors:
%package test %package test
Summary: Tools for testing of various Bluetooth-functions Summary: Tools for testing of various Bluetooth-functions
License: GPL-2.0+ ; MIT License: GPL-2.0+ and MIT
Group: Development/Tools/Debuggers Group: Development/Tools/Debuggers
Requires: dbus-1-python Requires: dbus-1-python
Requires: libbluetooth3 = %{version} Requires: libbluetooth3 = %{version}
@ -295,7 +295,9 @@ cd ..
rm -v $RPM_BUILD_ROOT/%{_libdir}/*.la rm -v $RPM_BUILD_ROOT/%{_libdir}/*.la
rm -rvf $RPM_BUILD_ROOT/%{_libdir}/gstreamer-* rm -rvf $RPM_BUILD_ROOT/%{_libdir}/gstreamer-*
rm -v $RPM_BUILD_ROOT/%{_libdir}/alsa-lib/*.la rm -v $RPM_BUILD_ROOT/%{_libdir}/alsa-lib/*.la
%if ! 0%{?has_systemd}
install --mode=0755 -D %{S:2} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/bluez-coldplug install --mode=0755 -D %{S:2} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/bluez-coldplug
%endif
install --mode=0644 -D %{S:3} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.bluetooth install --mode=0644 -D %{S:3} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.bluetooth
install --mode=0644 -D %{S:7} $RPM_BUILD_ROOT/%{_sysconfdir}/modprobe.d/50-bluetooth.conf install --mode=0644 -D %{S:7} $RPM_BUILD_ROOT/%{_sysconfdir}/modprobe.d/50-bluetooth.conf
# In openSUSE 11.3 there is upstream compliant CUPS 1.4 # In openSUSE 11.3 there is upstream compliant CUPS 1.4
@ -323,21 +325,25 @@ rm -rf $RPM_BUILD_ROOT
%post %post
%{fillup_only -n bluetooth} %{fillup_only -n bluetooth}
%{insserv_force_if_yast bluez-coldplug}
%if 0%{?has_systemd} %if 0%{?has_systemd}
%service_add_post bluetooth.service %service_add_post bluetooth.service
%else
%{insserv_force_if_yast bluez-coldplug}
%endif %endif
%preun %preun
%stop_on_removal bluez-coldplug
%if 0%{?has_systemd} %if 0%{?has_systemd}
%service_del_preun bluetooth.service %service_del_preun bluetooth.service
%else
%stop_on_removal bluez-coldplug
%endif %endif
%postun %postun
%{insserv_cleanup} %{insserv_cleanup}
%if 0%{?has_systemd} %if 0%{?has_systemd}
%service_del_postun bluetooth.service %service_del_postun bluetooth.service
%else
%{insserv_cleanup}
%endif %endif
%post -n libsbc0 -p /sbin/ldconfig %post -n libsbc0 -p /sbin/ldconfig
@ -374,7 +380,6 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_sysconfdir}/udev/rules.d %dir %{_sysconfdir}/udev/rules.d
%config %{_sysconfdir}/udev/rules.d/* %config %{_sysconfdir}/udev/rules.d/*
%endif %endif
%{_sysconfdir}/init.d/bluez-coldplug
%doc %{_mandir}/man8/hciattach.8.gz %doc %{_mandir}/man8/hciattach.8.gz
%doc %{_mandir}/man8/hciconfig.8.gz %doc %{_mandir}/man8/hciconfig.8.gz
%doc %{_mandir}/man8/bluetoothd.8.gz %doc %{_mandir}/man8/bluetoothd.8.gz
@ -398,6 +403,8 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/modprobe.d/50-bluetooth.conf %config(noreplace) %{_sysconfdir}/modprobe.d/50-bluetooth.conf
%if 0%{?has_systemd} %if 0%{?has_systemd}
%{_unitdir}/bluetooth.service %{_unitdir}/bluetooth.service
%else
%{_sysconfdir}/init.d/bluez-coldplug
%endif %endif
%{_datadir}/dbus-1/system-services/org.bluez.service %{_datadir}/dbus-1/system-services/org.bluez.service