- added bluez-audio_socket.patch (After updating to 4.97 it might happen,

[packages/bluez.git] / bluez.spec

diff --git a/bluez.spec b/bluez.spec
index a95fad4acb9d0afd6682a0022f71d77d3446f382..79a75d24fa116f459f0b5fbc88beee66e5f35048 100644 (file)
--- a/bluez.spec
+++ b/bluez.spec
@@ -1,13 +1,13 @@
 Summary:       Bluetooth utilities
 Summary(pl.UTF-8):     Narzędzia Bluetooth
 Name:          bluez
-Version:       4.96
-Release:       4
+Version:       4.99
+Release:       2
 License:       GPL v2+
 Group:         Applications/System
 #Source0Download: http://www.bluez.org/download.html
 Source0:       http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.bz2
-# Source0-md5: 255c3dda8b93210ab0dcf8d04ddaf69f
+# Source0-md5: 2387053eb5a7b02f37df4871df022a02
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       dund.init
@@ -16,11 +16,13 @@ Source5:    rfcomm.init
 Patch0:                %{name}-etc_dir.patch
 Patch1:                %{name}-wacom-mode-2.patch
 Patch2:                %{name}-systemd.patch
+Patch3:                %{name}-audio_socket.patch
 URL:           http://www.bluez.org/
 BuildRequires: alsa-lib-devel >= 1.0.10-1
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
 BuildRequires: bison
+BuildRequires: check-devel >= 0.9.6
 BuildRequires: dbus-devel >= 1.0
 BuildRequires: glib2-devel >= 1:2.16
 BuildRequires: gstreamer-devel >= 0.10.30
@@ -33,14 +35,16 @@ BuildRequires:      pkgconfig >= 1:0.9.0
 BuildRequires: readline-devel
 BuildRequires: rpmbuild(macros) >= 1.626
 BuildRequires: udev-devel
-Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
+Requires:      %{name}-libs = %{version}-%{release}
 Requires:      glib2 >= 1:2.16
 Requires:      hwdata >= 0.225
 Requires:      rc-scripts
-Provides:      bluez-utils = %{epoch}:%{version}-%{release}
+Requires:      systemd-units >= 37-0.10
+Provides:      bluez-utils = %{version}-%{release}
 Obsoletes:     bluez-hciemu
 Obsoletes:     bluez-pan
 Obsoletes:     bluez-sdp
+Obsoletes:     bluez-systemd
 Obsoletes:     bluez-utils
 Obsoletes:     bluez-utils-init
 Conflicts:     bluez-bluefw
@@ -88,7 +92,7 @@ Summary:      ALSA plugins for Bluetooth audio devices
 Summary(pl.UTF-8):     Wtyczki systemu ALSA dla urządzeń dźwiękowych Bluetooth
 Group:         Libraries
 # bluetoothd + audio service
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      %{name} = %{version}-%{release}
 Requires:      alsa-lib >= 1.0.10-1
 
 %description -n alsa-plugins-bluetooth
@@ -101,7 +105,7 @@ Wtyczki systemu ALSA dla urządzeń dźwiękowych Bluetooth.
 Summary:       Bluetooth backend for CUPS
 Summary(pl.UTF-8):     Backend Bluetooth dla CUPS-a
 Group:         Applications/Printing
-Requires:      bluez-libs >= %{epoch}:%{version}-%{release}
+Requires:      bluez-libs >= %{version}-%{release}
 Requires:      cups
 
 %description -n cups-backend-bluetooth
@@ -114,7 +118,7 @@ Backend Bluetooth dla CUPS-a.
 Summary:       Bluetooth support for gstreamer
 Summary(pl.UTF-8):     Obsługa Bluetooth dla gstreamera
 Group:         Libraries
-Requires:      bluez-libs >= %{epoch}:%{version}-%{release}
+Requires:      bluez-libs >= %{version}-%{release}
 Requires:      gstreamer >= 0.10.30
 Requires:      gstreamer-plugins-base >= 0.10
 
@@ -127,7 +131,7 @@ Obsługa Bluetooth dla gstreamera.
 %package libs
 Summary:       Bluetooth libraries
 Summary(pl.UTF-8):     Biblioteki Bluetooth
-Group:         Development/Libraries
+Group:         Libraries
 Obsoletes:     bluez-sdp
 
 %description libs
@@ -144,7 +148,7 @@ Znaki towarowe BLUETOOTH są własnością Bluetooth SIG, Inc. z USA.
 Summary:       Header files for Bluetooth applications
 Summary(pl.UTF-8):     Pliki nagłówkowe dla aplikacji Bluetooth
 Group:         Development/Libraries
-Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
+Requires:      %{name}-libs = %{version}-%{release}
 Obsoletes:     bluez-sdp-devel
 
 %description libs-devel
@@ -159,7 +163,7 @@ Bluetooth.
 Summary:       Static Bluetooth libraries
 Summary(pl.UTF-8):     Biblioteki statyczne Bluetooth
 Group:         Development/Libraries
-Requires:      %{name}-libs-devel = %{epoch}:%{version}-%{release}
+Requires:      %{name}-libs-devel = %{version}-%{release}
 Obsoletes:     bluez-sdp-static
 
 %description libs-static
@@ -170,20 +174,12 @@ Bluetooth applications.
 Ten pakiet zawiera biblioteki statyczne, których można używać do
 aplikacji Bluetooth.
 
-%package systemd
-Summary:       systemd units for bluez
-Group:         Base
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      systemd-units >= 37-0.10
-
-%description systemd
-systemd units for bluez.
-
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -201,7 +197,6 @@ systemd units for bluez.
        --enable-audio \
        --enable-bccmd \
        --enable-capng \
-       --enable-configfiles \
        --enable-cups \
        --enable-dbusoob \
        --enable-dfutool \
@@ -216,9 +211,9 @@ systemd units for bluez.
        --enable-pcmcia \
        --enable-pnat \
        --enable-serial \
+       --enable-thermometer \
        --enable-tools \
        --enable-usb \
-       --enable-udevrules \
        --enable-wiimote
 
 %{__make} \
@@ -263,6 +258,7 @@ rm -rf $RPM_BUILD_ROOT
 %service dund restart
 %service pand restart
 %service rfcomm restart
+%systemd_post bluetooth.service
 
 %preun
 if [ "$1" = "0" ]; then
@@ -275,19 +271,17 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del pand
        /sbin/chkconfig --del rfcomm
 fi
-
-%post   libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-
-%post systemd
-%systemd_post bluetooth.service
-
-%preun systemd
 %systemd_preun bluetooth.service
 
-%postun systemd
+%postun
 %systemd_reload
 
+%triggerpostun -- bluez < 4.98-3
+%systemd_trigger bluetooth.service
+
+%post   libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
@@ -315,6 +309,8 @@ fi
 %attr(754,root,root) /etc/rc.d/init.d/rfcomm
 %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
+%{_datadir}/dbus-1/system-services/org.bluez.service
 %attr(755,root,root) %{udevdir}/bluetooth_serial
 %attr(755,root,root) %{udevdir}/hid2hci
 %{udevdir}/rules.d/97-bluetooth.rules
@@ -363,8 +359,3 @@ fi
 %files libs-static
 %defattr(644,root,root,755)
 %{_libdir}/libbluetooth.a
-
-%files systemd
-%defattr(644,root,root,755)
-%{systemdunitdir}/bluetooth.service
-%{_datadir}/dbus-1/system-services/org.bluez.service