- added no-c2x patch (avoid -std=c2x feature: label before declaration)

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

diff --git a/alsa-tools.spec b/alsa-tools.spec
index 74f840ea8a01b509f8f084efa315e6cd4c18210d..8b4de1b196be10130806f91de48234622309b739 100644 (file)
--- a/alsa-tools.spec
+++ b/alsa-tools.spec
@@ -5,15 +5,17 @@
 Summary:       Advanced Linux Sound Architecture (ALSA) - tools
 Summary(pl.UTF-8):     Advanced Linux Sound Architecture (ALSA) - narzędzia
 Name:          alsa-tools
-Version:       1.0.26.1
+Version:       1.2.11
 Release:       1
 License:       GPL v2+
 Group:         Applications/Sound
 Source0:       ftp://ftp.alsa-project.org/pub/tools/%{name}-%{version}.tar.bz2
-# Source0-md5: 805526ea5d6c40e1f2c94cee86141230
+# Source0-md5: bc5f5e5689f46a9d4a0b85dc6661732c
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-sh.patch
 Patch2:                %{name}-csp.patch
+Patch3:                x32.patch
+Patch4:                %{name}-no-c2x.patch
 URL:           http://www.alsa-project.org/
 BuildRequires: alsa-lib-devel >= 1.0.24
 BuildRequires: autoconf
