Merge branch 'rosa2019.1' into rosa2016.1

This commit is contained in:
Andrey Bondrov 2020-01-28 18:05:16 +10:00
commit 3f366dff73

View file

@ -43,7 +43,7 @@ BuildRequires: pkgconfig(libusb-1.0)
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(udev) >= 186 BuildRequires: pkgconfig(udev) >= 186
Requires(pre): rpm-helper Requires(pre): rpm-helper
Suggests: obex-data-server Recommends: obex-data-server
Obsoletes: bluez-alsa < 5.0 Obsoletes: bluez-alsa < 5.0
Obsoletes: bluez-gstreamer < 5.0 Obsoletes: bluez-gstreamer < 5.0
@ -217,7 +217,7 @@ libtoolize -f -c
autoreconf -fi autoreconf -fi
%build %build
%configure2_5x \ %configure \
--prefix=/usr \ --prefix=/usr \
--libdir=%{_libdir} \ --libdir=%{_libdir} \
--libexecdir=%{_libdir} \ --libexecdir=%{_libdir} \
@ -283,5 +283,3 @@ install -d -m0755 %{buildroot}%{_localstatedir}/lib/bluetooth
ln -s bluetooth.service %{buildroot}%{_unitdir}/dbus-org.bluez.service ln -s bluetooth.service %{buildroot}%{_unitdir}/dbus-org.bluez.service
sed 's|#AutoEnable=false|AutoEnable=true|' -i %{buildroot}%{_sysconfdir}/bluetooth/main.conf sed 's|#AutoEnable=false|AutoEnable=true|' -i %{buildroot}%{_sysconfdir}/bluetooth/main.conf
%changelog