rpms/alsa-lib/F-7 alsa-lib-1.0.14-glibc-open.patch, NONE, 1.1 alsa-lib-1.0.14-plugindir.patch, NONE, 1.1 alsa-lib.spec, 1.54, 1.55

[Martin Stransky (stransky)]

Author: stransky

Update of /cvs/pkgs/rpms/alsa-lib/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24971

Modified Files:
	alsa-lib.spec 
Added Files:
	alsa-lib-1.0.14-glibc-open.patch 
	alsa-lib-1.0.14-plugindir.patch 
Log Message:
fixed #251307 - fix plugindir directory specification, fix build with newer glibc where open() is a macro

alsa-lib-1.0.14-glibc-open.patch:

--- NEW FILE alsa-lib-1.0.14-glibc-open.patch ---
--- alsa-lib-1.0.14/aserver/aserver.c	2007-05-31 10:05:13.000000000 +0200
+++ alsa-lib-1.0.14.lennart/aserver/aserver.c	2007-08-15 15:53:32.000000000 +0200
@@ -35,6 +35,8 @@
 
 #include "aserver.h"
 
+#undef open
+
 char *command;
 
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)

alsa-lib-1.0.14-plugindir.patch:

--- NEW FILE alsa-lib-1.0.14-plugindir.patch ---
--- alsa-lib-1.0.14/configure.in~	2007-05-31 09:05:13.000000000 +0100
+++ alsa-lib-1.0.14/configure.in	2007-06-06 23:48:06.000000000 +0100
@@ -93,7 +93,7 @@
     esac
     plugindir="$dir/$PACKAGE"
 fi
-AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "plugindir", [directory containing ALSA add-on modules])
+AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "$plugindir", [directory containing ALSA add-on modules])
 ALSA_PLUGIN_DIR="$plugindir"
 AC_SUBST(ALSA_PLUGIN_DIR)
 


Index: alsa-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/alsa-lib/F-7/alsa-lib.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- alsa-lib.spec	1 Aug 2007 08:36:03 -0000	1.54
+++ alsa-lib.spec	16 Aug 2007 12:12:54 -0000	1.55
@@ -3,11 +3,13 @@
 Summary: The Advanced Linux Sound Architecture (ALSA) library.
 Name:    alsa-lib
 Version: %{version_main}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version_main}%{?prever}.tar.bz2
-Patch:   alsa-lib-1.0.14rc1-config.patch
+Patch0:   alsa-lib-1.0.14rc1-config.patch
+Patch1:   alsa-lib-1.0.14-plugindir.patch
+Patch2:   alsa-lib-1.0.14-glibc-open.patch
 URL:     http://www.alsa-project.org/
 BuildRoot: %{_tmppath}/%{name}-%{version_main}-root
 BuildRequires: doxygen
@@ -35,7 +37,9 @@
 
 %prep
 %setup -q -n %{name}-%{version_main}%{?prever}
-%patch -p1 -b .config
+%patch0 -p1 -b .config
+%patch1 -p1 -b .plugindir
+%patch2 -p1 -b .glibc-open
 
 %build
 %configure \
@@ -90,6 +94,10 @@
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Wed Aug 15 2007 Lennart Poettering <lpoetter at redhat.com> 1.0.14-2
+- fixed #251307 - fix plugindir directory specification
+- fix build with newer glibc where open() is a macro
+
 * Wed Jul 25 2007 Martin Stransky <stransky at redhat.com> 1.0.14-1
 - bumped release number
 - fixed #246011 - alsa-lib should own /usr/lib/alsa-lib/smixer