Hello community,
here is the log from the commit of package bluez for openSUSE:Factory checked in at 2013-01-29 10:27:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2013-01-22 14:59:18.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.bluez.new/bluez.changes 2013-01-29 10:27:15.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Jan 21 11:16:34 UTC 2013 - dimstar@opensuse.org
+
+- Unconditionally enable the systemd bluetooth service (actual
+ activation of bluez is triggered by udev) (bnc#796671).
+- Run spec-cleaner.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bluez.spec ++++++
--- /var/tmp/diff_new_pack.F9Wjel/_old 2013-01-29 10:27:17.000000000 +0100
+++ /var/tmp/diff_new_pack.F9Wjel/_new 2013-01-29 10:27:17.000000000 +0100
@@ -18,32 +18,20 @@
Name: bluez
-BuildRequires: dbus-1-devel >= 1.4
BuildRequires: flex
BuildRequires: libcap-ng-devel
+BuildRequires: pkgconfig(dbus-1) >= 1.4
%if 0%{?suse_version} > 1140
BuildRequires: systemd
%{?systemd_requires}
%define has_systemd 1
%endif
-BuildRequires: alsa-devel
-BuildRequires: automake
-BuildRequires: check-devel
-BuildRequires: glib2-devel >= 2.28
-BuildRequires: libsndfile-devel
-BuildRequires: libtool
-BuildRequires: libudev-devel
-BuildRequires: libusb-devel
-BuildRequires: pkg-config
-BuildRequires: readline-devel
-BuildRequires: udev
-BuildRequires: pkgconfig(libnl-1)
-Url: http://www.bluez.org
Version: 4.101
Release: 0
Summary: Bluetooth Stack for Linux
License: GPL-2.0+
Group: Hardware/Mobile
+Url: http://www.bluez.org
Source: bluez-%{version}.tar.bz2
Source2: bluez-coldplug.init
Source3: bluetooth.sysconfig
@@ -52,13 +40,25 @@
Source7: bluetooth.modprobe
# already fixed upstream
Patch0: 0001-network-fix-network-Connect-method-parameters.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: alsa-devel
+BuildRequires: automake
+BuildRequires: check-devel
+BuildRequires: libsndfile-devel
+BuildRequires: libtool
+BuildRequires: libudev-devel
+BuildRequires: libusb-devel
+BuildRequires: pkg-config
+BuildRequires: readline-devel
+BuildRequires: udev
+BuildRequires: pkgconfig(glib-2.0) >= 2.28
+BuildRequires: pkgconfig(libnl-1)
+Requires: libbluetooth3 = %{version}
+Recommends: sbc
Provides: bluez-utils = 3.36
Obsoletes: bluez-utils <= 3.36
Provides: bluez-audio = 3.36
Obsoletes: bluez-audio <= 3.36
-Requires: libbluetooth3 = %{version}
-Recommends: sbc
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %( echo `rpm -q --queryformat %%{version} udev` ) < 144
%define OLD_UDEV 1
%else
@@ -82,13 +82,6 @@
%description
The Bluetooth stack for Linux.
-
-
-Authors:
---------
- Marcel Holtmann
- and others, see AUTHORS
-
%package devel
Summary: Files needed for BlueZ development
License: GPL-2.0+
@@ -99,13 +92,6 @@
Files needed to develop applications for the BlueZ Bluetooth protocol
stack.
-
-
-Authors:
---------
- Marcel Holtmann
- and others, see AUTHORS
-
%package -n libbluetooth3
Summary: Bluetooth Libraries
License: GPL-2.0+
@@ -116,13 +102,6 @@
%description -n libbluetooth3
Bluetooth protocol stack libraries.
-
-
-Authors:
---------
- Marcel Holtmann
- and others, see AUTHORS in the documentation of the "bluez" package.
-
%package cups
Summary: CUPS Driver for Bluetooth Printers
License: GPL-2.0+
@@ -133,13 +112,6 @@
Contains the files required by CUPS for printing to Bluetooth-connected
printers.
-
-
-Authors:
---------
- Marcel Holtmann
- and others, see AUTHORS in the documentation of the "bluez" package.
-
%package test
Summary: Tools for testing of various Bluetooth-functions
License: GPL-2.0+ and MIT
@@ -152,32 +124,18 @@
Contains a few tools for testing various bluetooth functions. The
BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., U.S.A.
-
-
-Authors:
---------
- Marcel Holtmann
- and others, see AUTHORS in the documentation of the "bluez" package.
-
%package alsa
Summary: Bluetooth Sound Support
License: GPL-2.0+
Group: Productivity/Multimedia/Sound/Utilities
Requires: libbluetooth3 = %{version}
-Provides: bluez-audio:%_libdir/alsa-lib/libasound_module_pcm_bluetooth.so
+Provides: bluez-audio:%{_libdir}/alsa-lib/libasound_module_pcm_bluetooth.so
%description alsa
The package contains libraries for using bluetooth audio services.
The BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., USA.
-
-
-Authors:
---------
- Marcel Holtmann
- and others, see AUTHORS in the documentation of the "bluez" package.
-
%package compat
Summary: Bluetooth Stack for Linux
License: GPL-2.0+
@@ -188,17 +146,10 @@
The Bluetooth stack for Linux. This package contains older and partly
deprecated binaries that might still be needed for compatibility.
-
-
-Authors:
---------
- Marcel Holtmann
- and others, see AUTHORS
-
%prep
%setup -q
%patch0 -p1
-cp %{S:6} .
+cp %{SOURCE6} .
mkdir dbus-apis
cp -a doc/*.txt dbus-apis/
@@ -227,7 +178,7 @@
make %{?_smp_mflags} all V=1
%install
-make DESTDIR=$RPM_BUILD_ROOT install
+%make_install
# bluez-test
cd test
install --mode=0755 \
@@ -244,16 +195,16 @@
test-serial \
test-service \
test-telephony \
- $RPM_BUILD_ROOT/%{_bindir}/
+ %{buildroot}/%{_bindir}/
cd ..
-rm -v $RPM_BUILD_ROOT/%{_libdir}/*.la
-rm -rvf $RPM_BUILD_ROOT/%{_libdir}/gstreamer-*
-rm -v $RPM_BUILD_ROOT/%{_libdir}/alsa-lib/*.la
+rm -v %{buildroot}/%{_libdir}/*.la
+rm -rvf %{buildroot}/%{_libdir}/gstreamer-*
+rm -v %{buildroot}/%{_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 %{SOURCE2} %{buildroot}/%{_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
+install --mode=0644 -D %{SOURCE3} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.bluetooth
+install --mode=0644 -D %{SOURCE7} %{buildroot}/%{_sysconfdir}/modprobe.d/50-bluetooth.conf
# In openSUSE 11.3 there is upstream compliant CUPS 1.4
# which means to have a fixed "/usr/lib/cups/" directory
# on all platforms (see Novell/Suse Bugzilla bnc#575544):
@@ -264,13 +215,13 @@
fi
fi
# no idea why this is suddenly necessary...
-install --mode 0755 -d $RPM_BUILD_ROOT/var/lib/bluetooth
+install --mode 0755 -d %{buildroot}%{_localstatedir}/lib/bluetooth
%check
make check
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%pre
%if 0%{?has_systemd}
@@ -281,7 +232,10 @@
# todo: check if this is still obeyed / needed with systemd
%{fillup_only -n bluetooth}
%if 0%{?has_systemd}
-%service_add_post bluetooth.service
+# We need the bluez systemd service enabled at any time. It won't start up
+# on it's own, as it is triggered by udev in the end (bnc#796671)
+/bin/systemctl enable bluetooth.service 2>&1 || :
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
%else
%{insserv_force_if_yast bluez-coldplug}
%endif
@@ -321,11 +275,9 @@
#%{_sbindir}/hid2hci
%{_sbindir}/bccmd
%if 0%{NEW_UDEV}
-%dir /usr/lib/udev
-/usr/lib/udev/*
+%{_prefix}/lib/udev/
%else
-%dir /lib/udev
-/lib/udev/*
+/lib/udev/
%endif
%if 0%{OLD_UDEV}
%dir %{_sysconfdir}/udev/rules.d
@@ -347,9 +299,9 @@
%dir %{_sysconfdir}/bluetooth
%config(noreplace) %{_sysconfdir}/bluetooth/main.conf
%config(noreplace) %{_sysconfdir}/bluetooth/rfcomm.conf
-/var/adm/fillup-templates/sysconfig.bluetooth
+%{_localstatedir}/adm/fillup-templates/sysconfig.bluetooth
%config %{_sysconfdir}/dbus-1/system.d/bluetooth.conf
-%dir /var/lib/bluetooth
+%dir %{_localstatedir}/lib/bluetooth
%dir %{_sysconfdir}/modprobe.d
%config(noreplace) %{_sysconfdir}/modprobe.d/50-bluetooth.conf
%if 0%{?has_systemd}
@@ -361,7 +313,7 @@
%files devel
%defattr(-, root, root)
-/usr/include/bluetooth
+%{_includedir}/bluetooth
%{_libdir}/libbluetooth.so
%{_libdir}/pkgconfig/bluez.pc
@@ -397,8 +349,8 @@
%files alsa
%defattr(-,root,root)
-%dir /usr/share/alsa
-%config /usr/share/alsa/bluetooth.conf
+%dir %{_datadir}/alsa
+%config %{_datadir}/alsa/bluetooth.conf
%{_libdir}/alsa-lib/*.so
%files compat
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org