From f877b0cd26639640816db23136a0e7360d7323fc Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 3 Apr 2018 11:25:12 +0200 Subject: [PATCH] updated to 1.1.6 --- alsa-tools.spec | 71 +++++++++++++++--------------------------- echomixer.desktop | 11 ------- echomixer.png | Bin 841 -> 0 bytes envy24control.desktop | 11 ------- envy24control.png | Bin 945 -> 0 bytes hdajackretask.desktop | 10 ------ hwmixvolume.desktop | 11 ------- hwmixvolume.png | Bin 1599 -> 0 bytes sources | 2 +- 9 files changed, 26 insertions(+), 90 deletions(-) delete mode 100644 echomixer.desktop delete mode 100644 echomixer.png delete mode 100644 envy24control.desktop delete mode 100644 envy24control.png delete mode 100644 hdajackretask.desktop delete mode 100644 hwmixvolume.desktop delete mode 100644 hwmixvolume.png 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 48c4b92a7ba27f9b9d5d43197a6ad4791adab1b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 841 zcmV-P1GfB$P)=@uP=5;4D_`a2ZsTfjht< z@S4P8FbUiP?gLFAr!j$stV6&j(HKkuHCaOld!V~r0IC{KpdWL9Bb+W@qBJ`n>+hde z-VHf{kHBPf>3N%Y-ln1x$cd7tG(o5UTod`c2&{^vzJyX~o|)-NtnF66EGL}69~r8qfwdv~j=(Lf|@Z6eXaG1FlHwHZYMa2L>af z9q|L!!28>TAk+kI1K))YKeRz;THKfc_BG1r4)9#FBTECfguquca-bw6t^x-dWpoNy z5I-=kkpum)3R2M2K*$Eh#0M_{Ux9hx6}WB+*NNvZ+XwpzCy*7=deR5k$Bt}ra+axL zIo5V->z{^XDII}MUd+8%O5d+5kx^F~xd3Qsl+l#HDNi(=d!|iBFUx~_l7u=L{U%GT zBdf?MYzUOpIkFw8#ucEhv6V=RnfWEHwJHu+;syG!QSpYxCYp!ZL=(9cqT#L!6oD6z z%@)XHaNcp^a;bW$J76{ z5*_JAQ^2C!%W2?1is(hgt{9p3Qh}Fg?b7aj(aZbgi?O@vx zLXBfEP8Yl5VB9WN&%!bm#xckDj7_g?hSW-&5{1G9=L$stTBVS&g*FH4IT~|Yxa~CQ zR))P|$asB<-O4s&%`ENZy<~_J_iL4_#bWPCwc0D^^CSGV%3q=u1k{4yO!oc_sIMz# T%a})400000NkvXXu0mjf$*^>{ 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 73c47d67a25ee245181731883e709d0f7f5f4c15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 945 zcmV;i15W&jP)V?f56dEpAjk^K!d^W23Vs{G{RRsj1P@+4`F51(MMXSF$hs>CzD;H_ zneOTCdU-s|WTtCoVzNz>xbD=c`l+t}^XsRoo-V3b_0v1_m1?z?%Cz6UYjiXSf*xa< zro#2oG%fjFf0s&SS!va8FOQA+zTaaE!$`DhA3wYYV@9dHQ`3yGOINS`^LSy-e)|D% z*l#%&W4TE zsM$2e1f|lhu`+-*5Et&`o~d_l|58f1t_xrv@U!jdQKtSmG?jEfJODHk^>D5dqY) zw1KoSL;zT)8+YN3qL9KpOG;|1wdI_{-onLEsM{w+bhOv$+4s&r&}MN zm|T4Q3c%qb$1EU6IG*PUA-V(4APNdrkCZT0tLJ)PV5~idwse3tMLz`kuK|hm8WsY) z-eXxL%jx6Z2%co5Nag}+5E{CekFFEySt*?h2nJ9E4MUHV$_K=Xn_xXsJRgt)1jS9% zU{gMa%YFzn1lrDD2NVz%?_F0h%J@o11hl00~a%oA@Jug5B$VL7)`X%)^NiJ#c^!4+z0Lt?&G>%GYSo9M~J@ha%37RDH&s(gH_!5+D<`hMbt%S zo$IMMj!UKXrOAfZQ;o(d5$yPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L00Nr;00Nr1J5Y>XRL#01?Si7_G3M0dFIu@MYuAfP;?6fLPRKxyeP)47kiuXB%!Dbsm& z2Bw|1iGMPid;fFp|DFGF{_~w-P(hA=bNpq)v_5k^zdr~98H*$=%i5yAUsRRwr~5zL z|8pfBru4yg$G?4X{9f`WLWqPVA{@s#@yA;Cyu1Is-%8){r4P~>{a~T-E20`AN*FxL zASlN>@4|p0pnz^=kxXYmDFq=!N@w(g0BQs9N$?B+2t0?LjyT2>H*k663LM*R+KLN; zfVNeuu)cRK#_mkQaoxOKbpY^N0idU275+Rkglsn3^pNp954RHuOpK3X+l~QTyKy^j zS4{u_&=S!war;)0@v5eQ0sy7C-$ErW$HCBbP)gzZKK{8njCgks?xm+uH-Lx|!tk{# zxtL@aw6wG!olb);py7q0MIx{a10)DAIWd7X>o!yeTrmbY7WPccYnp~sD%CXO0YJ}W z5DJH99|WYTZbc6;3{#L3#e?N=7(B~@5K=Wi1VMl(ieMN9re%Q!K}9`DmLc#wD5Wq> zv*;b2v4c`tWKUflD4uC{!;+IpWVAa^*E)Eal(#S~7`F=lp7GsITBLmeB}tJ+H|iED`sdudmpTH?T2-T(y3 zFK+-cnsQnsW!;h>v+NT&sKuI3S7Et2UrDDpWFVlEzl=#Yvp zdOt^0iDLcrUhq7RxYCX%&U6>)-JgCAZ@vExHf{uZ*S(GF|K_^QeS6xmuIGov1Her% zNF5%Bt7PDQ??8=(F|d1US*z^%QS8{s!m%lAXSP)~v+B~wfx6ogtMSum-5zKU0`yHy zVOrOrc6DL9uEUGPaG`;ZXYD2?@dt{66^9Rl9yx+HPMiP|2~b(a-2(@3w?bc3kBCAO z0fg7A0i&uw!4Z?OZ7761dg~EhjD28U2rdG{pa_K+hypDruXN!&Fxw|I-X^S!oyXBH zpGI4|ipRS~ps7*BS|qH0a;OOagvJAx!F~AFQH=g&;^wWdv3qb3Tl)LU%I(60ki2MY zdt(5C2S>;f0EAs!UZCy}`t|Bn3>-TKeQXSWcXgpN9*5rDjhjtm>>2_v6bj+e=qT=3 z7QRX(@X_EPR>$KA3}gAxD$AZ1`X9hz9%wX0L1#P;O;P65>xjp(G8U^jUw20bR=2e+ z9Dq`4oMlR0ORX^ax~T9Rdm zf&fAYteM4;Wf>%(4+kKb&S1l)O*nn>WUhmD9KdnFa$J!I=38vrF1wHJ+q@a$$yEIS zc#conj?+4s*75AN?YMCMTs{_qIz2ES!Y~Y;>hFi;Q`n9RS(1`<0$~3D@KP#cz;-2U zef|abo(Ioy=1R$V6AA{RC_oS;Or$c%Os5L%stuqeq8-XQ?oL98l(ij