diff --git a/.gitignore b/.gitignore index 5c52fcd..6a2d3ba 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ alsa-utils-1.0.22.tar.bz2 alsa-utils-1.0.23.tar.bz2 /alsa-utils-1.0.24.tar.bz2 /alsa-utils-1.0.24.1.tar.bz2 +/alsa-utils-1.0.25.tar.bz2 diff --git a/0001-Unmute-MacBookAir4-1-speakers.patch b/0001-Unmute-MacBookAir4-1-speakers.patch deleted file mode 100644 index 393639a..0000000 --- a/0001-Unmute-MacBookAir4-1-speakers.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a0c92daabf4fdc0a636f445ec2312c1b4fe04421 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Wed, 14 Sep 2011 12:13:04 +0100 -Subject: [PATCH] Unmute MacBookAir4,1 speakers - ---- - alsactl/init/default | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -diff --git a/alsactl/init/default b/alsactl/init/default -index 7f8ec4c..198a306 100644 ---- a/alsactl/init/default -+++ b/alsactl/init/default -@@ -174,6 +174,16 @@ CTL{name}="AC97 Playback Volume",CTL{do_search}=="1", \ - CTL{name}="AC97 Playback Switch",CTL{do_search}=="1", \ - CTL{values}="on" - -+CTL{reset}="mixer" -+# With, and without typo, see -+# http://thread.gmane.org/gmane.linux.alsa.devel/89179 -+CTL{name}="Surround Speaker Playback Volum",CTL{do_search}=="1", \ -+ CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="100%" -+CTL{name}="Surround Speaker Playback Volume",CTL{do_search}=="1", \ -+ CTL{values}="$env{pvolume}",RESULT!="0",CTL{values}="100%" -+CTL{name}="Surround Speaker Playback Switch",CTL{do_search}=="1", \ -+ CTL{values}="on" -+ - # - # Powermacs - # --- -1.7.6.2 - diff --git a/alsa-utils.spec b/alsa-utils.spec index 862f7b3..355045a 100644 --- a/alsa-utils.spec +++ b/alsa-utils.spec @@ -1,10 +1,10 @@ -%define baseversion 1.0.24 -%define fixversion .1 +%define baseversion 1.0.25 +#define fixversion .1 Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils Version: %{baseversion}%{?fixversion} -Release: 8%{?dist} +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -27,16 +27,12 @@ Conflicts: udev <= 179-2 Requires: alsa-lib >= %{baseversion}, systemd-units >= 39-2, dialog Conflicts: filesystem < 3 -# https://bugzilla.redhat.com/show_bug.cgi?id=738227 -Patch0: 0001-Unmute-MacBookAir4-1-speakers.patch - %description This package contains command line utilities for the Advanced Linux Sound Architecture (ALSA). %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -b .mba41 %build %configure CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" --disable-alsaconf \ @@ -112,6 +108,9 @@ if [ -s /etc/asound.state -a ! -s /var/lib/alsa/asound.state ] ; then fi %changelog +* Tue Jan 31 2012 Jaroslav Kysela 1.0.25-1 +- update to 1.0.25 final + * Wed Jan 25 2012 Harald Hoyer 1.0.24.1-8 - install everything in /usr https://fedoraproject.org/wiki/Features/UsrMove diff --git a/sources b/sources index feba4f1..7e5731d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cee59c8d811fdf01398433e4c3381c0b alsa-utils-1.0.24.1.tar.bz2 +f81f9dcb9a014fd32cb3a70066a5b9a9 alsa-utils-1.0.25.tar.bz2