From ecc67a90f5739574175e28fe858f52f13ae71f07 Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Apr 08 2005 15:06:28 +0000 Subject: Bring alsa-tools in line with the version already in extras-FC-3. Also: Wed Apr 06 2005 Thorsten Leemhuis - 1.0.8-1 - Update to 1.0.8 --- diff --git a/.cvsignore b/.cvsignore index 20605b4..6678edd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -alsa-tools-1.0.4.tar.bz2 +alsa-tools-1.0.8.tar.bz2 diff --git a/alsa-tools-as10k1gcc_fix.patch b/alsa-tools-as10k1gcc_fix.patch new file mode 100644 index 0000000..9c68326 --- /dev/null +++ b/alsa-tools-as10k1gcc_fix.patch @@ -0,0 +1,11 @@ +--- as10k1/as10k1.c.org 2004-12-19 19:30:31.944508232 +0100 ++++ as10k1/as10k1.c 2004-12-19 19:30:45.336472344 +0100 +@@ -159,7 +159,7 @@ + + } + next_cli_arg: +- ++ ; + } + } + diff --git a/alsa-tools.spec b/alsa-tools.spec index 937f703..5cf762b 100644 --- a/alsa-tools.spec +++ b/alsa-tools.spec @@ -1,21 +1,23 @@ +%{?!_without_tools: %define builddirstools ac3dec as10k1 envy24control hdspconf hdspmixer rmedigicontrol sbiload sb16_csp sscape_ctl us428control } +%{?_without_tools: %{!?_with_firmware: %define _with_firmware 1}} +%{?_with_firmware: %define builddirsfirmw hdsploader mixartloader usx2yloader vxloader } + Summary: The ALSA Tools Name: alsa-tools -Version: 1.0.4 -Release: 1.1 +Version: 1.0.8 +Release: 1 License: GPL Group: Applications/Multimedia URL: http://www.alsa-project.org/ -Source0: %{name}-%{version}.tar.bz2 +Source0: ftp://ftp.alsa-project.org/pub/tools/%{name}-%{version}.tar.bz2 +Patch0: %{name}-as10k1gcc_fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk+-devel alsa-driver fltk-devel automake -BuildRequires: alsa-lib-devel >= 1.0.4 -Buildrequires: desktop-file-utils - -%package firmware -Summary: Alsa-Tool to upload the firmware (needed for some soundcards) -Group: Applications/System -Requires: hotplug alsa-firmware - +BuildRequires: alsa-lib-devel >= %{version} +%if 0%{!?_without_tools:1} +BuildRequires: gtk+-devel +BuildRequires: fltk-devel +Buildrequires: desktop-file-utils +%endif %description This package contains several tools which can be used together with @@ -29,6 +31,14 @@ Some Noteable: * sbiload - An OPL2/3 FM instrument loader for ALSA sequencer * sscape_ctl - ALSA SoundScape control utility + + +%package firmware +Summary: Alsa-Tool to upload the firmware (needed for some soundcards) +Group: Applications/System +Requires: hotplug alsa-firmware + + %description firmware This package contains several tools which will flash the firmware into the Soundcards. The following tools are available: @@ -40,18 +50,13 @@ usx2yloader - Second Phase Firmware loader for Tascam USX2Y USB soundcards %prep -echo " --------------------------------------------------------------- -Hasn't been built nor updated since FC1. -Needs decision on whether to drop it. ---------------------------------------------------------------" > /dev/null -exit 1 -%setup -q +%setup -q -n %{name}-%{version} +%patch0 -b .patch0 %build mv seq/sbiload . ; rmdir seq -for i in * +for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw} do cd $i ; %configure %{__make} %{?_smp_mflags} || exit 1 @@ -61,24 +66,22 @@ done %install %{__rm} -rf $RPM_BUILD_ROOT -[ -f debugfiles.list ] && rm debugfiles.list -[ -f debugsources.list ] && rm debugsources.list -for i in * -do +for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw} +do case $i in hdspconf) - (cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1 + (cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1 ;; hdspmixer) - (cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1 + (cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1 ;; usx2yloader) - (cd $i ; %makeinstall hotplugdir=${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb) || exit 1 + (cd $i ; %makeinstall hotplugdir=${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb) || exit 1 ;; *) (cd $i ; %makeinstall) || exit 1 esac - if [[ -s "${i}"/README ]] + if [[ -s "${i}"/README ]] then if [[ ! -d "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" ]] then @@ -86,31 +89,27 @@ do fi cp "${i}"/README "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" fi - if [[ -s "${i}"/COPYING ]] + if [[ -s "${i}"/COPYING ]] then if [[ ! -d "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" ]] then mkdir -p "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" fi cp "${i}"/COPYING "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" + fi + if [[ -s ${RPM_BUILD_ROOT}%{_datadir}/applications/${i}.desktop ]] ; then + desktop-file-install --vendor fedora \ + --add-category "X-Fedora" \ + --delete-original \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + ${RPM_BUILD_ROOT}%{_datadir}/applications/${i}.desktop fi - - done -for f in ${RPM_BUILD_ROOT}%{_datadir}/applications/*.desktop; do - desktop-file-install --vendor fedora \ - --add-category "X-Fedora" \ - --delete-original \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - $f -done - - %clean %{__rm} -rf $RPM_BUILD_ROOT - +%if 0%{!?_without_tools:1} %files %defattr(-,root,root,-) %doc %{_docdir}/%{name}-%{version}/ac3dec @@ -138,7 +137,10 @@ done %{_datadir}/man/man1/envy24control.1.gz %{_datadir}/pixmaps/hdspconf.png %{_datadir}/pixmaps/hdspmixer.png +%{_datadir}/sounds/ +%endif # ?!_without_tools +%if 0%{?_with_firmware:1} %files firmware %defattr(-,root,root,-) %doc %{_docdir}/%{name}-%{version}/hdsploader @@ -152,9 +154,21 @@ done %{_bindir}/mixartloader %{_bindir}/usx2yloader %{_bindir}/vxloader - +%endif # ?_with_firmware %changelog +* Wed Apr 06 2005 Thorsten Leemhuis - 1.0.8-1 +- Update to 1.0.8 + +* Sun Mar 29 2005 Thorsten Leemhuis - 0:1.0.6-2 +- Add "--without tools" and "--with firmware" options +- Drop unneeded BR: automake + +* Sun Jan 02 2005 Thorsten Leemhuis - 0:1.0.6-0.fdr.1 +- Update to 1.0.6 for FC3 +- add new files in {_datadir}/sounds/ +- add patch0 for as10k1 + * Sat Apr 03 2004 Thorsten Leemhuis - 0:1.0.4-0.fdr.1 - Update to 1.0.4 @@ -183,5 +197,3 @@ done * Wed Aug 13 2003 Dams 0:tools-0.fdr.1 - Initial build. - - diff --git a/sources b/sources index d31da0f..7e28b33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c901a79e60a42f82f07f7a77cb45691a alsa-tools-1.0.4.tar.bz2 +cf51eccd14e818a9f0be455cedcd52ff alsa-tools-1.0.8.tar.bz2