more fixes for 1.0.23 release

This commit is contained in:
perex 2010-06-28 12:15:32 +00:00
parent 1c68cd765e
commit ca0aa57e16
3 changed files with 56 additions and 2 deletions

View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
SCRIPT_VERSION=0.4.58 SCRIPT_VERSION=0.4.59
CHANGELOG="http://www.alsa-project.org/alsa-info.sh.changelog" CHANGELOG="http://www.alsa-project.org/alsa-info.sh.changelog"
################################################################################# #################################################################################
@ -439,6 +439,9 @@ cat /proc/asound/card*/codec\#* > $TEMPDIR/alsa-hda-intel.tmp 2> /dev/null
cat /proc/asound/card*/codec97\#0/ac97\#0-0 > $TEMPDIR/alsa-ac97.tmp 2> /dev/null cat /proc/asound/card*/codec97\#0/ac97\#0-0 > $TEMPDIR/alsa-ac97.tmp 2> /dev/null
cat /proc/asound/card*/codec97\#0/ac97\#0-0+regs > $TEMPDIR/alsa-ac97-regs.tmp 2> /dev/null cat /proc/asound/card*/codec97\#0/ac97\#0-0+regs > $TEMPDIR/alsa-ac97-regs.tmp 2> /dev/null
#Check for USB mixer setup
cat /proc/asound/card*/usbmixer > $TEMPDIR/alsa-usbmixer.tmp 2> /dev/null
#Fetch the info, and put it in $FILE in a nice readable format. #Fetch the info, and put it in $FILE in a nice readable format.
if [[ -z $PASTEBIN ]]; then if [[ -z $PASTEBIN ]]; then
echo "upload=true&script=true&cardinfo=" > $FILE echo "upload=true&script=true&cardinfo=" > $FILE
@ -596,6 +599,17 @@ then
echo "" >> $FILE echo "" >> $FILE
fi fi
if [ -s "$TEMPDIR/alsa-usbmixer.tmp" ]
then
echo "!!USB Mixer information" >> $FILE
echo "!!---------------------------" >> $FILE
echo "--startcollapse--" >> $FILE
echo "" >> $FILE
cat $TEMPDIR/alsa-usbmixer.tmp >> $FILE
echo "--endcollapse--" >> $FILE
echo "" >> $FILE
echo "" >> $FILE
fi
#If no command line options are specified, then run as though --with-all was specified #If no command line options are specified, then run as though --with-all was specified
if [[ -z "$1" ]] if [[ -z "$1" ]]

View File

@ -4,12 +4,13 @@
Summary: Advanced Linux Sound Architecture (ALSA) utilities Summary: Advanced Linux Sound Architecture (ALSA) utilities
Name: alsa-utils Name: alsa-utils
Version: 1.0.23 Version: 1.0.23
Release: 1%{?prever_dot}%{?dist} Release: 3%{?prever_dot}%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/Multimedia Group: Applications/Multimedia
URL: http://www.alsa-project.org/ URL: http://www.alsa-project.org/
Source: ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version}%{?prever}.tar.bz2 Source: ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version}%{?prever}.tar.bz2
Source4: alsaunmute Source4: alsaunmute
Source5: alsaunmute.1
Source6: alsa-info.sh Source6: alsa-info.sh
Source10: alsa.rules Source10: alsa.rules
Source11: alsactl.conf Source11: alsactl.conf
@ -19,6 +20,7 @@ BuildRequires: ncurses-devel
BuildRequires: gettext-devel BuildRequires: gettext-devel
BuildRequires: xmlto BuildRequires: xmlto
Conflicts: udev < 062 Conflicts: udev < 062
Requires: alsa-lib >= %{version}, dialog
%description %description
This package contains command line utilities for the Advanced Linux Sound This package contains command line utilities for the Advanced Linux Sound
@ -44,6 +46,10 @@ install -p -m 644 %{SOURCE10} $RPM_BUILD_ROOT/etc/udev/rules.d/90-alsa.rules
# Install support utilities # Install support utilities
mkdir -p -m755 $RPM_BUILD_ROOT/bin mkdir -p -m755 $RPM_BUILD_ROOT/bin
install -p -m 755 alsaunmute %{buildroot}/bin/ install -p -m 755 alsaunmute %{buildroot}/bin/
mkdir -p -m755 $RPM_BUILD_ROOT/%{_mandir}/man1
gzip -9 -c %{SOURCE5} > $RPM_BUILD_ROOT/alsaunmute.1.gz
install -p -m 755 $RPM_BUILD_ROOT/alsaunmute.1.gz %{buildroot}/%{_mandir}/man1
rm $RPM_BUILD_ROOT/alsaunmute.1.gz
# Link alsactl to /usr/sbin # Link alsactl to /usr/sbin
mkdir -p $RPM_BUILD_ROOT/%{_sbindir} mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
@ -92,6 +98,12 @@ if [ -s /etc/alsa/asound.state -a ! -s /etc/asound.state ] ; then
fi fi
%changelog %changelog
* Mon Jun 28 2010 Jaroslav Kysela <jkysela@redhat.com> 1.0.23-3
- add requires line (bug#526492) for specific alsa-lib package
- add requires line for dialog package (bug#561988)
- added man page for alsaunmute (bug#526174)
- updated alsa-info.sh script to 0.4.59
* Mon Jun 28 2010 Jaroslav Kysela <jkysela@redhat.com> 1.0.23-1 * Mon Jun 28 2010 Jaroslav Kysela <jkysela@redhat.com> 1.0.23-1
- updated to 1.0.23 final - updated to 1.0.23 final

28
alsaunmute.1 Normal file
View File

@ -0,0 +1,28 @@
.TH ALSAUNMUTE 1 "21 April 2010"
.SH NAME
alsaunmute \- a simple script to initialize ALSA sound devices
.SH DESCRIPTION
\fBalsaunmute\fP is a shell script which runs the \fBalsactl(1)\fP
utility with \fIinit\fP argument (see the script for details).
.SH OPTIONS
None
.SS
Example:
\fBalsaunmute\fR
.SH SEE ALSO
\fB
alsactl(1),
alsamixer(1),
amixer(1)
\fP
.SH BUGS
None known.
.SH AUTHOR
\fBalsaunmute\fP is by Jaroslav Kysela <perex@perex.cz>