diff --git a/.alsa-tools.metadata b/.alsa-tools.metadata index 06e62e1..5569df6 100644 --- a/.alsa-tools.metadata +++ b/.alsa-tools.metadata @@ -1,2 +1,2 @@ -d750d27c6168aa58b2f91ef6a1eec417a8f7b2f0 SOURCES/alsa-tools-1.0.28.tar.bz2 +02c9276f1c272c4bbf9bad9cfe0a9d8d8a6f50cf SOURCES/alsa-tools-1.1.0.tar.bz2 7437cca2429d485c242598e3e3a525076da85bb5 SOURCES/hwmixvolume.png diff --git a/.gitignore b/.gitignore index 68b73af..d750097 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/alsa-tools-1.0.28.tar.bz2 +SOURCES/alsa-tools-1.1.0.tar.bz2 SOURCES/hwmixvolume.png diff --git a/SPECS/alsa-tools.spec b/SPECS/alsa-tools.spec index 009e7fd..d946e17 100644 --- a/SPECS/alsa-tools.spec +++ b/SPECS/alsa-tools.spec @@ -5,15 +5,21 @@ # work. (RPM spec file voodoo) %if 0%{?rhel} %global _without_tools 1 +%ifarch i686 x86_64 +%global _hda_tools 0 %endif +%endif + +%{?!_without_tools: %global builddirstools as10k1 echomixer envy24control hdspconf hdspmixer hwmixvolume rmedigicontrol sbiload sscape_ctl us428control hda-verb hdajackretask hdajacksensetest } -%ifarch ppc ppc64 +%ifnarch ppc ppc64 # sb16_csp doesn't build on PPC; see bug #219010 -%{?!_without_tools: %global builddirstools as10k1 echomixer envy24control hdspconf hdspmixer hwmixvolume rmedigicontrol sbiload sscape_ctl us428control hda-verb hdajackretask } -%else -%{?!_without_tools: %global builddirstools as10k1 echomixer envy24control hdspconf hdspmixer hwmixvolume rmedigicontrol sbiload sb16_csp sscape_ctl us428control hda-verb hdajackretask } +%{?!_without_tools: %global builddirstools %{builddirstools} sb16_csp sscape_ctl } %endif +# Include HDA tools for RHEL +%{?_hda_tools: %global builddirstools hda-verb hdajackretask hdajacksensetest } + %{?!_without_firmware: %global builddirsfirmw hdsploader mixartloader usx2yloader vxloader } # Note that the Version is intended to coincide with the version of ALSA @@ -22,8 +28,8 @@ Summary: Specialist tools for ALSA Name: alsa-tools -Version: 1.0.28 -Release: 2%{?dist} +Version: 1.1.0 +Release: 1%{?dist} # Checked at least one source file from all the sub-projects contained in # the source tarball and they are consistent GPLv2+ - TJ 2007-11-15 @@ -56,7 +62,12 @@ Requires: xorg-x11-fonts-misc # Needed for hwmixvolume Requires: python-alsa %endif +%if 0%{?_hda_tools:1} +BuildRequires: gtk3-devel +Buildrequires: desktop-file-utils +%endif +%if 0%{!?_hda_tools:1} %description This package contains several specialist tools for use with ALSA, including a number of programs that provide access to special hardware facilities on @@ -77,7 +88,17 @@ certain sound cards. * us428control - Control tool for Tascam 428 * hda-verb - Direct HDA codec access * hdajackretask - Reassign the I/O jacks on the HDA hardware +* hdajacksensetest - The sense test for the I/O jacks on the HDA hardware +%else +%description +This package contains several specialist tools for use with ALSA, including +a number of programs that provide access to special hardware facilities on +certain sound cards. +* hda-verb - Direct HDA codec access +* hdajackretask - Reassign the I/O jacks on the HDA hardware +* hdajacksensetest - The sense test for the I/O jacks on the HDA hardware +%endif %package firmware Summary: ALSA tools for uploading firmware to some soundcards @@ -193,6 +214,7 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %{_bindir}/us428control %{_bindir}/hda-verb %{_bindir}/hdajackretask +%{_bindir}/hdajacksensetest %{_datadir}/applications/echomixer.desktop %{_datadir}/applications/envy24control.desktop %{_datadir}/applications/hdspconf.desktop @@ -216,6 +238,16 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif +%if 0%{?_hda_tools:1} +%files +%doc %{_docdir}/%{name}-%{version}/hda-verb +%doc %{_docdir}/%{name}-%{version}/hdajackretask +%{_bindir}/hda-verb +%{_bindir}/hdajackretask +%{_bindir}/hdajacksensetest +%{_datadir}/applications/hdajackretask.desktop +%endif + %if 0%{!?_without_firmware:1} %files firmware %dir %{_docdir}/%{name}-%{version} @@ -233,6 +265,11 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Mon Jun 6 2016 Jaroslav Kysela - 1.1.0-1 +- Updated to 1.1.0 +- Enable hda-verb, hdajackretast, hdajacksensetest for i686/x86_64 +- Resolves: rhbz#1172560 + * Tue Jun 23 2015 Jaroslav Kysela - 1.0.28-2 - Fix bogus dates in spec