X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=alsa-lib.spec;h=4909161f96e5814a6948b63168da788dce0359fd;hb=6f6180b7421bc1aaf15cd84d77d9536d4210d6a9;hp=0c93af5b8ca9a1f73f341a290d3684c7263efb72;hpb=f7accdc83b8e0a389f381356b0e961c68e7144d5;p=packages%2Falsa-lib.git

diff --git a/alsa-lib.spec b/alsa-lib.spec
index 0c93af5..4909161 100644
--- a/alsa-lib.spec
+++ b/alsa-lib.spec
@@ -1,9 +1,10 @@
 #
 # Conditional build:
 %bcond_without	static_libs	# don't build static library
+%bcond_without	apidocs		# do not build and package API docs
 %bcond_without	python		# smixer-python binding
 %bcond_with	resmgr		# Resource Manager support
-#
+
 Summary:	Advanced Linux Sound Architecture (ALSA) - Library
 Summary(es.UTF-8):	Advanced Linux Sound Architecture (ALSA) - Biblioteca
 Summary(pl.UTF-8):	Advanced Linux Sound Architecture (ALSA) - Biblioteka
@@ -11,22 +12,27 @@ Summary(pt_BR.UTF-8):	Biblioteca para o ALSA (Advanced Linux Sound Architecture)
 Summary(ru.UTF-8):	Библиотека API для работы с драйвером ALSA
 Summary(uk.UTF-8):	Бібліотека API для роботи з драйвером ALSA
 Name:		alsa-lib
-Version:	1.0.16
-Release:	2
+Version:	1.0.28
+Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}.tar.bz2
-# Source0-md5:	73b0986758bb762648a5fafc93e287c1
+# Source0-md5:	c9e21b88a2b3e6e12ea7ba0f3b271fc3
+Source1:	%{name}-modprobe.conf
+Source2:	%{name}-asound.conf
 URL:		http://www.alsa-project.org/
-BuildRequires:	alsa-driver-devel
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
 BuildRequires:	doxygen
 BuildRequires:	libtool
-%{?with_python:BuildRequires:	python-devel >= 1:2.4}
+%if %{with python}
+BuildRequires:	python-devel >= 1:2.4
+BuildRequires:	python-modules
+%endif
 %{?with_resmgr:BuildRequires:	resmgr-devel}
 BuildConflicts:	alsa-lib <= 0.4.0
 Obsoletes:	alsa-libs
+Conflicts:	alsa-utils < 1.0.20-3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -103,7 +109,6 @@ Summary(ru.UTF-8):	Библиотека API для работы с драйве
 Summary(uk.UTF-8):	Бібліотека API для роботи з драйвером ALSA - файли програміста
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	alsa-driver-devel
 Obsoletes:	alsa-devel
 Obsoletes:	alsa-lib-devel-doc
 
@@ -155,6 +160,17 @@ Bibliotecas estáticas para desenvolvimento com a alsa-lib
 %description static -l uk.UTF-8
 Статична бібліотека API для роботи з драйвером ALSA.
 
+%package apidocs
+Summary:	ALSA Library API documentation
+Summary(pl.UTF-8):	Dokumentacja API biblioteki ALSA
+Group:		Documentation
+
+%description apidocs
+API and internal documentation for ALSA Library.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki ALSA.
+
 %package smixer-python
 Summary:	Python binding module for ALSA Mixer Interface
 Summary(pl.UTF-8):	Moduł wiązania Pythona dla interfejsu miksera architektury ALSA
@@ -172,28 +188,54 @@ Moduł wiązania Pythona dla interfejsu miksera architektury ALSA.
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure \
-	--enable-static \
+configure_opts="\
+	--disable-silent-rules \
 	%{!?with_python:--disable-python} \
-	%{?with_resmgr:--enable-resmgr} \
-	%{!?with_static_libs:--disable-static}
+	%{?with_resmgr:--enable-resmgr}
+"
 
+%if %{with static_libs}
+%configure $configure_opts \
+	--disable-shared \
+	--enable-static
 %{__make}
-%{__make} doc
+install -d static
+%{__make} install \
+	DESTDIR=$(pwd)/static
+%{__make} clean
+%endif
+
+%configure $configure_opts \
+	--enable-shared \
+	--disable-static
+
+%{__make}
+
+%{?with_apidocs:%{__make} doc}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{/%{_lib},%{_sysconfdir}/alsa,/etc/modprobe.d}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+install static/%{_libdir}/libasound.a $RPM_BUILD_ROOT%{_libdir}
+
+mv -f $RPM_BUILD_ROOT%{_libdir}/libasound.so.* $RPM_BUILD_ROOT/%{_lib}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libasound.so
+ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib}; echo libasound.so.*.*) \
+	$RPM_BUILD_ROOT%{_libdir}/libasound.so
+
 install -D utils/alsa.m4 $RPM_BUILD_ROOT%{_aclocaldir}/alsa.m4
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/modprobe.d/alsa-base.conf
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/asound.conf
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/alsa-lib/smixer/*.{a,la}
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/alsa-lib/smixer/*.{a,la}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -205,18 +247,20 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc doc/asoundrc.txt
 %attr(755,root,root) %{_bindir}/aserver
-%attr(755,root,root) %{_libdir}/libasound.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libasound.so.2
+%attr(755,root,root) /%{_lib}/libasound.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libasound.so.2
 %dir %{_libdir}/alsa-lib
 %dir %{_libdir}/alsa-lib/smixer
 %attr(755,root,root) %{_libdir}/alsa-lib/smixer/smixer-ac97.so
 %attr(755,root,root) %{_libdir}/alsa-lib/smixer/smixer-hda.so
 %attr(755,root,root) %{_libdir}/alsa-lib/smixer/smixer-sbase.so
 %{_datadir}/alsa
+%dir %{_sysconfdir}/alsa
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asound.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/alsa-base.conf
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/doxygen/html/*
 %attr(755,root,root) %{_libdir}/libasound.so
 %{_libdir}/libasound.la
 %{_includedir}/sys/asoundlib.h
@@ -230,6 +274,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libasound.a
 %endif
 
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%doc doc/doxygen/html/*
+%endif
+
 %if %{with python}
 %files smixer-python
 %defattr(644,root,root,755)