From 78088923b3ce7c87f42ce2bc9cec8e8e5ad9a7ed Mon Sep 17 00:00:00 2001
From: perex <perex@fedoraproject.org>
Date: Jul 21 2008 12:14:14 +0000
Subject: alsa-utils: regenerated alsaconf patch (fuzzy is disabled in koji)


---

diff --git a/alsa-utils-1.0.14-alsaconf.patch b/alsa-utils-1.0.14-alsaconf.patch
deleted file mode 100644
index f33a9b9..0000000
--- a/alsa-utils-1.0.14-alsaconf.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- alsa-utils-1.0.14/Makefile.in.orig	2007-05-31 10:07:29.000000000 +0200
-+++ alsa-utils-1.0.14/Makefile.in	2007-06-07 12:15:11.000000000 +0200
-@@ -65,7 +65,7 @@ RECURSIVE_TARGETS = all-recursive check-
- 	uninstall-recursive
- ETAGS = etags
- CTAGS = ctags
--DIST_SUBDIRS = include alsactl alsaconf alsamixer amidi amixer aplay \
-+DIST_SUBDIRS = include alsactl alsamixer amidi amixer aplay \
- 	iecset seq speaker-test utils m4 po
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
-@@ -194,7 +194,7 @@ target_alias = @target_alias@
- INCLUDES = -I$(top_srcdir)/include
- @ALSAMIXER_FALSE@ALSAMIXER_DIR = 
- @ALSAMIXER_TRUE@ALSAMIXER_DIR = alsamixer
--SUBDIRS = include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po
-+SUBDIRS = include alsactl $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po
- EXTRA_DIST = config.rpath  config.rpath mkinstalldirs ChangeLog INSTALL TODO README configure hgcompile depcomp
- AUTOMAKE_OPTIONS = foreign
- ACLOCAL_AMFLAGS = -I m4
---- alsa-utils-1.0.14/Makefile.am.orig	2007-05-31 10:07:23.000000000 +0200
-+++ alsa-utils-1.0.14/Makefile.am	2007-06-07 12:15:29.000000000 +0200
-@@ -4,7 +4,7 @@ ALSAMIXER_DIR=alsamixer
- else
- ALSAMIXER_DIR=
- endif
--SUBDIRS= include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po
-+SUBDIRS= include alsactl $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po
- EXTRA_DIST= config.rpath  config.rpath mkinstalldirs ChangeLog INSTALL TODO README configure hgcompile depcomp
- AUTOMAKE_OPTIONS=foreign
- ACLOCAL_AMFLAGS = -I m4
diff --git a/alsa-utils-1.0.17-alsaconf.patch b/alsa-utils-1.0.17-alsaconf.patch
new file mode 100644
index 0000000..1468819
--- /dev/null
+++ b/alsa-utils-1.0.17-alsaconf.patch
@@ -0,0 +1,33 @@
+diff -ruNp alsa-utils-1.0.17.orig/Makefile.am alsa-utils-1.0.17/Makefile.am
+--- alsa-utils-1.0.17.orig/Makefile.am	2008-07-14 11:16:02.000000000 +0200
++++ alsa-utils-1.0.17/Makefile.am	2008-07-21 14:10:06.000000000 +0200
+@@ -4,7 +4,7 @@ ALSAMIXER_DIR=alsamixer
+ else
+ ALSAMIXER_DIR=
+ endif
+-SUBDIRS= include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po
++SUBDIRS= include alsactl $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po
+ EXTRA_DIST= config.rpath  config.rpath mkinstalldirs ChangeLog INSTALL TODO README configure gitcompile depcomp
+ AUTOMAKE_OPTIONS=foreign
+ ACLOCAL_AMFLAGS = -I m4
+diff -ruNp alsa-utils-1.0.17.orig/Makefile.in alsa-utils-1.0.17/Makefile.in
+--- alsa-utils-1.0.17.orig/Makefile.in	2008-07-14 11:16:06.000000000 +0200
++++ alsa-utils-1.0.17/Makefile.in	2008-07-21 14:10:35.000000000 +0200
+@@ -65,7 +65,7 @@ RECURSIVE_TARGETS = all-recursive check-
+ 	uninstall-recursive
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = include alsactl alsaconf alsamixer amidi amixer aplay \
++DIST_SUBDIRS = include alsactl alsamixer amidi amixer aplay \
+ 	iecset seq speaker-test utils m4 po
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+@@ -197,7 +197,7 @@ target_alias = @target_alias@
+ INCLUDES = -I$(top_srcdir)/include
+ @ALSAMIXER_FALSE@ALSAMIXER_DIR = 
+ @ALSAMIXER_TRUE@ALSAMIXER_DIR = alsamixer
+-SUBDIRS = include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po
++SUBDIRS = include alsactl $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po
+ EXTRA_DIST = config.rpath  config.rpath mkinstalldirs ChangeLog INSTALL TODO README configure gitcompile depcomp
+ AUTOMAKE_OPTIONS = foreign
+ ACLOCAL_AMFLAGS = -I m4
diff --git a/alsa-utils.spec b/alsa-utils.spec
index 7fafc3b..ced0ea5 100644
--- a/alsa-utils.spec
+++ b/alsa-utils.spec
@@ -15,7 +15,7 @@ Source4: alsaunmute.c
 Source5: salsa.1
 Source6: alsa-info.sh
 Source10: alsa.rules
-Patch0:  alsa-utils-1.0.14-alsaconf.patch
+Patch0:  alsa-utils-1.0.17-alsaconf.patch
 Patch1:  alsa-utils-1.0.14-statedir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel >= %{version}