@@ -33,7 +35,6 @@ Requires:     alsa-lib >= 1.0.24
 Requires:      liblo10k1 = %{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# ac3dec skipped - see ac3dec.spec
 # qlo10k1 has separate make rule
 %define        progs   as10k1 echomixer envy24control hda-verb hdajackretask hdspconf hdsploader hdspmixer hwmixvolume ld10k1 mixartloader pcxhrloader rmedigicontrol sb16_csp seq/sbiload sscape_ctl us428control usx2yloader vxloader
 
@@ -50,6 +51,8 @@ Summary:      GTK+ GUI to control Echoaudio soundcard
 Summary(pl.UTF-8):     Graficzny interfejs GTK+ do sterowania kartami dźwiękowymi Echoaudio
 Group:         X11/Applications/Sound
 Requires:      %{name} = %{version}-%{release}
+Requires(post,postun): gtk-update-icon-cache
+Requires:      hicolor-icon-theme
 
 %description gui-echoaudio
 This package contains Echomixer - GTK+ GUI tool to control all the
@@ -83,6 +86,8 @@ Summary:      GTK+ GUI to control Envy24 (ice1712) based soundcards
 Summary(pl.UTF-8):     Graficzny interfejs GTK+ do sterowania kartami dźwiękowymi Envy24
 Group:         X11/Applications/Sound
 Requires:      %{name} = %{version}-%{release}
+Requires(post,postun): gtk-update-icon-cache
+Requires:      hicolor-icon-theme
 
 %description gui-envy24
 This package contains envy24control - GTK+ GUI tool to control Envy24
@@ -98,6 +103,8 @@ Summary:     GTK+ GUI for HDA Intel soundcards
 Summary(pl.UTF-8):     Graficzny interfejs GTK+ do sterowania kartami HDA Intel
 Group:         X11/Applications/Sound
 Requires:      %{name} = %{version}-%{release}
+Requires(post,postun): gtk-update-icon-cache
+Requires:      hicolor-icon-theme
 
 %description gui-hda
 This package contains hdajackretask - a GUI to make it easy to retask
@@ -112,6 +119,8 @@ Summary:    FLTK GUIs to control RME Hammerfall HDSP soundcards
 Summary(pl.UTF-8):     Graficzne interfejsy FLTK do sterowania kartami dźwiękowymi RME Hammerfall HDSP
 Group:         X11/Applications/Sound
 Requires:      %{name} = %{version}-%{release}
+Requires(post,postun): gtk-update-icon-cache
+Requires:      hicolor-icon-theme
 
 %description gui-hdsp
 This package contains two FLTK-based GUI utilities for RME Hammerfall
@@ -130,6 +139,8 @@ Summary:    PyGTK GUI to control volume of individual streams when using hardware m
 Summary(pl.UTF-8):     Graficzny interfejs PyGTK do ustawiania głośności strumieni przy sprzętowym miksowaniu
 Group:         X11/Applications/Sound
 Requires:      %{name} = %{version}-%{release}
+Requires(post,postun): gtk-update-icon-cache
+Requires:      hicolor-icon-theme
 Requires:      python-pyalsa >= 1.0.22
 Requires:      python-pygtk-gtk >= 2:2.0
 
@@ -220,13 +231,15 @@ Statyczna biblioteka liblo10k1.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 # don't BR gtk+ 1.2
 echo 'AC_DEFUN([AM_PATH_GTK],[])' > echomixer/acinclude.m4
 echo 'AC_DEFUN([AM_PATH_GTK],[])' > envy24control/acinclude.m4
 echo 'AC_DEFUN([AM_PATH_GTK],[])' > rmedigicontrol/acinclude.m4
 
-sed -i -e 's,/usr/bin/env python,/usr/bin/python,' hwmixvolume/hwmixvolume
+sed -i -e 's,/usr/bin/env python,%{__python},' hwmixvolume/hwmixvolume
 
 install -d doc-main doc-sep
 
@@ -291,6 +304,36 @@ install as10k1/examples/*.emu10k1 $RPM_BUILD_ROOT%{_datadir}/ld10k1/effects
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post gui-hdsp
+%update_icon_cache hicolor
+
+%postun gui-echoaudio
+%update_icon_cache hicolor
+
+%post gui-echoaudio
+%update_icon_cache hicolor
+
+%postun gui-envy24
+%update_icon_cache hicolor
+
+%post gui-envy24
+%update_icon_cache hicolor
+
+%postun gui-hda
+%update_icon_cache hicolor
+
+%post gui-hda
+%update_icon_cache hicolor
+
+%postun gui-hdsp
+%update_icon_cache hicolor
+
+%post gui-hwmix
+%update_icon_cache hicolor
+
+%postun gui-hwmix
+%update_icon_cache hicolor
+
 %post  -n liblo10k1 -p /sbin/ldconfig
 %postun        -n liblo10k1 -p /sbin/ldconfig
 
@@ -324,6 +367,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc doc-sep/README.echomixer
 %attr(755,root,root) %{_bindir}/echomixer
+%{_desktopdir}/echomixer.desktop
+%{_iconsdir}/hicolor/*/apps/echomixer.png
 
 %files gui-emu10k1
 %defattr(644,root,root,755)
@@ -335,11 +380,15 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc-sep/README.envy24control envy24control/README.profiles
 %attr(755,root,root) %{_bindir}/envy24control
 %{_mandir}/man1/envy24control.1*
+%{_desktopdir}/envy24control.desktop
+%{_iconsdir}/hicolor/*/apps/envy24control.png
 
 %files gui-hda
 %defattr(644,root,root,755)
 %doc doc-sep/{AUTHORS,NEWS,README}.hdajackretask
 %attr(755,root,root) %{_bindir}/hdajackretask
+%{_desktopdir}/hdajackretask.desktop
+%{_iconsdir}/hicolor/*/apps/hdajackretask.png
 
 %files gui-hdsp
 %defattr(644,root,root,755)
@@ -348,13 +397,15 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/hdspmixer
 %{_desktopdir}/hdspconf.desktop
 %{_desktopdir}/hdspmixer.desktop
-%{_pixmapsdir}/hdspconf.png
-%{_pixmapsdir}/hdspmixer.png
+%{_iconsdir}/hicolor/*/apps/hdspconf.png
+%{_iconsdir}/hicolor/*/apps/hdspmixer.png
 
 %files gui-hwmix
 %defattr(644,root,root,755)
 %doc doc-sep/README.hwmixvolume
 %attr(755,root,root) %{_bindir}/hwmixvolume
+%{_desktopdir}/hwmixvolume.desktop
+%{_iconsdir}/hicolor/*/apps/hwmixvolume.png
 
 %files gui-rmedigi
 %defattr(644,root,root,755)