diff --git a/alsa-oss-glibc-open.patch b/alsa-oss-glibc-open.patch new file mode 100644 index 0000000..bdbdfea --- /dev/null +++ b/alsa-oss-glibc-open.patch @@ -0,0 +1,12 @@ +--- alsa-oss-1.0.14/alsa/alsa-oss.c.orig 2007-05-31 03:11:51.000000000 -0500 ++++ alsa-oss-1.0.14/alsa/alsa-oss.c 2007-08-16 16:21:27.000000000 -0500 +@@ -284,6 +284,9 @@ static int mixer_open_helper(const char + return fd; + } + ++#undef open ++#undef open64 ++ + #define DECL_OPEN(name, callback) \ + int name(const char *file, int oflag, ...) \ + { \ diff --git a/alsa-oss.spec b/alsa-oss.spec index 47bd550..00c2059 100644 --- a/alsa-oss.spec +++ b/alsa-oss.spec @@ -1,12 +1,13 @@ Summary: Advanced Linux Sound Architecture (ALSA) wrapper for OSS Name: alsa-oss Version: 1.0.14 -Release: 2%{?dist} -License: GPL +Release: 3%{?dist} +License: GPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ Source: ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-%{version}.tar.bz2 Patch: %{name}-1.0.12-aoss.patch +Patch1: %{name}-glibc-open.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel >= %{version} %ifarch x86_64 @@ -36,6 +37,7 @@ Header files for alsa-oss. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %ifarch x86_64 @@ -78,6 +80,10 @@ autoreconf -f -i %changelog +* Thu Aug 16 2007 Patrick "Jima" Laughton 1.0.14-3 +- License clarification +- Copied glibc open() workaround from alsa-lib-1.0.14-glibc-open.patch + * Wed Jul 25 2007 Warren Togami 1.0.14-2 - binutils/gcc bug rebuild (#249435)