OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/alsa?expand=0&rev=13

alsa-lib-hg-fixes.diff

@@ -0,0 +1,20 @@
+diff -r 83a170c1f7c4 configure.in
+--- a/configure.in	Thu May 31 08:54:49 2007 +0200
++++ b/configure.in	Fri Jun 08 11:31:18 2007 +0200
+@@ -93,7 +93,7 @@ if test -z "$plugindir"; then
+     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)
+ 
+@@ -138,6 +138,7 @@ if test "$symfuncs" = "yes"; then
+     AC_MSG_RESULT(yes)
+   else
+     AC_MSG_RESULT(not supported by ld)
++    symfuncs="no"
+   fi
+ else
+   AC_MSG_RESULT(no)

alsa.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jun  8 12:26:54 CEST 2007 - tiwai@suse.de
+
+- fix external plugin path, now it's accidentally disabled because
+  of a typo in configure script.
+- clean up spec file.
+
 -------------------------------------------------------------------
 Thu May 31 12:23:49 CEST 2007 - tiwai@suse.de
 

alsa.spec

@@ -21,7 +21,7 @@ PreReq:         %insserv_prereq %fillup_prereq
 Autoreqprov:    on
 Summary:        Advanced Linux Sound Architecture
 Version:        1.0.14
-Release:        1
+Release:        4
 Source:         ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2
 Source8:        40-alsa.rules
 Source11:       alsasound
@@ -35,7 +35,7 @@ Source21:       README.testwav
 Source30:       all_notes_off
 Source31:       all_notes_off.bin
 Source32:       all_notes_off.mid
-# Patch:          alsa-lib-hg-fixes.diff
+Patch:          alsa-lib-hg-fixes.diff
 URL:            http://www.alsa-project.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -113,21 +113,13 @@ Authors:
 
 %prep
 %setup -n alsa-lib-%{package_version}
-# %patch -p1
+%patch -p1
 %{?suse_update_config:%{suse_update_config -f .}}
 
 %build
 # build alsa-lib
 autoreconf -fi
-%ifarch mips
-ARCH_CFLAGS="-mips2"
-%endif
-CFLAGS="$RPM_OPT_FLAGS $ARCH_CFLAGS" \
-./configure \
-  --libdir=%{_libdir} \
-  --mandir=%{_mandir} \
-  --datadir=%{_datadir} \
-  --enable-shared \
+%configure \
   --disable-static \
   --enable-symbolic-functoins \
   --disable-aload \
@@ -138,7 +130,7 @@ make -C doc doc
 
 %install
 # install shared library
-make DESTDIR=$RPM_BUILD_ROOT install
+%makeinstall
 # clean up unneeded files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.*a
 rm -f $RPM_BUILD_ROOT%{_libdir}/alsa-lib/smixer/*.*a
@@ -261,6 +253,10 @@ exit 0
 %{_datadir}/alsa
 
 %changelog
+* Fri Jun 08 2007 - tiwai@suse.de
+- fix external plugin path, now it's accidentally disabled because
+  of a typo in configure script.
+- clean up spec file.
 * Thu May 31 2007 - tiwai@suse.de
 - updated to version 1.0.14-final
   * including the previous HG fixes