[alsa-lib] Create and own ucm directory so alsaucm doesn't crash. Cleanup and modernise spec

[Peter Robinson]

commit 1e107db66b8f5dce42de5925bcba718d5e3ea30e
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Dec 3 16:19:38 2012 +0000

    Create and own ucm directory so alsaucm doesn't crash. Cleanup and modernise spec

 alsa-lib.spec |   58 ++++++++++++++++++++++++++++++++------------------------
 1 files changed, 33 insertions(+), 25 deletions(-)
---
diff --git a/alsa-lib.spec b/alsa-lib.spec
index 4befd37..d572159 100644
--- a/alsa-lib.spec
+++ b/alsa-lib.spec
@@ -1,23 +1,24 @@
-#define  prever         rc3
-#define  prever_dot     .rc3
-#define postver		a
-
-Summary: The Advanced Linux Sound Architecture (ALSA) library
-Name:    alsa-lib
-Version: 1.0.26
-Release: 1%{?prever_dot}%{?dist}
-License: LGPLv2+
-Group:   System Environment/Libraries
-Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2
+#define  prever     rc3
+#define  prever_dot .rc3
+#define  postver    a
+
+Summary:  The Advanced Linux Sound Architecture (ALSA) library
+Name:     alsa-lib
+Version:  1.0.26
+Release:  2%{?prever_dot}%{?dist}
+License:  LGPLv2+
+Group:    System Environment/Libraries
+URL:      http://www.alsa-project.org/
+
+Source:   ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2
 Source10: asound.conf
 Source11: modprobe-dist-alsa.conf
 Source12: modprobe-dist-oss.conf
-Patch0:  alsa-lib-1.0.24-config.patch
-Patch2:  alsa-lib-1.0.14-glibc-open.patch
-Patch4:	 alsa-lib-1.0.16-no-dox-date.patch
-URL:     http://www.alsa-project.org/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: doxygen
+Patch0:   alsa-lib-1.0.24-config.patch
+Patch2:   alsa-lib-1.0.14-glibc-open.patch
+Patch4:   alsa-lib-1.0.16-no-dox-date.patch
+
+BuildRequires:  doxygen
 Requires(post): /sbin/ldconfig, coreutils
 
 %description
@@ -28,9 +29,9 @@ This package includes the ALSA runtime libraries to simplify application
 programming and provide higher level functionality as well as support for
 the older OSS API, providing binary compatibility for most OSS programs.
 
-%package devel
-Summary: Development files from the ALSA library
-Group: Development/Libraries
+%package  devel
+Summary:  Development files from the ALSA library
+Group:    Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 
@@ -49,14 +50,15 @@ against the ALSA libraries and interfaces.
 
 %build
 %configure --disable-aload --with-plugindir=%{_libdir}/alsa-lib --disable-alisp
+
 # Remove useless /usr/lib64 rpath on 64bit archs
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-make %{?_smp_mflags}
+
+make %{?_smp_mflags} V=1
 make doc
 
 %install
-rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
 # We need the library to be available even before /usr might be mounted
@@ -73,8 +75,11 @@ mkdir -p -m 755 %{buildroot}/lib/modprobe.d/
 install -p -m 644 %{SOURCE11} %{buildroot}/lib/modprobe.d/dist-alsa.conf
 install -p -m 644 %{SOURCE12} %{buildroot}/lib/modprobe.d/dist-oss.conf
 
-%clean
-rm -rf %{buildroot}
+# Create UCM directory
+mkdir -p %{buildroot}/%{_datadir}/alsa/ucm
+
+#Remove libtool archives.
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 %post -p /sbin/ldconfig
 
@@ -98,11 +103,14 @@ rm -rf %{buildroot}
 %{_includedir}/alsa/
 %{_includedir}/sys/asoundlib.h
 %{_libdir}/libasound.so
-%exclude %{_libdir}/libasound.la
 %{_libdir}/pkgconfig/alsa.pc
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Mon Dec  3 2012 Peter Robinson <pbrobinson at fedoraproject.org> 1.0.26-2
+- Create and own ucm directory so alsaucm doesn't crash.
+- Cleanup and modernise spec
+
 * Thu Sep  6 2012 Jaroslav Kysela <jkysela at redhat.com> - 1.0.26-1
 - Updated to 1.0.26