[alsa-tools/f17] Updated to 1.0.26.1

[perex]

commit c9c2d0ba55b413d9d43987c6e238cde701ca2ab7
Author: Jaroslav Kysela <perex at perex.cz>
Date:   Fri Sep 7 13:42:28 2012 +0200

    Updated to 1.0.26.1

 .gitignore            |    3 +++
 alsa-tools.spec       |   26 ++++++++++++++++++++++----
 hdajackretask.desktop |   10 ++++++++++
 sources               |    2 +-
 4 files changed, 36 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 050dcca..a2ca962 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
 alsa-tools-1.0.23-pruned.tar.bz2
 /alsa-tools-1.0.25-pruned.tar.bz2
+/alsa-tools-1.0.26-pruned.tar.bz2
+/alsa-tools-1.0.26.1.tar.bz2
+/alsa-tools-1.0.26.1-pruned.tar.bz2
diff --git a/alsa-tools.spec b/alsa-tools.spec
index 8013164..86d5bc7 100644
--- a/alsa-tools.spec
+++ b/alsa-tools.spec
@@ -6,9 +6,9 @@
 
 %ifarch 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 }
+%{?!_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 }
+%{?!_without_tools:     %global builddirstools as10k1 echomixer envy24control hdspconf hdspmixer hwmixvolume rmedigicontrol sbiload sb16_csp sscape_ctl us428control hda-verb hdajackretask }
 %endif
 
 %{?!_without_firmware:  %global builddirsfirmw hdsploader mixartloader usx2yloader vxloader }
@@ -22,8 +22,8 @@
 
 Summary:        Specialist tools for ALSA
 Name:           alsa-tools
-Version:        1.0.25
-Release:        2%{?dist}
+Version:        1.0.26.1
+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
@@ -43,11 +43,13 @@ Source5:        90-alsa-tools-firmware.rules
 # http://www.openclipart.org/detail/17428
 Source6:	hwmixvolume.png
 Source7:	hwmixvolume.desktop
+Source9:        hdajackretask.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  alsa-lib-devel >= 1.0.24
 %if 0%{!?_without_tools:1}
 BuildRequires:  gtk+-devel
 BuildRequires:  gtk2-devel
+BuildRequires:  gtk3-devel
 BuildRequires:  fltk-devel
 Buildrequires:  desktop-file-utils
 Requires:       xorg-x11-fonts-misc
@@ -73,6 +75,8 @@ certain sound cards.
 * sbiload - An OPL2/3 FM instrument loader for ALSA sequencer
 * sscape_ctl - ALSA SoundScape control utility
 * us428control - Control tool for Tascam 428
+* hda-verb - Direct HDA codec access
+* hdajackretask - Reassign the I/O jacks on the HDA hardware
 
 
 %package firmware
@@ -132,6 +136,9 @@ do
     usx2yloader)
       (cd $i ; %makeinstall hotplugdir=${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb) || exit 1
       ;;
+    hdajackretask)
+      (cd $i ; %makeinstall ; install -m 644 %{SOURCE9} ${RPM_BUILD_ROOT}%{_datadir}/applications/ ) || exit 1
+      ;;
     *) (cd $i ; %makeinstall) || exit 1
    esac
    if [[ -s "${i}"/README ]]
@@ -181,6 +188,8 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d
 %doc %{_docdir}/%{name}-%{version}/hwmixvolume
 %doc %{_docdir}/%{name}-%{version}/rmedigicontrol
 %doc %{_docdir}/%{name}-%{version}/sbiload
+%doc %{_docdir}/%{name}-%{version}/hda-verb
+%doc %{_docdir}/%{name}-%{version}/hdajackretask
 %{_bindir}/as10k1
 %{_bindir}/echomixer
 %{_bindir}/envy24control
@@ -191,11 +200,14 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d
 %{_bindir}/sbiload
 %{_bindir}/sscape_ctl
 %{_bindir}/us428control
+%{_bindir}/hda-verb
+%{_bindir}/hdajackretask
 %{_datadir}/applications/fedora-echomixer.desktop
 %{_datadir}/applications/fedora-envy24control.desktop
 %{_datadir}/applications/fedora-hdspconf.desktop
 %{_datadir}/applications/fedora-hdspmixer.desktop
 %{_datadir}/applications/fedora-hwmixvolume.desktop
+%{_datadir}/applications/fedora-hdajackretask.desktop
 %{_datadir}/man/man1/envy24control.1.gz
 %{_datadir}/pixmaps/echomixer.png
 %{_datadir}/pixmaps/envy24control.png
@@ -231,6 +243,12 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d
 %endif
 
 %changelog
+* Fri Sep  7 2012 Jaroslav Kysela <jkysela at redhat.com> - 1.0.26.1-1
+- Fixed gtk3-devel dependency (hdajackretask)
+- Added description for hda-verb and hdajackretask
+- Updated to 1.0.26.1
+- Added hda-verb and hdajackretask tools
+
 * Wed Mar  7 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 1.0.25-2
 - Bump build for ARM
 
diff --git a/hdajackretask.desktop b/hdajackretask.desktop
new file mode 100644
index 0000000..67b9e88
--- /dev/null
+++ b/hdajackretask.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=HDAJackRetask
+GenericName=Retask the audio jacks for the HDA sound driver
+Comment=Retask the audio jacks for the HDA sound driver
+Exec=hdajackretask
+Terminal=false
+Type=Application
+Categories=Application;AudioVideo;
+Version=0.9.4
diff --git a/sources b/sources
index d05a9ab..a0978d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-04d96d866f35fa3d0e7ff1147fa49bfb  alsa-tools-1.0.25-pruned.tar.bz2
+2bf2db319a747edd4e954866d8ba8de7  alsa-tools-1.0.26.1-pruned.tar.bz2