X-Git-Url: http://git.pld-linux.org/?p=packages%2Falsa-lib.git;a=blobdiff_plain;f=alsa-lib.spec;h=64ff9d778aa6dcc54f67bd410c0d73eb9b550630;hp=2da51ec872e48d26bf1ab7c2aa01c764a71bb90d;hb=82bf787c691fa111bead24289be058c4cd978007;hpb=12fef44468e60fd0b3e5ae8c92f225788894e629

diff --git a/alsa-lib.spec b/alsa-lib.spec
index 2da51ec..64ff9d7 100644
--- a/alsa-lib.spec
+++ b/alsa-lib.spec
@@ -3,6 +3,7 @@
 %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	python2		# python 2.x instead of python 3.x for smixer pymodules
 %bcond_with	resmgr		# Resource Manager support
 
 Summary:	Advanced Linux Sound Architecture (ALSA) - Library
@@ -12,22 +13,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.1.5
+Version:	1.1.6
 Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}.tar.bz2
-# Source0-md5:	a2b465c3a5265d8a57f3ff39c6c4fc29
+# Source0-md5:	2f981a8f7897c59ec2ddc44916d33788
 Source1:	%{name}-modprobe.conf
 Source2:	%{name}-asound.conf
+Source3:	smixer.conf
 URL:		http://www.alsa-project.org/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
 BuildRequires:	doxygen
 BuildRequires:	libtool >= 1.4
 %if %{with python}
+%if %{with python2}
 BuildRequires:	python-devel >= 1:2.4
-BuildRequires:	python-modules
+BuildRequires:	python-modules >= 1:2.4
+%else
+BuildRequires:	python3-devel >= 1:3.2
+BuildRequires:	python3-modules >= 1:3.2
 %endif
 %{?with_resmgr:BuildRequires:	resmgr-devel}
 BuildConflicts:	alsa-lib <= 0.4.0
@@ -188,6 +194,7 @@ Moduł wiązania Pythona dla interfejsu miksera architektury ALSA.
 
 %prep
 %setup -q
+cp -p %{SOURCE3} src/conf
 
 %build
 %{__libtoolize}
@@ -198,7 +205,10 @@ Moduł wiązania Pythona dla interfejsu miksera architektury ALSA.
 configure_opts="\
 	--disable-silent-rules \
 	%{!?with_python:--disable-python} \
-	%{?with_resmgr:--enable-resmgr}
+	%{?with_python2:--enable-python2} \
+	%{?with_resmgr:--enable-resmgr} \
+	--enable-mixer-modules \
+	--enable-mixer-pymods
 "
 
 %if %{with static_libs}
@@ -233,7 +243,7 @@ install -d $RPM_BUILD_ROOT{/%{_lib},%{_sysconfdir}/alsa,/etc/modprobe.d}
 %{__make} -C build-shared install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-mv -f $RPM_BUILD_ROOT%{_libdir}/libasound.so.* $RPM_BUILD_ROOT/%{_lib}
+%{__mv} $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