X-Git-Url: http://git.pld-linux.org/?p=packages%2Fbluez.git;a=blobdiff_plain;f=bluez.spec;h=615daeae198c5e0acb1a8f8266287e20900ba02b;hp=81938a21f5d998ba5f59365645f6621b8b28b3fe;hb=9f205e40178d1537e041e9f594d5680d55a3dbb9;hpb=8e2aef6c61151a9f7e769906c9431ce46495f6a0 diff --git a/bluez.spec b/bluez.spec index 81938a2..615daea 100644 --- a/bluez.spec +++ b/bluez.spec @@ -1,39 +1,46 @@ Summary: Bluetooth utilities Summary(pl.UTF-8): Narzędzia Bluetooth Name: bluez -Version: 4.2 -Release: 0.1 -Epoch: 0 +Version: 4.91 +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: 60344bd096fda1742e4dbd603b1a06e9 +# Source0-md5: 3059b7ef5168c84cd0c6a67034ce79f9 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}-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: dbus-devel >= 1.0 +BuildRequires: glib2-devel >= 1:2.14 BuildRequires: gstreamer-devel >= 0.10 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 +BuildRequires: udev-devel Requires: %{name}-libs = %{epoch}:%{version}-%{release} +Requires: glib2 >= 1:2.14 +Requires: hwdata >= 0.225 Requires: rc-scripts +Provides: bluez-utils = %{epoch}:%{version}-%{release} Obsoletes: bluez-hciemu Obsoletes: bluez-pan Obsoletes: bluez-sdp +Obsoletes: bluez-utils Obsoletes: bluez-utils-init Conflicts: bluez-bluefw ExcludeArch: s390 s390x @@ -41,14 +48,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 @@ -60,10 +68,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 @@ -163,6 +172,8 @@ aplikacji Bluetooth. %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build %{__libtoolize} @@ -171,14 +182,15 @@ aplikacji Bluetooth. %{__autoheader} %{__automake} %configure \ + --with-ouifile=%{_datadir}/hwdata/oui.txt \ + --disable-silent-rules \ --enable-shared \ --enable-static \ --enable-alsa \ - --enable-bccmd \ - --enable-configfiles \ - --enable-netlink \ --enable-audio \ --enable-bccmd \ + --enable-capng \ + --enable-configfiles \ --enable-cups \ --enable-dfutool \ --enable-dund \ @@ -186,82 +198,123 @@ aplikacji Bluetooth. --enable-hid2hci \ --enable-hidd \ --enable-input \ - --enable-manpages \ --enable-network \ --enable-pand \ - --enable-pcmciarules \ + --enable-pcmcia \ --enable-serial \ --enable-tools \ - --enable-test \ - --enable-usb + --enable-usb \ + --enable-udevrules %{__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}} %{__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 + +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 -f $RPM_BUILD_ROOT%{_libdir}/alsa-lib/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/bluetooth/plugins/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer*/libgstbluetooth.la +%{__rm} $RPM_BUILD_ROOT%{_libdir}/alsa-lib/*.{la,a} +%{__rm} $RPM_BUILD_ROOT%{_libdir}/gstreamer*/libgstbluetooth.{la,a} %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 %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 -%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}/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 +%attr(755,root,root) %{_sbindir}/hid2hci %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 %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]/* +%{udevdir}/rules.d/97-bluetooth.rules +%{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) +%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 @@ -276,14 +329,13 @@ 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