X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=bluez.spec;h=79a75d24fa116f459f0b5fbc88beee66e5f35048;hb=f5d9792133f6461ebff2b03193644b7c9ebf195d;hp=3f377a4cffe0552ba991a3fa009176759961a557;hpb=0859c749e0ee8dd06ffe5d056d53b82cb01240da;p=packages%2Fbluez.git

diff --git a/bluez.spec b/bluez.spec
index 3f377a4..79a75d2 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -1,13 +1,13 @@
 Summary:	Bluetooth utilities
 Summary(pl.UTF-8):	Narzędzia Bluetooth
 Name:		bluez
-Version:	4.94
+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.gz
-# Source0-md5:	59040081375411e3000dea9e5d53e5b7
+Source0:	http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.bz2
+# Source0-md5:	2387053eb5a7b02f37df4871df022a02
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	dund.init
@@ -15,11 +15,14 @@ Source4:	pand.init
 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
@@ -30,16 +33,18 @@ BuildRequires:	libtool
 BuildRequires:	libusb-compat-devel
 BuildRequires:	pkgconfig >= 1:0.9.0
 BuildRequires:	readline-devel
-BuildRequires:	rpmbuild(macros) >= 1.268
+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
@@ -87,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
@@ -100,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
@@ -113,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
 
@@ -126,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
@@ -143,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
@@ -158,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
@@ -173,6 +178,8 @@ aplikacji Bluetooth.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -182,6 +189,7 @@ aplikacji Bluetooth.
 %{__automake}
 %configure \
 	--with-ouifile=%{_datadir}/hwdata/oui.txt \
+	--with-systemdsystemunitdir=%{systemdunitdir} \
 	--disable-silent-rules \
 	--enable-shared \
 	--enable-static \
@@ -189,7 +197,6 @@ aplikacji Bluetooth.
 	--enable-audio \
 	--enable-bccmd \
 	--enable-capng \
-	--enable-configfiles \
 	--enable-cups \
 	--enable-dbusoob \
 	--enable-dfutool \
@@ -204,9 +211,10 @@ aplikacji Bluetooth.
 	--enable-pcmcia \
 	--enable-pnat \
 	--enable-serial \
+	--enable-thermometer \
 	--enable-tools \
 	--enable-usb \
-	--enable-udevrules
+	--enable-wiimote
 
 %{__make} \
 	cupsdir=%{cupsdir} \
@@ -250,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
@@ -262,6 +271,13 @@ if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del pand
 	/sbin/chkconfig --del rfcomm
 fi
+%systemd_preun bluetooth.service
+
+%postun
+%systemd_reload
+
+%triggerpostun -- bluez < 4.98-3
+%systemd_trigger bluetooth.service
 
 %post   libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
@@ -293,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