From 94679b48aad5d7ce3e760d561786313fbed223e5 Mon Sep 17 00:00:00 2001
From: perex <perex@fedoraproject.org>
Date: Thu, 11 Sep 2008 08:26:45 +0000
Subject: [PATCH] alsa-lib: move alsactl.conf to alsa-utils package

---
 alsa-lib.spec |  9 ++++-----
 alsactl.conf  | 14 --------------
 2 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 100644 alsactl.conf

diff --git a/alsa-lib.spec b/alsa-lib.spec
index dc9e4fc..38c747d 100644
--- a/alsa-lib.spec
+++ b/alsa-lib.spec
@@ -5,12 +5,11 @@
 Summary: The Advanced Linux Sound Architecture (ALSA) library
 Name:    alsa-lib
 Version: 1.0.18
-Release: 4%{?prever_dot}%{?dist}
+Release: 5%{?prever_dot}%{?dist}
 License: LGPLv2+
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2
 Source10: asound.conf
-Source11: alsactl.conf
 Patch0:  alsa-lib-1.0.17-config.patch
 Patch2:  alsa-lib-1.0.14-glibc-open.patch
 Patch4:	 alsa-lib-1.0.16-no-dox-date.patch
@@ -64,9 +63,7 @@ mv %{buildroot}%{_libdir}/libasound.so.* %{buildroot}/%{_lib}
 ln -snf ../../%{_lib}/libasound.so.2 %{buildroot}%{_libdir}/libasound.so
 
 # Install global configuration files
-mkdir -p -m 755 $RPM_BUILD_ROOT/etc/alsa
 install -p -m 644 %{SOURCE10} %{buildroot}/etc
-install -p -m 644 %{SOURCE11} %{buildroot}/etc/alsa
 
 %clean
 rm -rf %{buildroot}
@@ -78,7 +75,6 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog TODO doc/asoundrc.txt
-%config %{_sysconfdir}/alsa/
 %config %{_sysconfdir}/asound.conf
 /%{_lib}/libasound.so.*
 %{_bindir}/aserver
@@ -96,6 +92,9 @@ rm -rf %{buildroot}
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Wed Sep 10 2008 Jaroslav Kysela <jkysela@redhat.com> - 1.0.18-5.rc3
+- move alsactl.conf to alsa-utils package
+
 * Wed Sep 10 2008 Jaroslav Kysela <jkysela@redhat.com> - 1.0.18-4.rc3
 - fixed spec file
 - fixed package version number (1.0.18-3.rc3 was tagged by accident)
diff --git a/alsactl.conf b/alsactl.conf
deleted file mode 100644
index 71f0d80..0000000
--- a/alsactl.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# ALSA library configuration file for alsactl tool
-# (/usr/share/alsa tree is not necessary for alsactl)
-#
-
-ctl.hw {
-	@args [ CARD ]
-	@args.CARD {
-		type string
-		default "0"
-	}
-	type hw
-	card $CARD
-}