diff --git a/.gitignore b/.gitignore index b68c3a5..038cb0b 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ alsa-utils-1.0.20.tar.bz2 alsa-utils-1.0.21.tar.bz2 alsa-utils-1.0.22.tar.bz2 alsa-utils-1.0.23.tar.bz2 +/alsa-utils-1.0.24.tar.bz2 diff --git a/alsa-info.sh b/alsa-info.sh index c9d2a4e..fd7df96 100644 --- a/alsa-info.sh +++ b/alsa-info.sh @@ -1,6 +1,6 @@ #!/bin/bash -SCRIPT_VERSION=0.4.59 +SCRIPT_VERSION=0.4.60 CHANGELOG="http://www.alsa-project.org/alsa-info.sh.changelog" ################################################################################# @@ -423,9 +423,11 @@ if [ -d /sys/class/dmi/id ]; then # No root privileges are required when using sysfs method DMI_SYSTEM_MANUFACTURER=$(cat /sys/class/dmi/id/sys_vendor 2>/dev/null) DMI_SYSTEM_PRODUCT_NAME=$(cat /sys/class/dmi/id/product_name 2>/dev/null) + DMI_SYSTEM_PRODUCT_VERSION=$(cat /sys/class/dmi/id/product_version 2>/dev/null) elif [ -x $DMIDECODE ]; then DMI_SYSTEM_MANUFACTURER=$($DMIDECODE -s system-manufacturer 2>/dev/null) DMI_SYSTEM_PRODUCT_NAME=$($DMIDECODE -s system-product-name 2>/dev/null) + DMI_SYSTEM_PRODUCT_VERSION=$($DMIDECODE -s system-version 2>/dev/null) fi cat /proc/asound/modules 2>/dev/null|awk {'print $2'}>$TEMPDIR/alsamodules.tmp @@ -466,6 +468,7 @@ echo "!!---------------" >> $FILE echo "" >> $FILE echo "Manufacturer: $DMI_SYSTEM_MANUFACTURER" >> $FILE echo "Product Name: $DMI_SYSTEM_PRODUCT_NAME" >> $FILE +echo "Product Version: $DMI_SYSTEM_PRODUCT_VERSION" >> $FILE echo "" >> $FILE echo "" >> $FILE echo "!!Kernel Information" >> $FILE @@ -540,7 +543,7 @@ echo "" >> $FILE cat $TEMPDIR/lspci.tmp >> $FILE echo "" >> $FILE echo "" >> $FILE -echo "!!Advanced information - PCI Vendor/Device/Susbsystem ID's" >> $FILE +echo "!!Advanced information - PCI Vendor/Device/Subsystem ID's" >> $FILE echo "!!--------------------------------------------------------" >> $FILE echo "" >> $FILE lspci -vvn |grep -A1 040[1-3] >> $FILE diff --git a/alsa-utils.spec b/alsa-utils.spec index ec297a9..c0eec69 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -3,8 +3,8 @@ Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils -Version: 1.0.23 -Release: 4%{?prever_dot}%{?dist} +Version: 1.0.24 +Release: 1%{?prever_dot}%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -16,6 +16,7 @@ Source10: alsa.rules Source11: alsactl.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel >= %{version} +BuildRequires: libsamplerate-devel BuildRequires: ncurses-devel BuildRequires: gettext-devel BuildRequires: xmlto @@ -96,6 +97,10 @@ if [ -s /etc/alsa/asound.state -a ! -s /etc/asound.state ] ; then fi %changelog +* Fri Jan 28 2011 Jaroslav Kysela 1.0.24-1 +- updated to 1.0.24 final +- updated alsa-info.sh script to 0.4.60 + * Thu Jan 13 2011 Ville Skyttä - 1.0.23-4 - Fix alsaunmute man page permissions, let rpmbuild compress it. diff --git a/sources b/sources index c577a25..0bef182 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cb0cf46029ac9549cf3a31bff6a4f4e1 alsa-utils-1.0.23.tar.bz2 +7ceb24d6fad79406fb2cbdc919cb3b03 alsa-utils-1.0.24.tar.bz2