I do not agree the commits. See below comments.
> -----Original Message----- > From: [email protected] > [mailto:[email protected]] On Behalf Of zhengwu > Sent: Friday, July 01, 2011 1:15 AM > To: [email protected] > Subject: [meego-commits] 22061: Changes to MeeGo:1.2:oss:Testing/bluez > > Hi, > I have made the following changes to bluez in project MeeGo:1.2:oss:Testing. > Please review and accept ASAP. > > Thank You, > zhengwu > > [This message was auto-generated] > > --- > > Request #22061: > > submit: > home:zhengwu:branches:MeeGo:1.2:oss:Testing/bluez(r6)(noupdate) -> > MeeGo:1.2:oss:Testing/bluez > > > Message: > Modify the param of audio.conf for HSP[Moorsetown] > > State: new 2011-07-01T01:15:03 zhengwu > Comment: None > > > > changes files: > -------------- > --- bluez.changes > +++ bluez.changes > @@ -0,0 +1,3 @@ > +* Fri Jul 1 2011 Zheng wu <[email protected]> - 4.87 > +- Modify audio.conf for supporting HSP[Moorsetown] and fixing BMC #20464 > + > > new: > ---- > ia32_oemtable_audio.conf > > spec files: > ----------- > --- bluez.spec > +++ bluez.spec > @@ -14,6 +14,7 @@ > URL: http://www.bluez.org/ > Source0: > http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz > Source1: bluetooth.init > +Source2: ia32_oemtable_audio.conf I do not think we need this file. > Source100: bluez.yaml > Patch0: bluez-fsync.patch > Patch1: remove-duplicate-wrong-udev-rule-for-dell-mice.patch > @@ -26,6 +27,7 @@ > Requires: dbus >= 0.60 > Requires: hwdata >= 0.215 > Requires: ofono >= 0.2 > +Requires: boardname >= 0.1 Bluez can't add below requirement, must set the requirement somewhere else. > Requires(post): /sbin/service > Requires(post): /sbin/chkconfig > Requires(postun): /sbin/service > @@ -170,6 +172,7 @@ > # >> install post > > install -D -m0755 %SOURCE1 > $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/bluetooth > +cp -a %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/bluetooth/ia32_oemtable_audio.conf > > # Remove the cups backend from libdir, and install it in /usr/lib whatever > the > install > rm -rf ${RPM_BUILD_ROOT}%{_libdir}/cups > @@ -181,8 +184,26 @@ > > > > - > - > +%post > +/sbin/ldconfig > +if [ -e /sbin/boardname ]; then > + BOARDNAME_REVISION=`/sbin/boardname` > + BOARDNAME=`echo $BOARDNAME_REVISION | sed 's!_[0-9]*$!!g'` > + if [ $BOARDNAME = ia32_oemtablet ]; then > + if [ -e %{_sysconfdir}/bluetooth/audio.conf ]; then > + rm -f %{_sysconfdir}/bluetooth/audio.conf > + fi > + > mv %{_sysconfdir}/bluetooth/ia32_oemtable_audio.conf %{_sysconfdir}/bluet > ooth/audio.conf > + else > + if [ -e %{_sysconfdir}/bluetooth/ia32_oemtable_audio.conf ]; then > + rm -f %{_sysconfdir}/bluetooth/ia32_oemtable_audio.conf > + fi > + fi > +else > + if [ -e %{_sysconfdir}/bluetooth/ia32_oemtable_audio.conf ]; then > + rm -f %{_sysconfdir}/bluetooth/ia32_oemtable_audio.conf > + fi > +fi No need at all, just a one line of script to modify original configure file. Otherwise, all the originally configure will lost, and we needs to maintain to copy of configure files. > > %post libs -p /sbin/ldconfig > > other changes: > -------------- > > ++++++ bluez.yaml > --- bluez.yaml > +++ bluez.yaml > @@ -8,6 +8,7 @@ > Sources: > - http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz > - bluetooth.init > + - ia32_oemtable_audio.conf > Patches: > - bluez-fsync.patch > - remove-duplicate-wrong-udev-rule-for-dell-mice.patch > @@ -35,6 +36,7 @@ > - dbus >= 0.60 > - hwdata >= 0.215 > - ofono >= 0.2 > + - boardname >= 0.1 > > PkgConfigBR: > - dbus-1 > > ++++++ ia32_oemtable_audio.conf (new) > --- ia32_oemtable_audio.conf > +++ ia32_oemtable_audio.conf > +# Configuration file for the audio service > + > +# This section contains options which are not specific to any > +# particular interface > +[General] > +Enable=Gateway > +# Switch to master role for incoming connections (defaults to true) > +#Master=true > + > +# If we want to disable support for specific services > +# Defaults to supporting all implemented services > +#Disable=Control,Source > + > +# SCO routing. Either PCM or HCI (in which case audio is routed to/from ALSA) > +# Defaults to HCI > +SCORouting=PCM > + > +# Automatically connect both A2DP and HFP/HSP profiles for incoming > +# connections. Some headsets that support both profiles will only connect the > +# other one automatically so the default setting of true is usually a good > +# idea. > +#AutoConnect=true > + > +# Headset interface specific options (i.e. options which affect how the audio > +# service interacts with remote headset devices) > +[Headset] > + > +# Set to true to support HFP, false means only HSP is supported > +# Defaults to true > +HFP=true > + > +# Maximum number of connected HSP/HFP devices per adapter. Defaults to 1 > +MaxConnected=1 > + > +# Set to true to enable use of fast connectable mode (faster page scanning) > +# for HFP when incomming call starts. Default settings are restored after > +# call is answered or rejected. Page scan interval is much shorter and page > +# scan type changed to interlaced. Such allows faster connection initiated > +# by a headset. > +FastConnectable=false > + > +# Just an example of potential config options for the other interfaces > +#[A2DP] > +#SBCSources=1 > +#MPEG12Sources=0 > > _______________________________________________ > MeeGo-commits mailing list > [email protected] > http://lists.meego.com/listinfo/meego-commits _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
