up to 5.65

[packages/bluez.git] / bluez.spec

diff --git a/bluez.spec b/bluez.spec
index 23358425b3a9bbc2d4093358cfb1a2a65c704d71..db7288d5f67ad4477a8f1984d6df91aa7ce5cdc3 100644 (file)
--- a/bluez.spec
+++ b/bluez.spec
@@ -8,12 +8,12 @@
 Summary:       Bluetooth utilities
 Summary(pl.UTF-8):     Narzędzia Bluetooth
 Name:          bluez
-Version:       5.61
-Release:       2
+Version:       5.65
+Release:       1
 License:       GPL v2+
 Group:         Applications/System
 Source0:       https://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.xz
-# Source0-md5: a4c98b6bd2411880cba5930e7f10a1c4
+# Source0-md5: bc07c802e95d4ee29d99f4f82c5abcf6
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 # Scripts for automatically btattach-ing serial ports connected to Broadcom HCIs
@@ -22,7 +22,6 @@ Source3:      69-btattach-bcm.rules
 Source4:       btattach-bcm@.service
 Source5:       btattach-bcm-service.sh
 Patch0:                0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
-Patch1:                glibc2.34.patch
 URL:           http://www.bluez.org/
 BuildRequires: alsa-lib-devel >= 1.0
 BuildRequires: autoconf >= 2.60
@@ -38,12 +37,12 @@ BuildRequires:      libical-devel
 BuildRequires: libtool
 BuildRequires: pkgconfig >= 1:0.9.0
 BuildRequires: readline-devel
-BuildRequires: rpmbuild(macros) >= 1.682
+BuildRequires: rpmbuild(macros) >= 2.011
 BuildRequires: systemd-devel
 BuildRequires: tar >= 1:1.22
 BuildRequires: udev-devel >= 1:172
 BuildRequires: xz
-Requires(post,preun,postun):   systemd-units >= 38
+Requires(post,preun,postun):   systemd-units >= 1:250.1
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      dbus-libs >= 1.6
 Requires:      ell >= 0.39
@@ -51,7 +50,7 @@ Requires:     glib2 >= 1:2.28
 Requires:      hwdata >= 0.225
 Requires:      json-c >= 0.13
 Requires:      rc-scripts
-Requires:      systemd-units >= 38
+Requires:      systemd-units >= 1:250.1
 Requires:      udev >= 1:172
 Provides:      bluez-hcidump = %{version}
 Provides:      bluez-utils = %{version}-%{release}
@@ -60,15 +59,15 @@ Provides:   dbus(org.openobex.client)
 Provides:      obex-data-server = %{version}
 # moved somewhere or dropped?
 #Obsoletes:    alsa-plugins-bluetooth
-Obsoletes:     bluez-hcidump
-Obsoletes:     bluez-hciemu
-Obsoletes:     bluez-pan
-Obsoletes:     bluez-sdp
-Obsoletes:     bluez-systemd
-Obsoletes:     bluez-utils
-Obsoletes:     bluez-utils-init
-Obsoletes:     obexd
-Obsoletes:     obex-data-server
+Obsoletes:     bluez-hcidump < 3
+Obsoletes:     bluez-hciemu < 2
+Obsoletes:     bluez-pan < 2
+Obsoletes:     bluez-sdp < 2
+Obsoletes:     bluez-systemd < 4.98-3
+Obsoletes:     bluez-utils < 4
+Obsoletes:     bluez-utils-init < 4
+Obsoletes:     obexd < 1
+Obsoletes:     obex-data-server < 1
 # moved somewhere or dropped?
 #Obsoletes:    gstreamer-bluetooth < 4.101-3
 #Obsoletes:    gstreamer0.10-bluetooth < 5
@@ -135,7 +134,7 @@ bluezctl).
 Summary:       Bluetooth libraries
 Summary(pl.UTF-8):     Biblioteki Bluetooth
 Group:         Libraries
-Obsoletes:     bluez-sdp
+Obsoletes:     bluez-sdp < 2
 
 %description libs
 Libraries for use in Bluetooth applications.
@@ -152,7 +151,7 @@ Summary:    Header files for Bluetooth applications
 Summary(pl.UTF-8):     Pliki nagłówkowe dla aplikacji Bluetooth
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
-Obsoletes:     bluez-sdp-devel
+Obsoletes:     bluez-sdp-devel < 2
 
 %description libs-devel
 bluez-libs-devel contains header files for use in Bluetooth
@@ -167,7 +166,7 @@ Summary:    Static Bluetooth libraries
 Summary(pl.UTF-8):     Biblioteki statyczne Bluetooth
 Group:         Development/Libraries
 Requires:      %{name}-libs-devel = %{version}-%{release}
-Obsoletes:     bluez-sdp-static
+Obsoletes:     bluez-sdp-static < 2
 
 %description libs-static
 bluez-libs-static contains development static libraries for use in
@@ -180,7 +179,6 @@ aplikacji Bluetooth.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 # external ell is broken if ell/ell.h is in place due to deps generation and Makefile.am rules
 %{__rm} -r ell
@@ -251,6 +249,7 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/chkconfig --add bluetooth
 %service bluetooth restart
 %systemd_post bluetooth.service
+%systemd_user_post obex.service
 
 %preun
 if [ "$1" = "0" ]; then
@@ -258,16 +257,16 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del bluetooth
 fi
 %systemd_preun bluetooth.service
+%systemd_user_preun obex.service
 
 %postun
 %systemd_reload
 
-%triggerpostun -- bluez < 4.98-3
-%systemd_trigger bluetooth.service
-
 %triggerpostun -- bluez < 5.13-1
 %service rfcomm stop
 /sbin/chkconfig --del rfcomm
+# bluez < 4.98-3
+%systemd_trigger bluetooth.service
 
 %post   libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
@@ -280,6 +279,7 @@ fi
 %attr(755,root,root) %{_bindir}/btattach
 %attr(755,root,root) %{_bindir}/btmon
 %attr(755,root,root) %{_bindir}/hex2hcd
+%attr(755,root,root) %{_bindir}/isotest
 %attr(755,root,root) %{_bindir}/l2ping
 %attr(755,root,root) %{_bindir}/l2test
 %attr(755,root,root) %{_bindir}/mesh-cfgclient
@@ -329,6 +329,7 @@ fi
 %{_mandir}/man1/btattach.1*
 %{_mandir}/man1/btmon.1*
 %{_mandir}/man1/hid2hci.1*
+%{_mandir}/man1/isotest.1*
 %{_mandir}/man1/l2ping.1*
 %{_mandir}/man1/rctest.1*
 %if %{with deprecated}