X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=bluez.spec;h=73d6c250012455585053901fb2194b322bf64ae2;hb=e01e2ec147bc453f0d9fabe10ef024ab127875ee;hp=67edaaa582f687e8165e365faead8af03b59f19c;hpb=ebc85f345131a8d998e885828a6ca4cd949bb554;p=packages%2Fbluez.git

diff --git a/bluez.spec b/bluez.spec
index 67edaaa..73d6c25 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.89
-Release:	1
+Version:	4.99
+Release:	3
 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:	67fd9ad2852ce01f01b16ddd2336d1ea
+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,31 +15,37 @@ Source4:	pand.init
 Source5:	rfcomm.init
 Patch0:		%{name}-etc_dir.patch
 Patch1:		%{name}-wacom-mode-2.patch
-Patch2:		%{name}-try-utf8-harder.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.14
-BuildRequires:	gstreamer-devel >= 0.10
+BuildRequires:	glib2-devel >= 1:2.16
+BuildRequires:	gstreamer-devel >= 0.10.30
 BuildRequires:	gstreamer-plugins-base-devel >= 0.10
 BuildRequires:	libcap-ng-devel
 BuildRequires:	libsndfile-devel
 BuildRequires:	libtool
 BuildRequires:	libusb-compat-devel
 BuildRequires:	pkgconfig >= 1:0.9.0
-BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	readline-devel
+BuildRequires:	rpmbuild(macros) >= 1.626
 BuildRequires:	udev-devel
-Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
-Requires:	glib2 >= 1:2.14
+Requires(post,preun,postun):	systemd-units >= 38
+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 >= 38
+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 +93,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 +106,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,8 +119,8 @@ 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:	gstreamer >= 0.10
+Requires:	bluez-libs >= %{version}-%{release}
+Requires:	gstreamer >= 0.10.30
 Requires:	gstreamer-plugins-base >= 0.10
 
 %description -n gstreamer-bluetooth
@@ -126,7 +132,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 +149,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 +164,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
@@ -174,6 +180,7 @@ aplikacji Bluetooth.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -183,6 +190,7 @@ aplikacji Bluetooth.
 %{__automake}
 %configure \
 	--with-ouifile=%{_datadir}/hwdata/oui.txt \
+	--with-systemdsystemunitdir=%{systemdunitdir} \
 	--disable-silent-rules \
 	--enable-shared \
 	--enable-static \
@@ -190,21 +198,24 @@ aplikacji Bluetooth.
 	--enable-audio \
 	--enable-bccmd \
 	--enable-capng \
-	--enable-configfiles \
 	--enable-cups \
+	--enable-dbusoob \
 	--enable-dfutool \
 	--enable-dund \
 	--enable-gstreamer \
+	--enable-health \
 	--enable-hid2hci \
 	--enable-hidd \
 	--enable-input \
 	--enable-network \
 	--enable-pand \
 	--enable-pcmcia \
+	--enable-pnat \
 	--enable-serial \
+	--enable-thermometer \
 	--enable-tools \
 	--enable-usb \
-	--enable-udevrules
+	--enable-wiimote
 
 %{__make} \
 	cupsdir=%{cupsdir} \
@@ -234,9 +245,7 @@ install serial/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/bluetooth
 
 mv -fT $RPM_BUILD_ROOT{%{_datadir},%{_sysconfdir}}/alsa
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/alsa-lib/*.{la,a}
-#%{__rm} $RPM_BUILD_ROOT%{_libdir}/bluetooth/plugins/*.{la,a}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/gstreamer*/libgstbluetooth.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/{alsa-lib/*.{la,a},gstreamer*/libgstbluetooth.{la,a},libbluetooth.la}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -250,6 +259,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 +272,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
@@ -272,6 +289,7 @@ fi
 %attr(755,root,root) %{_bindir}/ciptool
 %attr(755,root,root) %{_bindir}/dfutool
 %attr(755,root,root) %{_bindir}/dund
+%attr(755,root,root) %{_bindir}/gatttool
 %attr(755,root,root) %{_bindir}/hcitool
 %attr(755,root,root) %{_bindir}/hidd
 %attr(755,root,root) %{_bindir}/l2ping
@@ -282,7 +300,6 @@ fi
 %attr(755,root,root) %{_sbindir}/bluetoothd
 %attr(755,root,root) %{_sbindir}/hciattach
 %attr(755,root,root) %{_sbindir}/hciconfig
-%attr(755,root,root) %{_sbindir}/hid2hci
 %dir %{_libdir}/bluetooth
 %dir %{_libdir}/bluetooth/plugins
 %dir %{_sysconfdir}/bluetooth
@@ -293,10 +310,13 @@ 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
-%config(noreplace) %verify(not md5 mtime size) %{udevdir}/rules.d/97-bluetooth.rules
-%config(noreplace) %verify(not md5 mtime size) %{udevdir}/rules.d/97-bluetooth-hid2hci.rules
-%config(noreplace) %verify(not md5 mtime size) %{udevdir}/rules.d/97-bluetooth-serial.rules
+%attr(755,root,root) %{udevdir}/hid2hci
+%{udevdir}/rules.d/97-bluetooth.rules
+%{udevdir}/rules.d/97-bluetooth-hid2hci.rules
+%{udevdir}/rules.d/97-bluetooth-serial.rules
 %{_mandir}/man1/ciptool.1*
 %{_mandir}/man1/dfutool.1*
 %{_mandir}/man1/dund.1*
@@ -314,7 +334,6 @@ fi
 
 %files -n alsa-plugins-bluetooth
 %defattr(644,root,root,755)
-%dir %{_sysconfdir}/alsa
 %{_sysconfdir}/alsa/bluetooth.conf
 %attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_ctl_bluetooth.so
 %attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_pcm_bluetooth.so
@@ -335,7 +354,6 @@ fi
 %files libs-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libbluetooth.so
-%{_libdir}/libbluetooth.la
 %{_includedir}/bluetooth
 %{_pkgconfigdir}/bluez.pc