X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=bluez.spec;h=c93f60a3a33e6fbbde18c086aaa31b01d43b2fb5;hb=a7b2e099a31ee544e7af86dcbecd24a8a105a118;hp=54d6545ff3ee73a36dbf37b294bbc24f5313e764;hpb=5e8dfcdf4b8d24fadb5d0f1162d6869b2bee14f6;p=packages%2Fbluez.git diff --git a/bluez.spec b/bluez.spec index 54d6545..c93f60a 100644 --- a/bluez.spec +++ b/bluez.spec @@ -1,39 +1,51 @@ Summary: Bluetooth utilities Summary(pl.UTF-8): Narzędzia Bluetooth Name: bluez -Version: 4.2 +Version: 4.101 Release: 2 -Epoch: 0 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: 60344bd096fda1742e4dbd603b1a06e9 +Source0: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.bz2 +# Source0-md5: 902b390af95c6c5d6d1a17d94c8344ab Source1: %{name}.init Source2: %{name}.sysconfig -Source3: %{name}-udev.rules -Source4: %{name}-udev.script +Source3: dund.init +Source4: pand.init +Source5: rfcomm.init Patch0: %{name}-etc_dir.patch +Patch1: %{name}-wacom-mode-2.patch +Patch2: %{name}-audio_socket.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: check-devel >= 0.9.6 +BuildRequires: dbus-devel >= 1.4 +BuildRequires: glib2-devel >= 1:2.28 +BuildRequires: gstreamer-devel >= 0.10.30 BuildRequires: gstreamer-plugins-base-devel >= 0.10 +BuildRequires: libcap-ng-devel BuildRequires: libsndfile-devel BuildRequires: libtool -BuildRequires: libusb-devel -BuildRequires: openobex-devel >= 1.1 +BuildRequires: libusb-compat-devel BuildRequires: pkgconfig >= 1:0.9.0 -BuildRequires: rpmbuild(macros) >= 1.268 -Requires: %{name}-libs = %{epoch}:%{version}-%{release} +BuildRequires: readline-devel +BuildRequires: rpmbuild(macros) >= 1.626 +BuildRequires: udev-devel +Requires(post,preun,postun): systemd-units >= 38 +Requires: %{name}-libs = %{version}-%{release} +Requires: dbus-libs >= 1.4 +Requires: glib2 >= 1:2.28 +Requires: hwdata >= 0.225 Requires: rc-scripts +Requires: systemd-units >= 38 +Provides: bluez-utils = %{version}-%{release} Obsoletes: bluez-hciemu Obsoletes: bluez-pan Obsoletes: bluez-sdp +Obsoletes: bluez-systemd Obsoletes: bluez-utils Obsoletes: bluez-utils-init Conflicts: bluez-bluefw @@ -42,14 +54,15 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # currently lib, not %{_lib} (see cups.spec) %define cupsdir /usr/lib/cups/backend -%define udevdir /%{_lib}/udev +%define udevdir /lib/udev %description Bluetooth utilities: + - bluetoothd + - dund - hcitool - hciattach - hciconfig - - hcid - hciemu - hidd - l2ping @@ -61,10 +74,11 @@ 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 - - hcid - hciemu - hidd - l2ping @@ -79,7 +93,7 @@ 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: %{name} = %{version}-%{release} Requires: alsa-lib >= 1.0.10-1 %description -n alsa-plugins-bluetooth @@ -92,7 +106,7 @@ Wtyczki systemu ALSA dla urządzeń dźwiękowych 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 @@ -105,8 +119,8 @@ Backend Bluetooth dla CUPS-a. 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: bluez-libs >= %{version}-%{release} +Requires: gstreamer >= 0.10.30 Requires: gstreamer-plugins-base >= 0.10 %description -n gstreamer-bluetooth @@ -118,7 +132,7 @@ 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 @@ -135,7 +149,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 @@ -150,7 +164,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 @@ -164,6 +178,8 @@ aplikacji Bluetooth. %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build %{__libtoolize} @@ -172,98 +188,154 @@ aplikacji Bluetooth. %{__autoheader} %{__automake} %configure \ + --with-ouifile=%{_datadir}/hwdata/oui.txt \ + --with-systemdunitdir=%{systemdunitdir} \ + --disable-silent-rules \ --enable-shared \ --enable-static \ --enable-alsa \ - --enable-bccmd \ - --enable-configfiles \ - --enable-netlink \ --enable-audio \ --enable-bccmd \ + --enable-capng \ --enable-cups \ + --enable-dbusoob \ --enable-dfutool \ --enable-dund \ + --enable-gatt \ --enable-gstreamer \ + --enable-health \ --enable-hid2hci \ --enable-hidd \ --enable-input \ - --enable-manpages \ --enable-network \ --enable-pand \ - --enable-pcmciarules \ + --enable-pcmcia \ + --enable-pnat \ --enable-serial \ + --enable-thermometer \ --enable-tools \ - --enable-test \ - --enable-usb + --enable-usb \ + --enable-wiimote %{__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/udev/rules.d,%{udevdir}} +install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig} \ + $RPM_BUILD_ROOT%{_libdir}/bluetooth/plugins %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ cupsdir=%{cupsdir} \ + rulesdir=%{udevdir}/rules.d \ udevdir=%{udevdir} -# noinst -#install sync/bluetoothd-service-sync $RPM_BUILD_ROOT%{_libdir}/bluetooth - 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/udev/rules.d/70-bluetooth.rules -install %{SOURCE4} $RPM_BUILD_ROOT%{udevdir}/bluetooth.sh -install test/passkey-agent $RPM_BUILD_ROOT%{_bindir} -mv $RPM_BUILD_ROOT/etc/udev/bluetooth.rules \ - $RPM_BUILD_ROOT/etc/udev/rules.d/71-bluetooth.rules +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 audio/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/bluetooth +install input/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/bluetooth +install network/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/bluetooth +install serial/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/bluetooth + +mv -fT $RPM_BUILD_ROOT{%{_datadir},%{_sysconfdir}}/alsa + +%{__rm} $RPM_BUILD_ROOT%{_libdir}/{alsa-lib/*.{la,a},gstreamer*/libgstbluetooth.{la,a},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 -%post libs -p /sbin/ldconfig +%post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files %defattr(644,root,root,755) -%doc AUTHORS ChangeLog README audio/audio-api.txt input/input-api.txt network/network-api.txt serial/serial-api.txt -%attr(755,root,root) %{_bindir}/* -%attr(755,root,root) %{_sbindir}/* +%doc AUTHORS ChangeLog README +%attr(755,root,root) %{_bindir}/ciptool +%attr(755,root,root) %{_bindir}/dfutool +%attr(755,root,root) %{_bindir}/dund +%attr(755,root,root) %{_bindir}/gatttool +%attr(755,root,root) %{_bindir}/hcitool +%attr(755,root,root) %{_bindir}/hidd +%attr(755,root,root) %{_bindir}/l2ping +%attr(755,root,root) %{_bindir}/pand +%attr(755,root,root) %{_bindir}/rfcomm +%attr(755,root,root) %{_bindir}/sdptool +%attr(755,root,root) %{_sbindir}/bccmd +%attr(755,root,root) %{_sbindir}/bluetoothd +%attr(755,root,root) %{_sbindir}/hciattach +%attr(755,root,root) %{_sbindir}/hciconfig %dir %{_libdir}/bluetooth %dir %{_libdir}/bluetooth/plugins -%attr(755,root,root) %{_libdir}/bluetooth/plugins/*.so %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/*.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.sh +%{systemdunitdir}/bluetooth.service +%{_datadir}/dbus-1/system-services/org.bluez.service %attr(755,root,root) %{udevdir}/bluetooth_serial -%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/70-bluetooth.rules -%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/71-bluetooth.rules -%{_mandir}/man[18]/* +%attr(755,root,root) %{udevdir}/hid2hci +%{udevdir}/rules.d/97-bluetooth-hid2hci.rules +%{udevdir}/rules.d/97-bluetooth-serial.rules +%{_mandir}/man1/ciptool.1* +%{_mandir}/man1/dfutool.1* +%{_mandir}/man1/dund.1* +%{_mandir}/man1/hcitool.1* +%{_mandir}/man1/hidd.1* +%{_mandir}/man1/pand.1* +%{_mandir}/man1/rfcomm.1* +%{_mandir}/man1/sdptool.1* +%{_mandir}/man8/bccmd.8* +%{_mandir}/man8/bluetoothd.8* +%{_mandir}/man8/hciattach.8* +%{_mandir}/man8/hciconfig.8* +%{_mandir}/man8/hid2hci.8* +%{_mandir}/man8/l2ping.8* %files -n alsa-plugins-bluetooth %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/alsa-lib/libasound_module_ctl_bluetooth.so +%{_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 %files -n cups-backend-bluetooth @@ -277,14 +349,12 @@ fi %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 -%{_aclocaldir}/bluez.m4 %{_pkgconfigdir}/bluez.pc %files libs-static