SPECS: alsa-tools.spec - simplified, fixed shared lib

[qboosh]

Author: qboosh                       Date: Fri Oct 14 13:17:33 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- simplified, fixed shared lib

---- Files affected:
SPECS:
   alsa-tools.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SPECS/alsa-tools.spec
diff -u SPECS/alsa-tools.spec:1.10 SPECS/alsa-tools.spec:1.11
--- SPECS/alsa-tools.spec:1.10	Fri Oct 14 13:51:14 2005
+++ SPECS/alsa-tools.spec	Fri Oct 14 15:17:28 2005
@@ -17,8 +17,8 @@
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
 BuildRequires:	ncurses-devel
-BuildRequires:	sed >= 4.0
 BuildRequires:	qt-devel
+BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # ac3dec skipped - see ac3dec.spec
@@ -47,9 +47,10 @@
 	[ -f README ] && cp -f README "README.$(basename $dir)"
 	[ -f NEWS ] && cp -f NEWS "NEWS.$(basename $dir)"
 	[ -f TODO ] && cp -f TODO "TODO.$(basename $dir)"
+	[ -f ltmain.sh ] && %{__libtoolize}
 	%{__aclocal}
 	%{__autoconf}
-	%{__autoheader}
+	grep -q AC_CONFIG_HEADER configure.* && %{__autoheader}
 	%{__automake}
 	CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
 	CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions"
@@ -59,10 +60,10 @@
 done
 
 cd qlo10k1
-sed -i s/'include'/'include\/qt'/ acinclude.m4
-[ -f README ] && cp -f README README.qlo10k1
-[ -f NEWS ] && cp -f NEWS NEWS.qlo10k1
-[ -f TODO ] && cp -f TODO TODO.qlo10k1
+sed -i -e 's,include,include/qt,' acinclude.m4
+cp -f README README.qlo10k1
+cp -f NEWS NEWS.qlo10k1
+cp -f TODO TODO.qlo10k1
 %{__aclocal} -I ../ld10k1
 %{__autoconf}
 %{__autoheader}
@@ -76,20 +77,17 @@
 	--with-ld10k1-inc-prefix=$odir/ld10k1/include
 %{__make}
 
-cd $odir/as10k1/examples
-%{__make} dsp
+%{__make} -C $odir/as10k1/examples dsp
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-sed -i s/'#!\/bin\/sh'/'#!\/bin\/bash'/ ld10k1/setup/init_live
+sed -i -e 's,#!/bin/sh,#!/bin/bash,' ld10k1/setup/init_live
 
 odir=$(pwd)
 for dir in %{progs} qlo10k1; do
-	cd $dir
-	%{__make} install \
+	%{__make} -C $dir install \
 		DESTDIR=$RPM_BUILD_ROOT
-	cd $odir
 done
 
 install $odir/as10k1/examples/*.emu10k1 $RPM_BUILD_ROOT%{_datadir}/ld10k1/effects
@@ -97,13 +95,16 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc */README.* */*/README.* */NEWS.*
 # alsamixer/TODO.* 
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*
-%attr(755,root,root) %{_libdir}/*
+%attr(755,root,root) %{_libdir}/liblo10k1.so.*.*.*
 %{_datadir}/ld10k1
 %{_mandir}/man?/*
 %{_sysconfdir}/hotplug/usb/*
@@ -116,6 +117,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2005/10/14 13:17:28  qboosh
+- simplified, fixed shared lib
+
 Revision 1.10  2005/10/14 11:51:14  andree
 - added lo10k1,qlo10k1 support
 - BR: qt-devel, sed >= 4.0
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/alsa-tools.spec?r1=1.10&r2=1.11&f=u