rpms/alsa-oss/devel alsa-oss-glibc-open.patch, NONE, 1.1 alsa-oss.spec, 1.4, 1.5

[Patrick Laughton (jima)]

Author: jima

Update of /cvs/pkgs/rpms/alsa-oss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24159

Modified Files:
	alsa-oss.spec 
Added Files:
	alsa-oss-glibc-open.patch 
Log Message:

* Thu Aug 16 2007 Patrick "Jima" Laughton <jima at beer.tclug.org> 1.0.14-3
- License clarification
- Copied glibc open() workaround from alsa-lib-1.0.14-glibc-open.patch


alsa-oss-glibc-open.patch:

--- NEW FILE alsa-oss-glibc-open.patch ---
--- 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, ...) \
 { \


Index: alsa-oss.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-oss/devel/alsa-oss.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- alsa-oss.spec	25 Jul 2007 17:21:35 -0000	1.4
+++ alsa-oss.spec	16 Aug 2007 21:28:19 -0000	1.5
@@ -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 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %ifarch x86_64
@@ -78,6 +80,10 @@
 
 
 %changelog
+* Thu Aug 16 2007 Patrick "Jima" Laughton <jima at beer.tclug.org> 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 <wtogami at redhat.com> 1.0.14-2
 - binutils/gcc bug rebuild (#249435)