Drop the compat subpackage

... in preparation for rebasing to BlueZ 5.

https://bugzilla.redhat.com/show_bug.cgi?id=974145
This commit is contained in:
Kalev Lember 2013-08-10 21:50:09 +02:00
parent 34d6c0af39
commit e321c716dd
6 changed files with 6 additions and 272 deletions

View File

@ -8,11 +8,6 @@ URL: http://www.bluez.org/
Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
Source1: bluez.gitignore
Source3: dund.init
Source4: dund.conf
Source5: pand.init
Source6: pand.conf
Source7: rfcomm.init
Source8: bluez-uinput.modules
# Ubuntu patches
@ -47,6 +42,9 @@ Requires: dbus-bluez-pin-helper
Requires(preun): /bin/systemctl
Requires(post): /bin/systemctl
# Dropped in Fedora 20:
Obsoletes: bluez-compat < 5.0
%description
Utilities for use in Bluetooth applications:
- hcitool
@ -85,14 +83,6 @@ Summary: ALSA support for Bluetooth audio devices
Group: System Environment/Daemons
Requires: bluez-libs = %{version}-%{release}
%package compat
Summary: Compatibility utilities for Bluetooth devices
Group: System Environment/Daemons
Requires: bluez-libs = %{version}-%{release}
Requires: bluez = %{version}-%{release}
Requires(preun): /sbin/chkconfig, /sbin/service
Requires(post): /sbin/chkconfig, /sbin/service
%package hid2hci
Summary: Put HID proxying bluetooth HCI's into HCI mode
Group: System Environment/Daemons
@ -115,10 +105,6 @@ Libraries for use in Bluetooth applications.
bluez-libs-devel contains development libraries and headers for
use in Bluetooth applications.
%description compat
This package contains compatibility utilities for Bluetooth devices.
This includes hidd, dund and pand.
%description hid2hci
Most allinone PC's and bluetooth keyboard / mouse sets which include a
bluetooth dongle, ship with a so called HID proxying bluetooth HCI.
@ -155,7 +141,7 @@ git am -p1 %{patches} < /dev/null
%build
libtoolize -f -c
autoreconf -vif
%configure --enable-cups --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hidd --enable-pand --enable-dund --enable-hid2hci --with-ouifile=/usr/share/hwdata/oui.txt --with-systemdsystemunitdir=/lib/systemd/system --enable-wiimote
%configure --enable-cups --enable-dfutool --enable-tools --enable-bccmd --enable-gstreamer --enable-hid2hci --with-ouifile=/usr/share/hwdata/oui.txt --with-systemdsystemunitdir=/lib/systemd/system --enable-wiimote
make V=1
%install
@ -167,19 +153,14 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la \
$RPM_BUILD_ROOT/%{_libdir}/bluetooth/plugins/*.la \
$RPM_BUILD_ROOT/%{_libdir}/gstreamer-0.10/*.la
for a in dund pand rfcomm ; do
install -D -m0755 $RPM_SOURCE_DIR/$a.init $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/$a
if [ -e $RPM_SOURCE_DIR/$a.conf ] ; then
install -D -m0644 $RPM_SOURCE_DIR/$a.conf $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/$a
fi
done
# Remove the cups backend from libdir, and install it in /usr/lib whatever the install
if test -d ${RPM_BUILD_ROOT}/usr/lib64/cups ; then
install -D -m0755 ${RPM_BUILD_ROOT}/usr/lib64/cups/backend/bluetooth ${RPM_BUILD_ROOT}%_cups_serverbin/backend/bluetooth
rm -rf ${RPM_BUILD_ROOT}%{_libdir}/cups
fi
rm -f ${RPM_BUILD_ROOT}/%{_sysconfdir}/bluetooth/rfcomm.conf
rm -f ${RPM_BUILD_ROOT}/%{_sysconfdir}/udev/*.rules ${RPM_BUILD_ROOT}/lib/udev/rules.d/*.rules
install -D -p -m0644 scripts/bluetooth-serial.rules ${RPM_BUILD_ROOT}/lib/udev/rules.d/97-bluetooth-serial.rules
install -D -p -m0644 scripts/bluetooth-hid2hci.rules ${RPM_BUILD_ROOT}/lib/udev/rules.d/97-bluetooth-hid2hci.rules
@ -217,27 +198,6 @@ fi
%triggerun -- bluez < 4.94-4
/bin/systemctl --no-reload enable bluetooth.service >/dev/null 2>&1 || :
%post compat
/sbin/chkconfig --add dund
/sbin/chkconfig --add pand
/sbin/chkconfig --add rfcomm
if [ "$1" -ge "1" ]; then
/sbin/service dund condrestart >/dev/null 2>&1 || :
/sbin/service pand condrestart >/dev/null 2>&1 || :
/sbin/service rfcomm condrestart >/dev/null 2>&1 || :
fi
exit 0
%preun compat
if [ "$1" = "0" ]; then
/sbin/service dund stop >/dev/null 2>&1 || :
/sbin/service pand stop >/dev/null 2>&1 || :
/sbin/service rfcomm stop >/dev/null 2>&1 || :
/sbin/chkconfig --del dund
/sbin/chkconfig --del pand
/sbin/chkconfig --del rfcomm
fi
%post hid2hci
/sbin/udevadm trigger --subsystem-match=usb
@ -295,21 +255,6 @@ fi
%{_libdir}/alsa-lib/*.so
%{_datadir}/alsa/bluetooth.conf
%files compat
%defattr(-,root,root,-)
%{_bindir}/dund
%{_bindir}/pand
%{_bindir}/hidd
%config(noreplace) %{_sysconfdir}/bluetooth/rfcomm.conf
%{_sysconfdir}/rc.d/init.d/dund
%{_sysconfdir}/rc.d/init.d/rfcomm
%{_sysconfdir}/rc.d/init.d/pand
%config(noreplace) %{_sysconfdir}/sysconfig/dund
%config(noreplace) %{_sysconfdir}/sysconfig/pand
%{_mandir}/man1/dund.1.gz
%{_mandir}/man1/hidd.1.gz
%{_mandir}/man1/pand.1.gz
%files hid2hci
%defattr(-,root,root,-)
/usr/lib/udev/hid2hci

View File

@ -1 +0,0 @@
#DUNDARGS='--search --persist'

View File

@ -1,70 +0,0 @@
#!/bin/sh
# chkconfig: - 26 89
### BEGIN INIT INFO
# Required-Start: bluetooth
# Default-Start:
# Short-Description: Bluetooth Dial-Up-Networking Daemon.
# Description: Bluetooth Dial-Up-Networking Daemon. Provides PPP over RFCOMM
# services.
### END INIT INFO
# Source function library.
. /etc/rc.d/init.d/functions
[ -f /etc/sysconfig/network ] && . /etc/sysconfig/network
[ "${NETWORKING}" = "yes" ] || exit 0
[ -r /etc/sysconfig/dund ] && . /etc/sysconfig/dund
start()
{
[ -z "$DUNDARGS" ] && exit 6
echo -n $"Starting dund: "
daemon /usr/bin/dund $DUNDARGS
RETVAL=$?
echo
[ $RETVAL = 0 ] && touch /var/lock/subsys/dund
return $RETVAL
}
stop()
{
echo -n $"Shutting down dund: "
/usr/bin/dund -K
killproc dund
RETVAL=$?
rm -f /var/lock/subsys/dund
echo
return $RETVAL
}
# See how we were called.
case "$1" in
start)
start
;;
stop)
stop
;;
force-reload|restart|reload)
stop
start
;;
try-restart|condrestart)
[ -e /var/lock/subsys/dund ] && (stop; start)
;;
status)
status dund
RETVAL=$?
;;
*)
echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
exit 3
esac
exit $RETVAL

View File

@ -1,2 +0,0 @@
#PANDARGS='--listen --role NAP'
#PANDARGS='--search --cache --persist'

View File

@ -1,73 +0,0 @@
#!/bin/sh
# chkconfig: - 26 89
### BEGIN INIT INFO
# Required-Start: bluetooth
# Default-Start:
# Short-Description: Bluetooth Personal Area Networking Daemon.
# Description: Bluetooth Personal Area Networking Daemon. Provides network
# services over Bluetooth.
### END INIT INFO
# Source function library.
. /etc/rc.d/init.d/functions
[ -f /etc/sysconfig/network ] && . /etc/sysconfig/network
[ "${NETWORKING}" = "yes" ] || exit 0
[ -r /etc/sysconfig/pand ] && . /etc/sysconfig/pand
start()
{
[ -z "$PANDARGS" ] && exit 6
[ -x /etc/bluetooth/pan/system-up ] && /etc/bluetooth/pan/system-up
echo -n $"Starting pand: "
daemon /usr/bin/pand $PANDARGS
RETVAL=$?
echo
[ $RETVAL = 0 ] && touch /var/lock/subsys/pand
return $RETVAL
}
stop()
{
echo -n $"Shutting down pand: "
/usr/bin/pand -K
killproc pand
RETVAL=$?
[ -x /etc/bluetooth/pan/system-down ] && /etc/bluetooth/pan/system-down
rm -f /var/lock/subsys/pand
echo
return $RETVAL
}
[ -f /usr/bin/pand ] || exit 0
# See how we were called.
case "$1" in
start)
start
;;
stop)
stop
;;
force-reload|restart|reload)
stop
start
;;
try-restart|condrestart)
[ -e /var/lock/subsys/pand ] && (stop; start)
;;
status)
status pand
RETVAL=$?
;;
*)
echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
exit 3
esac
exit $RETVAL

View File

@ -1,65 +0,0 @@
#!/bin/sh
# chkconfig: - 27 88
### BEGIN INIT INFO
# Required-Start: bluetooth
# Default-Start:
# Short-Description: Bluetooth RFCOMM setup.
# Description: Bluetooth RFCOMM setup. Sets up serial devices
# over Bluetooth.
### END INIT INFO
# Source function library.
. /etc/rc.d/init.d/functions
[ -f /etc/sysconfig/network ] && . /etc/sysconfig/network
[ "${NETWORKING}" = "yes" ] || exit 0
start()
{
echo -n $"Starting rfcomm: "
rfcomm bind all
RETVAL=$?
echo
[ $RETVAL = 0 ] && touch /var/lock/subsys/rfcomm
return $RETVAL
}
stop()
{
echo -n $"Shutting down rfcomm: "
rfcomm release all
RETVAL=$?
rm -f /var/lock/subsys/rfcomm
echo
return $RETVAL
}
# See how we were called.
case "$1" in
start)
start
;;
stop)
stop
;;
force-reload|restart|reload)
stop
start
;;
try-restart|condrestart)
[ -e /var/lock/subsys/rfcomm ] && (stop; start)
;;
status)
RETVAL=1
[ -e /var/lock/subsys/rfcomm ] && RETVAL=0
;;
*)
echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
exit 3
esac
exit $RETVAL