This commit was manufactured by cvs2git to create branch 'DEVEL'.

Sprout from master 2002-02-09 14:37:16 UTC mkochano <mkochano@pld-linux.org> '- Added support for forcing non-blocking open(2) of /dev/dsp.'
Delete:
    alsa-utils-DESTDIR.patch
    alsa-utils-LDFLAGS.patch
    alsa-utils.spec

diff --git a/alsa-utils-DESTDIR.patch b/alsa-utils-DESTDIR.patch
deleted file mode 100644 (file)
index 11b7dba..0000000
--- a/alsa-utils-DESTDIR.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nru alsa-utils-0.5.10/aplay/Makefile.am alsa-utils-0.5.10.new/aplay/Makefile.am
---- alsa-utils-0.5.10/aplay/Makefile.am        Sat Nov  4 13:17:20 2000
-+++ alsa-utils-0.5.10.new/aplay/Makefile.am    Thu Dec  7 18:15:19 2000
-@@ -16,9 +16,9 @@
-       $(LN_S) $< $@
- 
- install-exec-hook:
--      rm -f $(bindir)/arecord
-+      rm -f $(DESTDIR)$(bindir)/arecord
-       (cd $(DESTDIR)$(bindir) && $(LN_S) aplay arecord)
- 
- install-data-hook:
--      rm -f $(mandir)/man1/arecord.1
-+      rm -f $(DESTDIR)$(mandir)/man1/arecord.1
-       (cd $(DESTDIR)$(mandir)/man1 && $(LN_S) aplay.1 arecord.1)

diff --git a/alsa-utils-LDFLAGS.patch b/alsa-utils-LDFLAGS.patch
deleted file mode 100644 (file)
index b164d55..0000000
--- a/alsa-utils-LDFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru alsa-utils-0.5.8/aclocal.m4 alsa-utils-0.5.8.new/aclocal.m4
---- alsa-utils-0.5.8/aclocal.m4        Mon Jun  5 21:18:01 2000
-+++ alsa-utils-0.5.8.new/aclocal.m4    Tue Jul 18 16:22:26 2000
-@@ -158,7 +158,6 @@
- 
- dnl add the alsa library
- ALSA_LIBS="$ALSA_LIBS -lasound"
--LDFLAGS="$ALSA_LIBS"
- AC_MSG_RESULT($ALSA_LIBS)
- 
- dnl Check for the presence of the library

diff --git a/alsa-utils.spec b/alsa-utils.spec
deleted file mode 100644 (file)
index e9902c6..0000000
--- a/alsa-utils.spec
+++ /dev/null
@@ -1,112 +0,0 @@
-Summary:       Advanced Linux Sound Architecture (ALSA) - Utils
-Summary(es):   Utilitarios para ALSA (Advanced Linux Sound Architecture)
-Summary(pl):   Advanced Linux Sound Architecture (ALSA) - Narzêdzia
-Summary(pt_BR):        Utilitários para o ALSA (Advanced Linux Sound Architecture)
-Name:          alsa-utils
-Version:       0.5.10
-Release:       5
-License:       GPL
-Group:         Applications/Sound
-Group(de):     Applikationen/Laut
-Group(es):     Aplicaciones/Sonido
-Group(pl):     Aplikacje/D¼wiêk
-Group(pt_BR):  Aplicações/Som
-Source0:       ftp://ftp.alsa-project.org/pub/utils/%{name}-%{version}.tar.bz2
-Source1:       alsasound
-Patch0:                %{name}-DESTDIR.patch
-Patch1:                %{name}-LDFLAGS.patch
-URL:           http://www.alsa-project.org/
-BuildRequires: libstdc++-devel
-BuildRequires: ncurses-devel
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: flex
-BuildRequires: libtool
-BuildRequires: alsa-lib-devel >= 0.5.10
-Prereq:                /sbin/depmod
-Prereq:                /sbin/ldconfig
-Prereq:                /sbin/chkconfig
-ExcludeArch:   sparc
-ExcludeArch:   sparc64
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-
-%define                _sysconfdir     /etc
-
-%description
-Advanced Linux Sound Architecture (ALSA) - Utils alsamixer, amixer,
-aplay, arecord.
-
-%description -l es
-Utilitarios para el sistema ALSA, la arquitetura avanzada de sonido
-para Linux.
-
-%description -l pl
-Advanced Linux Sound Architecture (ALSA) - Narzêdzia alsamixer,
-amixer, aplay, arecord.
-
-%description -l pt_BR
-Utilitários para o ALSA, a arquitetura de som avançada para o Linux.
-
-%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-
-%build
-rm -f missing
-aclocal
-autoconf
-automake -a -c
-CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
-CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions"
-%configure
-
-%{__make} 
-
-%install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
-
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
-
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/alsasound
-
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/arecord.1
-echo ".so aplay.1" > $RPM_BUILD_ROOT%{_mandir}/man1/arecord.1
-
-touch $RPM_BUILD_ROOT%{_sysconfdir}/asound.conf
-
-gzip -9nf README ChangeLog
-
-%post
-/sbin/chkconfig --add alsasound
-if [ -f /var/lock/subsys/alsasound ]; then
-       /etc/rc.d/init.d/alsasound restart >&2
-else
-       echo "Run \"/etc/rc.d/init.d/alsasound start\" to start ALSA %{version} services."
-fi
-
-%preun
-if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/alsasound ]; then
-               /etc/rc.d/init.d/alsasound stop >&2
-       fi
-       /sbin/chkconfig --del alsasound
-fi
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(644,root,root,755)
-%doc *.gz
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/asound.conf
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_sbindir}/*
-%attr(754,root,root) /etc/rc.d/init.d/*
-
-%{_mandir}/man1/alsactl.1*
-%{_mandir}/man1/alsamixer.1*
-%{_mandir}/man1/amixer.1*
-%{_mandir}/man1/aplay.1*
-%{_mandir}/man1/arecord.1*