X-Git-Url: http://git.pld-linux.org/?p=packages%2Fbluez.git;a=blobdiff_plain;f=bluez.spec;h=28959552a3a0aa13b9dabf87812f07ea1f28520c;hp=9ff78ad5d4a5e8cb9ba97e7dbbd6ba5916237d38;hb=252e68e7b5027b1c7dab43abd7d5015826a9fcd4;hpb=1b4562d92ef94f0d85ac3943aa5222fee579fa57 diff --git a/bluez.spec b/bluez.spec index 9ff78ad..2895955 100644 --- a/bluez.spec +++ b/bluez.spec @@ -1,47 +1,58 @@ +# TODO: +# - verify/update bluetooth init script +# - separate obex? Summary: Bluetooth utilities Summary(pl.UTF-8): Narzędzia Bluetooth Name: bluez -Version: 4.53 +Version: 5.30 Release: 1 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: 432509193ea508da5ce23fe056625d0f +Source0: https://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.xz +# Source0-md5: 24ba1d1e8e7ef5b8f4033a3059d7600e Source1: %{name}.init Source2: %{name}.sysconfig -Source3: dund.init -Source4: pand.init -Source5: rfcomm.init -Patch0: %{name}-etc_dir.patch -Patch1: %{name}-oui.patch -Patch2: %{name}-wacom-mode-2.patch -Patch3: %{name}-try-utf8-harder.patch URL: http://www.bluez.org/ -BuildRequires: alsa-lib-devel >= 1.0.10-1 -BuildRequires: autoconf >= 2.50 +BuildRequires: autoconf >= 2.60 BuildRequires: automake -BuildRequires: bison -BuildRequires: dbus-glib-devel >= 0.60 -BuildRequires: glib2-devel >= 2.0 -BuildRequires: gstreamer-devel >= 0.10 -BuildRequires: gstreamer-plugins-base-devel >= 0.10 -BuildRequires: libnl-devel -BuildRequires: libsndfile-devel +BuildRequires: check-devel >= 0.9.6 +BuildRequires: dbus-devel >= 1.6 +BuildRequires: glib2-devel >= 1:2.28 +BuildRequires: libical-devel BuildRequires: libtool -BuildRequires: libusb-compat-devel BuildRequires: pkgconfig >= 1:0.9.0 -BuildRequires: rpmbuild(macros) >= 1.268 -BuildRequires: udev-devel -Requires: %{name}-libs = %{epoch}:%{version}-%{release} +BuildRequires: readline-devel +BuildRequires: rpmbuild(macros) >= 1.682 +BuildRequires: tar >= 1:1.22 +BuildRequires: udev-devel >= 1:172 +BuildRequires: xz +Requires(post,preun,postun): systemd-units >= 38 +Requires: %{name}-libs = %{version}-%{release} +Requires: dbus-libs >= 1.6 +Requires: glib2 >= 1:2.28 Requires: hwdata >= 0.225 Requires: rc-scripts -Provides: bluez-utils = %{epoch}:%{version}-%{release} +Requires: systemd-units >= 38 +Requires: udev >= 1:172 +Provides: bluez-hcidump = %{version} +Provides: bluez-utils = %{version}-%{release} +Provides: obexd = %{version} +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 +# moved somewhere or dropped? +#Obsoletes: gstreamer-bluetooth < 4.101-3 +#Obsoletes: gstreamer0.10-bluetooth < 5 Conflicts: bluez-bluefw ExcludeArch: s390 s390x BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -53,54 +64,32 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description Bluetooth utilities: - bluetoothd - - dund - - hcitool - hciattach - hciconfig - - hciemu - - hidd + - hcidump + - hcitool - l2ping - - pand - start scripts (PLD) - - PCMCIA configuration files The BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., U.S.A. %description -l pl.UTF-8 Narzędzia Bluetooth: - bluetoothd - - dund - - hcitool - hciattach - hciconfig - - hciemu - - hidd + - hcidump + - hcitool - l2ping - - pand - skrypty startowe (PLD) - - pliki konfiguracji PCMCIA Znaki towarowe BLUETOOTH są własnością Bluetooth SIG, Inc. z USA. -%package -n alsa-plugins-bluetooth -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: alsa-lib >= 1.0.10-1 - -%description -n alsa-plugins-bluetooth -ALSA plugins for Bluetooth audio devices. - -%description -n alsa-plugins-bluetooth -l pl.UTF-8 -Wtyczki systemu ALSA dla urządzeń dźwiękowych Bluetooth. - %package -n cups-backend-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 @@ -109,24 +98,10 @@ Bluetooth backend for CUPS. %description -n cups-backend-bluetooth -l pl.UTF-8 Backend Bluetooth dla CUPS-a. -%package -n gstreamer-bluetooth -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: gstreamer-plugins-base >= 0.10 - -%description -n gstreamer-bluetooth -Bluetooth support for gstreamer. - -%description -n gstreamer-bluetooth -l pl.UTF-8 -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 +118,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 +133,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 @@ -171,10 +146,6 @@ aplikacji Bluetooth. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build %{__libtoolize} @@ -183,75 +154,65 @@ aplikacji Bluetooth. %{__autoheader} %{__automake} %configure \ - --enable-shared \ + --disable-silent-rules \ + --enable-experimental \ + --enable-library \ + --enable-sixaxis \ --enable-static \ - --enable-alsa \ - --enable-audio \ - --enable-bccmd \ - --enable-configfiles \ - --enable-cups \ - --enable-dfutool \ - --enable-dund \ - --enable-gstreamer \ - --enable-hid2hci \ - --enable-hidd \ - --enable-input \ - --enable-manpages \ - --enable-netlink \ - --enable-network \ - --enable-pand \ - --enable-pcmcia \ - --enable-serial \ - --enable-tools \ - --enable-usb \ - --enable-udevrules - -%{__make} -j1 \ + --with-systemdsystemunitdir=%{systemdunitdir} \ + --with-systemduserunitdir=%{systemduserunitdir} + +%{__make} \ cupsdir=%{cupsdir} \ + rulesdir=%{udevdir}/rules.d \ udevdir=%{udevdir} %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig} +install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig} \ + $RPM_BUILD_ROOT{%{_libdir}/{bluetooth,obex}/plugins,%{_sysconfdir}/bluetooth} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ cupsdir=%{cupsdir} \ + rulesdir=%{udevdir}/rules.d \ udevdir=%{udevdir} +%{__rm} $RPM_BUILD_ROOT%{_libdir}/bluetooth/plugins/*.{la,a} + install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/bluetooth install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/bluetooth -install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/dund -install %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/pand -install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/rfcomm -rm -f $RPM_BUILD_ROOT%{_libdir}/alsa-lib/*.{,l}a -rm -f $RPM_BUILD_ROOT%{_libdir}/bluetooth/plugins/*.{,l}a -rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer*/libgstbluetooth.{,l}a + +install profiles/input/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/bluetooth +install profiles/network/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/bluetooth +install profiles/proximity/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/bluetooth + +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libbluetooth.la %clean rm -rf $RPM_BUILD_ROOT %post /sbin/chkconfig --add bluetooth -/sbin/chkconfig --add dund -/sbin/chkconfig --add pand -/sbin/chkconfig --add rfcomm %service bluetooth restart -%service dund restart -%service pand restart -%service rfcomm restart +%systemd_post bluetooth.service %preun if [ "$1" = "0" ]; then %service bluetooth stop - %service dund stop - %service pand stop - %service rfcomm stop /sbin/chkconfig --del bluetooth - /sbin/chkconfig --del dund - /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 + +%triggerpostun -- bluez < 5.13-1 +%service rfcomm stop +/sbin/chkconfig --del rfcomm %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig @@ -259,50 +220,67 @@ fi %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog README -%attr(755,root,root) %{_bindir}/* -%attr(755,root,root) %{_sbindir}/* +%attr(755,root,root) %{_bindir}/bccmd +%attr(755,root,root) %{_bindir}/bluemoon +%attr(755,root,root) %{_bindir}/bluetoothctl +%attr(755,root,root) %{_bindir}/btmon +%attr(755,root,root) %{_bindir}/ciptool +%attr(755,root,root) %{_bindir}/hciattach +%attr(755,root,root) %{_bindir}/hciconfig +%attr(755,root,root) %{_bindir}/hcidump +%attr(755,root,root) %{_bindir}/hcitool +%attr(755,root,root) %{_bindir}/hex2hcd +%attr(755,root,root) %{_bindir}/l2ping +%attr(755,root,root) %{_bindir}/l2test +%attr(755,root,root) %{_bindir}/mpris-proxy +%attr(755,root,root) %{_bindir}/rctest +%attr(755,root,root) %{_bindir}/rfcomm +%attr(755,root,root) %{_bindir}/sdptool %dir %{_libdir}/bluetooth +%attr(755,root,root) %{_libdir}/bluetooth/bluetoothd +%attr(755,root,root) %{_libdir}/bluetooth/obexd %dir %{_libdir}/bluetooth/plugins -%attr(755,root,root) %{_libdir}/bluetooth/plugins/*.so +%attr(755,root,root) %{_libdir}/bluetooth/plugins/sixaxis.so +%dir %{_libdir}/obex +%dir %{_libdir}/obex/plugins %dir %{_sysconfdir}/bluetooth -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bluetooth/main.conf -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bluetooth/rfcomm.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bluetooth/input.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bluetooth/network.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bluetooth/proximity.conf %attr(754,root,root) /etc/rc.d/init.d/bluetooth -%attr(754,root,root) /etc/rc.d/init.d/dund -%attr(754,root,root) /etc/rc.d/init.d/pand -%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 -%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 -%{_mandir}/man[18]/* - -%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 +%{systemdunitdir}/bluetooth.service +%{systemduserunitdir}/obex.service +%{_datadir}/dbus-1/services/org.bluez.obex.service +%{_datadir}/dbus-1/system-services/org.bluez.service +%attr(755,root,root) %{udevdir}/hid2hci +%{udevdir}/rules.d/97-hid2hci.rules +%{_mandir}/man1/bccmd.1* +%{_mandir}/man1/ciptool.1* +%{_mandir}/man1/hciattach.1* +%{_mandir}/man1/hciconfig.1* +%{_mandir}/man1/hcidump.1* +%{_mandir}/man1/hcitool.1* +%{_mandir}/man1/hid2hci.1* +%{_mandir}/man1/l2ping.1* +%{_mandir}/man1/rctest.1* +%{_mandir}/man1/rfcomm.1* +%{_mandir}/man1/sdptool.1* +%{_mandir}/man8/bluetoothd.8* %files -n cups-backend-bluetooth %defattr(644,root,root,755) %attr(755,root,root) %{_prefix}/lib/cups/backend/bluetooth -%files -n gstreamer-bluetooth -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/gstreamer*/libgstbluetooth.so - %files libs %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libbluetooth.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libbluetooth.so.[0-9] +%attr(755,root,root) %ghost %{_libdir}/libbluetooth.so.3 %files libs-devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libbluetooth.so -%{_libdir}/libbluetooth.la %{_includedir}/bluetooth %{_pkgconfigdir}/bluez.pc