Don't pull in -libs for the other subpackages

We shouldn't be forcing it on all bluez installations: libbluetooth is
deprecated and apps should migrate to the DBus API.

Also include the COPYING file in both bluez and bluez-libs.
This commit is contained in:
Kalev Lember 2013-08-16 10:55:23 +02:00
parent f358c1705d
commit 2d13457cf7

View File

@ -3,7 +3,7 @@
Summary: Bluetooth utilities Summary: Bluetooth utilities
Name: bluez Name: bluez
Version: 5.8 Version: 5.8
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/System Group: Applications/System
URL: http://www.bluez.org/ URL: http://www.bluez.org/
@ -35,7 +35,6 @@ BuildRequires: libusbx-devel
# For rebuild # For rebuild
BuildRequires: libtool autoconf automake BuildRequires: libtool autoconf automake
Requires: bluez-libs%{?_isa} = %{version}-%{release}
Requires: dbus >= 0.60 Requires: dbus >= 0.60
Requires: hwdata >= 0.215 Requires: hwdata >= 0.215
@ -80,13 +79,12 @@ Requires: bluez-libs%{?_isa} = %{version}-%{release}
%package cups %package cups
Summary: CUPS printer backend for Bluetooth printers Summary: CUPS printer backend for Bluetooth printers
Group: System Environment/Daemons Group: System Environment/Daemons
Requires: bluez-libs%{?_isa} = %{version}-%{release} Requires: bluez%{?_isa} = %{version}-%{release}
Requires: cups Requires: cups
%package hid2hci %package hid2hci
Summary: Put HID proxying bluetooth HCI's into HCI mode Summary: Put HID proxying bluetooth HCI's into HCI mode
Group: System Environment/Daemons Group: System Environment/Daemons
Requires: bluez-libs%{?_isa} = %{version}-%{release}
Requires: bluez%{?_isa} = %{version}-%{release} Requires: bluez%{?_isa} = %{version}-%{release}
%description cups %description cups
@ -175,6 +173,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_libdir}/bluetooth/
/sbin/udevadm trigger --subsystem-match=usb /sbin/udevadm trigger --subsystem-match=usb
%files %files
%doc AUTHORS COPYING ChangeLog README
%{_bindir}/ciptool %{_bindir}/ciptool
%{_bindir}/hcitool %{_bindir}/hcitool
%{_bindir}/l2ping %{_bindir}/l2ping
@ -211,8 +210,8 @@ mkdir -p $RPM_BUILD_ROOT/%{_libdir}/bluetooth/
%{_userunitdir}/obex.service %{_userunitdir}/obex.service
%files libs %files libs
%doc COPYING
%{_libdir}/libbluetooth.so.* %{_libdir}/libbluetooth.so.*
%doc AUTHORS COPYING INSTALL ChangeLog README
%files libs-devel %files libs-devel
%{_libdir}/libbluetooth.so %{_libdir}/libbluetooth.so
@ -229,6 +228,9 @@ mkdir -p $RPM_BUILD_ROOT/%{_libdir}/bluetooth/
/lib/udev/rules.d/97-hid2hci.rules /lib/udev/rules.d/97-hid2hci.rules
%changelog %changelog
* Fri Aug 16 2013 Kalev Lember <kalevlember@gmail.com> - 5.8-2
- Don't pull in -libs for the other subpackages
* Sat Aug 10 2013 Kalev Lember <kalevlember@gmail.com> - 5.8-1 * Sat Aug 10 2013 Kalev Lember <kalevlember@gmail.com> - 5.8-1
- Update to 5.8 - Update to 5.8
- Hardened build - Hardened build