Hello community,
here is the log from the commit of package bluez for openSUSE:Factory checked
in at 2013-01-17 09:36:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bluez (Old)
and /work/SRC/openSUSE:Factory/.bluez.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bluez", Maintainer is "a...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/bluez/bluez.changes 2012-11-10
16:54:16.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.bluez.new/bluez.changes 2013-01-17
09:36:43.000000000 +0100
@@ -1,0 +2,12 @@
+Fri Jan 11 14:38:03 UTC 2013 - crrodrig...@opensuse.org
+
+- Add changelog entry for older change so factory-auto wont reject this.
+- This requests removes sbc building and packaging from bluez.
+SBC recently gets its own package and sources are even stripped out ot
+Bluez in current git master (future 5.0).
+On top of that current bluez-devel package conflicts with sbc-devel.
+Note: This change may broke packages which use sbc from bluez-devel
+as new sbc-devel package use different include path.
+This change is required to properly build PulseAudio 3.0
+
+-------------------------------------------------------------------
Old:
----
bluez-4.100-libsbc-make-it-installable.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bluez-gstreamer.spec ++++++
--- /var/tmp/diff_new_pack.uaJSC9/_old 2013-01-17 09:36:45.000000000 +0100
+++ /var/tmp/diff_new_pack.uaJSC9/_new 2013-01-17 09:36:45.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package bluez-gstreamer
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010-2012 B1 Systems GmbH, Vohburg, Germany
#
# All modifications and additions to the file contributed by third parties
++++++ bluez.spec ++++++
--- /var/tmp/diff_new_pack.uaJSC9/_old 2013-01-17 09:36:45.000000000 +0100
+++ /var/tmp/diff_new_pack.uaJSC9/_new 2013-01-17 09:36:45.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package bluez
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010-2012 B1 Systems GmbH, Vohburg, Germany
#
# All modifications and additions to the file contributed by third parties
@@ -54,8 +54,6 @@
Source7: bluetooth.modprobe
# already fixed upstream
Patch0: 0001-network-fix-network-Connect-method-parameters.patch
-# TODO: push upstream (jeffm?) -- seife
-Patch3: bluez-4.100-libsbc-make-it-installable.diff
# TODO: check for obsoletion
Patch9: 001-remove-rule-dell-mouse.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -64,6 +62,7 @@
Provides: bluez-audio = 3.36
Obsoletes: bluez-audio <= 3.36
Requires: libbluetooth3 = %{version}
+Recommends: sbc
%if %( echo `rpm -q --queryformat %%{version} udev` ) < 144
%define OLD_UDEV 1
%else
@@ -164,43 +163,6 @@
Marcel Holtmann <mar...@holtmann.org>
and others, see AUTHORS in the documentation of the "bluez" package.
-%package sbc
-Summary: Bluetooth Low-Complexity, Sub-Band Codec Utilities
-License: GPL-2.0+
-Group: Hardware/Mobile
-Requires: libbluetooth3 = %{version}
-Requires: libsbc0 = %{version}
-
-%description sbc
-The package contains utilities for using the SBC codec.
-
-The BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., USA.
-
-
-
-Authors:
---------
- Marcel Holtmann <mar...@holtmann.org>
- and others, see AUTHORS in the documentation of the "bluez" package.
-
-%package -n libsbc0
-Summary: Bluetooth Low-Complexity, Sub-Band Codec Library
-License: GPL-2.0+
-Group: Hardware/Mobile
-Requires: libbluetooth3 = %{version}
-
-%description -n libsbc0
-The package contains libraries for using the SBC codec.
-
-The BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., USA.
-
-
-
-Authors:
---------
- Marcel Holtmann <mar...@holtmann.org>
- and others, see AUTHORS in the documentation of the "bluez" package.
-
%package alsa
Summary: Bluetooth Sound Support
License: GPL-2.0+
@@ -240,7 +202,6 @@
%prep
%setup -q
%patch0 -p1
-%patch3 -p1
# disabled the patch because it does no longer cleanly apply and the rule has
# changed significantly anyway. I'll keep it until i get confirmation in
bugzilla.
##%%patch9 -p1
@@ -346,10 +307,6 @@
%{insserv_cleanup}
%endif
-%post -n libsbc0 -p /sbin/ldconfig
-
-%postun -n libsbc0 -p /sbin/ldconfig
-
%post -n libbluetooth3 -p /sbin/ldconfig
%postun -n libbluetooth3 -p /sbin/ldconfig
@@ -413,8 +370,6 @@
/usr/include/bluetooth
%{_libdir}/libbluetooth.so
%{_libdir}/pkgconfig/bluez.pc
-%{_libdir}/libsbc.so
-%{_libdir}/pkgconfig/libsbc.pc
%files -n libbluetooth3
%defattr(-, root, root)
@@ -452,16 +407,6 @@
%config /usr/share/alsa/bluetooth.conf
%{_libdir}/alsa-lib/*.so
-%files sbc
-%defattr(-, root, root)
-%{_bindir}/sbcdec
-%{_bindir}/sbcenc
-%{_bindir}/sbcinfo
-
-%files -n libsbc0
-%defattr(-,root,root)
-%{_libdir}/libsbc.so.*
-
%files compat
%defattr(-,root,root)
%{_bindir}/dund
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
