From ee1b16bec812dd3c456fc7031c375bcbb555ed11 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Fri, 12 Dec 2014 20:13:14 +1000 Subject: [PATCH] Require bluez-pin-provider instead of bluez-pin --- bluez.spec | 108 ++++++++++++++++++++++++++--------------------------- 1 file changed, 53 insertions(+), 55 deletions(-) diff --git a/bluez.spec b/bluez.spec index 80cad40..34e094d 100644 --- a/bluez.spec +++ b/bluez.spec @@ -1,11 +1,11 @@ -%define major 3 -%define libname %mklibname %{name} %{major} -%define devname %mklibname -d %{name} +%define major 3 +%define libname %mklibname %{name} %{major} +%define devname %mklibname %{name} -d -Name: bluez Summary: Official Linux Bluetooth protocol stack +Name: bluez Version: 5.21 -Release: 1 +Release: 2 License: GPLv2+ Group: Communications URL: http://www.bluez.org/ @@ -26,25 +26,21 @@ Patch3: 0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch Patch4: 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch Patch5: 0002-autopair-Don-t-handle-the-iCade.patch Patch7: 0004-agent-Assert-possible-infinite-loop.patch - -Requires(pre): rpm-helper - -BuildRequires: flex BuildRequires: bison -BuildRequires: readline-devel -BuildRequires: expat-devel +BuildRequires: flex BuildRequires: cups-devel +BuildRequires: readline-devel BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(libcap-ng) +BuildRequires: pkgconfig(libical) BuildRequires: pkgconfig(libusb) BuildRequires: pkgconfig(libusb-1.0) -BuildRequires: pkgconfig(libical) -BuildRequires: pkgconfig(udev) >= 186 -BuildRequires: pkgconfig(libical) BuildRequires: pkgconfig(systemd) - -Requires: bluez-pin +BuildRequires: pkgconfig(udev) >= 186 +Requires(pre): rpm-helper +Requires: bluez-pin-provider Suggests: obex-data-server Obsoletes: bluez-alsa < 5.0 Obsoletes: bluez-gstreamer < 5.0 @@ -52,12 +48,6 @@ Obsoletes: bluez-gstreamer < 5.0 %description These are the official Bluetooth communication libraries for Linux. -%post -%_post_service bluetooth - -%postun -%_preun_service bluetooth - %files %{_bindir}/ciptool %{_bindir}/hcitool @@ -98,38 +88,63 @@ These are the official Bluetooth communication libraries for Linux. %{_libdir}/bluetooth/plugins/sixaxis.so %{_libdir}/bluetooth/plugins/playstation-peripheral.so +%post +%_post_service bluetooth -#-------------------------------------------------------------------- +%postun +%_preun_service bluetooth -%package cups +#---------------------------------------------------------------------------- + +%package cups Summary: CUPS printer backend for Bluetooth printers Group: System/Servers Requires: cups -%description cups +%description cups This package contains the CUPS backend for Bluetooth printers. -%files cups +%files cups %{_prefix}/lib/cups/backend/bluetooth -#-------------------------------------------------------------------- +#---------------------------------------------------------------------------- -%package -n %{libname} +%package -n %{libname} Summary: Official Linux Bluetooth protocol stack Group: System/Libraries -%description -n %{libname} +%description -n %{libname} These are the official Bluetooth communication libraries for Linux. %files -n %{libname} /%{_lib}/libbluetooth.so.%{major}* -#-------------------------------------------------------------------- -%package hid2hci +#---------------------------------------------------------------------------- + +%package -n %{devname} +Summary: Headers for developing programs that will use %{name} +Group: Development/C++ +Requires: %{libname} = %{EVRD} +Provides: %{name}-devel = %{EVRD} + +%description -n %{devname} +This package contains the headers that programmers will need to develop +applications which will use libraries from %{name}. + +%files -n %{devname} +%doc AUTHORS ChangeLog README +%dir %{_includedir}/bluetooth +%{_includedir}/bluetooth/*.h +%{_libdir}/*.so +%{_libdir}/pkgconfig/bluez.pc + +#---------------------------------------------------------------------------- + +%package hid2hci Summary: Put HID proxying bluetooth HCI's into HCI mode Group: Communications -%description hid2hci +%description hid2hci Most allinone PC's and bluetooth keyboard / mouse sets which include a bluetooth dongle, ship with a so called HID proxying bluetooth HCI. The HID proxying makes the keyboard / mouse show up as regular USB HID @@ -148,7 +163,7 @@ them again. Since you cannot use your bluetooth keyboard and mouse until they are paired, this will require the use of a regular (wired) USB keyboard and mouse. -%files hid2hci +%files hid2hci /lib/udev/hid2hci %{_mandir}/man1/hid2hci.1* /lib/udev/rules.d/97-hid2hci.rules @@ -156,42 +171,25 @@ and mouse. %post hid2hci %{_bindir}/udevadm trigger --subsystem-match=usb -#-------------------------------------------------------------------- +#---------------------------------------------------------------------------- -%package test +%package test Summary: Tools for testing of various Bluetooth-functions Group: System/Servers Requires: python-dbus Requires: python-gobject -%description test +%description test Contains a few tools for testing various bluetooth functions. The BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., U.S.A. -%files test +%files test %{_bindir}/simple-agent %{_bindir}/l2test %{_bindir}/rctest %{_bindir}/test-* -#-------------------------------------------------------------------- -%package -n %{devname} -Summary: Headers for developing programs that will use %{name} -Group: Development/C++ -Requires: %{libname} = %{version} -Provides: %{name}-devel = %{version}-%{release} - -%description -n %{devname} -This package contains the headers that programmers will need to develop -applications which will use libraries from %{name}. - -%files -n %{devname} -%doc AUTHORS ChangeLog README -%dir %{_includedir}/bluetooth -%{_includedir}/bluetooth/*.h -%{_libdir}/*.so -%{_libdir}/pkgconfig/bluez.pc -#-------------------------------------------------------------------- +#---------------------------------------------------------------------------- %prep %setup -q