diff --git a/alsa-tools.spec b/alsa-tools.spec index 772c5d4..b327b78 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -24,8 +24,8 @@ Summary: Specialist tools for ALSA Name: alsa-tools -Version: 1.1.5 -Release: 4%{?dist} +Version: 1.1.6 +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 @@ -34,18 +34,7 @@ Group: Applications/Multimedia URL: http://www.alsa-project.org/ Source: ftp://ftp.alsa-project.org/pub/tools/%{name}-%{version}.tar.bz2 -# The icons below were created by Tim Jackson from screenshots of the -# apps in question. They suck, a lot. Better alternatives welcome! -Source1: envy24control.desktop -Source2: envy24control.png -Source3: echomixer.desktop -Source4: echomixer.png -Source5: 90-alsa-tools-firmware.rules -# Resized version of public domain clipart found here: -# http://www.openclipart.org/detail/17428 -Source6: hwmixvolume.png -Source7: hwmixvolume.desktop -Source9: hdajackretask.desktop +Source1: 90-alsa-tools-firmware.rules BuildRequires: gcc gcc-c++ BuildRequires: alsa-lib-devel >= %{version} @@ -113,35 +102,18 @@ do cd .. done - %install mkdir -p %{buildroot}%{_datadir}/{pixmaps,applications} for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw} do case $i in - echomixer) - (cd $i ; %make_install ; install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/applications/ ) || exit 1 - ;; - envy24control) - (cd $i ; %make_install ; install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/applications/ ) || exit 1 - ;; - hdspconf) - (cd $i ; %make_install ) || exit 1 - ;; - hdspmixer) - (cd $i ; %make_install ) || exit 1 - ;; - hwmixvolume) - (cd $i ; %make_install ; install -m 644 %{SOURCE6} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE7} %{buildroot}%{_datadir}/applications/ ) || exit 1 - ;; usx2yloader) (cd $i ; %make_install hotplugdir=/lib/udev) || exit 1 ;; - hdajackretask) - (cd $i ; %make_install ; install -m 644 %{SOURCE9} %{buildroot}%{_datadir}/applications/ ) || exit 1 + *) + (cd $i ; %make_install) || exit 1 ;; - *) (cd $i ; %make_install) || exit 1 esac if [[ -s "${i}"/README ]] then @@ -160,6 +132,7 @@ do cp "${i}"/COPYING "%{buildroot}%{_pkgdocdir}/${i}" fi if [[ -s %{buildroot}%{_datadir}/applications/${i}.desktop ]] ; then + desktop-file-validate %{buildroot}%{_datadir}/applications/${i}.desktop desktop-file-install --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/${i}.desktop fi @@ -168,7 +141,19 @@ done # convert hotplug stuff to udev rm -f %{buildroot}/lib/udev/tascam_fw.usermap mkdir -p %{buildroot}/lib/udev/rules.d -install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d +install -m 644 %{SOURCE1} %{buildroot}/lib/udev/rules.d + +%post +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + +%postun +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %if 0%{!?_without_tools:1} %files @@ -196,19 +181,10 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %{_bindir}/hda-verb %{_bindir}/hdajackretask %{_bindir}/hdajacksensetest -%{_datadir}/applications/echomixer.desktop -%{_datadir}/applications/envy24control.desktop -%{_datadir}/applications/hdspconf.desktop -%{_datadir}/applications/hdspmixer.desktop -%{_datadir}/applications/hwmixvolume.desktop -%{_datadir}/applications/hdajackretask.desktop -%{_datadir}/man/man1/envy24control.1.gz -%{_datadir}/pixmaps/echomixer.png -%{_datadir}/pixmaps/envy24control.png -%{_datadir}/pixmaps/hdspconf.png -%{_datadir}/pixmaps/hdspmixer.png -%{_datadir}/pixmaps/hwmixvolume.png %{_datadir}/sounds/* +%{_datadir}/man/man1/envy24control.1.gz +%{_datadir}/applications/*.desktop +%{_datadir}/icons/hicolor/*/apps* # sb16_csp stuff which is excluded for PPCx %ifnarch ppc ppc64 @@ -236,6 +212,9 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d %endif %changelog +* Tue Apr 03 2018 Jaroslav Kysela - 1.1.6-1 +- Updated to 1.1.6 + * Wed Feb 28 2018 Iryna Shcherbina - 1.1.5-4 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) diff --git a/echomixer.desktop b/echomixer.desktop deleted file mode 100644 index ee77e00..0000000 --- a/echomixer.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Echomixer -GenericName=Control Echo Digital Audio sound cards -Comment=Mixer and GUI control utility for Echo Digital Audio sound cards -Exec=echomixer -Icon=echomixer -Terminal=false -Type=Application -Categories=Application;AudioVideo; -Version=0.9.4 diff --git a/echomixer.png b/echomixer.png deleted file mode 100644 index 48c4b92..0000000 Binary files a/echomixer.png and /dev/null differ diff --git a/envy24control.desktop b/envy24control.desktop deleted file mode 100644 index ef814c0..0000000 --- a/envy24control.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Envy24 Control -GenericName=Envy24 Control Utility -Comment=Mixer and GUI control utility for Envy24-based sound cards -Exec=envy24control -Icon=envy24control -Terminal=false -Type=Application -Categories=Application;AudioVideo; -Version=0.9.4 diff --git a/envy24control.png b/envy24control.png deleted file mode 100644 index 73c47d6..0000000 Binary files a/envy24control.png and /dev/null differ diff --git a/hdajackretask.desktop b/hdajackretask.desktop deleted file mode 100644 index 67b9e88..0000000 --- a/hdajackretask.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[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/hwmixvolume.desktop b/hwmixvolume.desktop deleted file mode 100644 index e3ea9c7..0000000 --- a/hwmixvolume.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Hwmixvolume -GenericName=Control the volume of individual streams on sound cards that use hardware mixing -Comment=Control the volume of individual streams on sound cards that use hardware mixing -Exec=hwmixvolume -Icon=hwmixvolume -Terminal=false -Type=Application -Categories=Application;AudioVideo; -Version=0.9.4 diff --git a/hwmixvolume.png b/hwmixvolume.png deleted file mode 100644 index 28226ee..0000000 Binary files a/hwmixvolume.png and /dev/null differ diff --git a/sources b/sources index d14dc6b..25a86ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (alsa-tools-1.1.5.tar.bz2) = 42463540def2260bda0fdb0b08a665ef336deb817920605ce8f77b4904595eadc7d4774d799385bb2271026e26976cc733a776b228814d2c7d7651c46a45098d +SHA512 (alsa-tools-1.1.6.tar.bz2) = 33617ec6726ca11f66849c893a8dd9bf9faa8832374788819d9280159ac358c83443331faac24881df593cfd0b24b22769a41cbcb0af3c1fd781baab0c802d17