Hello community, here is the log from the commit of package bluez for openSUSE:Factory checked in at 2012-11-10 16:54:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bluez (Old) and /work/SRC/openSUSE:Factory/.bluez.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bluez", Maintainer is "ACho@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/bluez/bluez.changes 2012-10-26 07:42:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bluez.new/bluez.changes 2012-11-10 16:54:16.000000000 +0100 @@ -1,0 +2,6 @@ +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. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez.spec ++++++ --- /var/tmp/diff_new_pack.fly6b1/_old 2012-11-10 16:54:17.000000000 +0100 +++ /var/tmp/diff_new_pack.fly6b1/_new 2012-11-10 16:54:17.000000000 +0100 @@ -147,7 +147,7 @@ %package test Summary: Tools for testing of various Bluetooth-functions -License: GPL-2.0+ ; MIT +License: GPL-2.0+ and MIT Group: Development/Tools/Debuggers Requires: dbus-1-python Requires: libbluetooth3 = %{version} @@ -295,7 +295,9 @@ rm -v $RPM_BUILD_ROOT/%{_libdir}/*.la rm -rvf $RPM_BUILD_ROOT/%{_libdir}/gstreamer-* 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 +%endif 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 # In openSUSE 11.3 there is upstream compliant CUPS 1.4 @@ -323,21 +325,25 @@ %post %{fillup_only -n bluetooth} -%{insserv_force_if_yast bluez-coldplug} %if 0%{?has_systemd} %service_add_post bluetooth.service +%else +%{insserv_force_if_yast bluez-coldplug} %endif %preun -%stop_on_removal bluez-coldplug %if 0%{?has_systemd} %service_del_preun bluetooth.service +%else +%stop_on_removal bluez-coldplug %endif %postun %{insserv_cleanup} %if 0%{?has_systemd} %service_del_postun bluetooth.service +%else +%{insserv_cleanup} %endif %post -n libsbc0 -p /sbin/ldconfig @@ -374,7 +380,6 @@ %dir %{_sysconfdir}/udev/rules.d %config %{_sysconfdir}/udev/rules.d/* %endif -%{_sysconfdir}/init.d/bluez-coldplug %doc %{_mandir}/man8/hciattach.8.gz %doc %{_mandir}/man8/hciconfig.8.gz %doc %{_mandir}/man8/bluetoothd.8.gz @@ -398,6 +403,8 @@ %config(noreplace) %{_sysconfdir}/modprobe.d/50-bluetooth.conf %if 0%{?has_systemd} %{_unitdir}/bluetooth.service +%else +%{_sysconfdir}/init.d/bluez-coldplug %endif %{_datadir}/dbus-1/system-services/org.bluez.service -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org