X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=alsa-lib.spec;h=2da51ec872e48d26bf1ab7c2aa01c764a71bb90d;hb=HEAD;hp=78841c7645f00ff7da3ae431fe38c3c81145e789;hpb=1bc6875fa813e89dd0f3466d056f06a545c0e9e4;p=packages%2Falsa-lib.git

diff --git a/alsa-lib.spec b/alsa-lib.spec
index 78841c7..d95110b 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,26 +13,41 @@ 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.4
+Version:	1.2.12
+# alsa-*-conf tarballs are not released for each patch version
+%define	topology_confver	1.2.5.1
+%define	ucm_confver		1.2.12
 Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}.tar.bz2
-# Source0-md5:	824082c6b2e341500902973dcc47d2e9
+# Source0-md5:	97bbf3cca911c1701fe9fe115c32b03d
 Source1:	%{name}-modprobe.conf
 Source2:	%{name}-asound.conf
-URL:		http://www.alsa-project.org/
+Source3:	smixer.conf
+Source4:	ftp://ftp.alsa-project.org/pub/lib/alsa-topology-conf-%{topology_confver}.tar.bz2
+# Source4-md5:	066d6a980e09a2fa44b4cc1d06ecc0ea
+Source5:	ftp://ftp.alsa-project.org/pub/lib/alsa-ucm-conf-%{ucm_confver}.tar.bz2
+# Source5-md5:	198920145805d3009ac22d6b4e379501
+URL:		https://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
 %endif
 %{?with_resmgr:BuildRequires:	resmgr-devel}
+BuildRequires:	rpm-build >= 4.6
+BuildRequires:	tar >= 1:1.15
 BuildConflicts:	alsa-lib <= 0.4.0
-Obsoletes:	alsa-libs
+Obsoletes:	alsa-libs < 0.5.2
 Conflicts:	alsa-utils < 1.0.20-3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -109,8 +125,8 @@ Summary(ru.UTF-8):	Библиотека API для работы с драйве
 Summary(uk.UTF-8):	Бібліотека API для роботи з драйвером ALSA - файли програміста
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Obsoletes:	alsa-devel
-Obsoletes:	alsa-lib-devel-doc
+Obsoletes:	alsa-devel < 0.9
+Obsoletes:	alsa-lib-devel-doc < 0.9
 
 %description devel
 Advanced Linux Sound Architecture (ALSA) - header files.
@@ -164,9 +180,7 @@ 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.
@@ -188,6 +202,7 @@ Moduł wiązania Pythona dla interfejsu miksera architektury ALSA.
 
 %prep
 %setup -q
+cp -p %{SOURCE3} src/conf
 
 %build
 %{__libtoolize}
@@ -198,7 +213,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}
@@ -223,7 +241,7 @@ cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/%{_lib},%{_sysconfdir}/alsa,/etc/modprobe.d}
+install -d $RPM_BUILD_ROOT{/%{_lib},%{_sysconfdir}/alsa/conf.d,%{_datadir}/alsa/alsa.conf.d,/etc/modprobe.d}
 
 %if %{with static_libs}
 %{__make} -C build-static/src install-libLTLIBRARIES \
@@ -233,11 +251,14 @@ 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
 
+tar xf %{SOURCE4} --strip-components=1 -C $RPM_BUILD_ROOT%{_datadir}/alsa alsa-topology-conf-%{topology_confver}/topology
+tar xf %{SOURCE5} --strip-components=1 -C $RPM_BUILD_ROOT%{_datadir}/alsa alsa-ucm-conf-%{ucm_confver}/ucm alsa-ucm-conf-%{ucm_confver}/ucm2
+
 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
@@ -256,24 +277,42 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/aserver
 %attr(755,root,root) /%{_lib}/libasound.so.*.*.*
 %attr(755,root,root) %ghost /%{_lib}/libasound.so.2
+%attr(755,root,root) /%{_libdir}/libatopology.so.*.*.*
+%attr(755,root,root) %ghost /%{_libdir}/libatopology.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 %{_datadir}/alsa
+%{_datadir}/alsa/cards
+%{_datadir}/alsa/ctl
+%{_datadir}/alsa/pcm
+%{_datadir}/alsa/topology
+%{_datadir}/alsa/ucm
+%{_datadir}/alsa/ucm2
+%{_datadir}/alsa/alsa.conf
+# directory for "global" config files (not accessed directly, but through symlinks in %{_sysconfdir}/alsa/conf.d)
+%dir %{_datadir}/alsa/alsa.conf.d
+%{_datadir}/alsa/smixer.conf
 %dir %{_sysconfdir}/alsa
+# directory for "local" config files (loaded from %{_datadir}/alsa/alsa.conf)
+%dir %{_sysconfdir}/alsa/conf.d
 %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)
 %attr(755,root,root) %{_libdir}/libasound.so
+%attr(755,root,root) %{_libdir}/libatopology.so
 %{_libdir}/libasound.la
+%{_libdir}/libatopology.la
 %{_includedir}/sys/asoundlib.h
 %{_includedir}/alsa
+%{_includedir}/asoundlib.h
 %{_aclocaldir}/alsa.m4
 %{_pkgconfigdir}/alsa.pc
+%{_pkgconfigdir}/alsa-topology.pc
 
 %if %{with static_libs}
 %files static