- updated to 1.1.4.1

[packages/alsa-lib.git] / alsa-lib.spec

diff --git a/alsa-lib.spec b/alsa-lib.spec
index 51b6acdeaedb7a77dfd5547b872a4cabfae4474a..492cacef2a80ee06dd8a041275b7546e261769d7 100644 (file)
--- a/alsa-lib.spec
+++ b/alsa-lib.spec
@@ -12,20 +12,19 @@ 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.25
+Version:       1.1.4.1
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}.tar.bz2
-# Source0-md5: 06fe5819020c6684b991dcffc5471304
+# Source0-md5: 29fa3e69122d3cf3e8f0e01a0cb1d183
 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
+BuildRequires: libtool >= 1.4
 %if %{with python}
 BuildRequires: python-devel >= 1:2.4
 BuildRequires: python-modules
@@ -110,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
 
@@ -166,6 +164,9 @@ Bibliotecas estáticas para desenvolvimento com a alsa-lib
 Summary:       ALSA Library API documentation
 Summary(pl.UTF-8):     Dokumentacja API biblioteki ALSA
 Group:         Documentation
+%if "%{_rpmversion}" >= "5"
+BuildArch:     noarch
+%endif
 
 %description apidocs
 API and internal documentation for ALSA Library.
@@ -201,32 +202,36 @@ configure_opts="\
 "
 
 %if %{with static_libs}
-%configure $configure_opts \
+install -d build-static
+cd build-static
+../%configure $configure_opts \
        --disable-shared \
        --enable-static
 %{__make}
-install -d static
-%{__make} install \
-       DESTDIR=$(pwd)/static
-%{__make} clean
+cd ..
 %endif
 
-%configure $configure_opts \
+install -d build-shared
+cd build-shared
+../%configure $configure_opts \
        --enable-shared \
        --disable-static
 
 %{__make}
-
 %{?with_apidocs:%{__make} doc}
+cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/%{_lib},%{_sysconfdir}/alsa,/etc/modprobe.d}
 
-%{__make} install \
+%if %{with static_libs}
+%{__make} -C build-static/src install-libLTLIBRARIES \
        DESTDIR=$RPM_BUILD_ROOT
+%endif
 
-install static/%{_libdir}/libasound.a $RPM_BUILD_ROOT%{_libdir}
+%{__make} -C build-shared install \
+       DESTDIR=$RPM_BUILD_ROOT
 
 mv -f $RPM_BUILD_ROOT%{_libdir}/libasound.so.* $RPM_BUILD_ROOT/%{_lib}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libasound.so
@@ -237,7 +242,7 @@ 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} $RPM_BUILD_ROOT%{_libdir}/alsa-lib/smixer/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/alsa-lib/smixer/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -279,7 +284,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
-%doc doc/doxygen/html/*
+%doc build-shared/doc/doxygen/html/*
 %endif
 
 %if %{with python}