dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: alsa-tools
-# $Id: Makefile,v 1.2 2004/11/24 03:09:37 gafton Exp $
-NAME := alsa-tools
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

alsa-tools.spec

@@ -6,12 +6,12 @@
 
 %ifarch ppc ppc64
 # sb16_csp doesn't build on PPC; see bug #219010
-%{?!_without_tools:     %define builddirstools as10k1 echomixer envy24control hdspconf hdspmixer rmedigicontrol sbiload sscape_ctl us428control }
+%{?!_without_tools:     %global builddirstools as10k1 echomixer envy24control hdspconf hdspmixer rmedigicontrol sbiload sscape_ctl us428control }
 %else
-%{?!_without_tools:     %define builddirstools as10k1 echomixer envy24control hdspconf hdspmixer rmedigicontrol sbiload sb16_csp sscape_ctl us428control }
+%{?!_without_tools:     %global builddirstools as10k1 echomixer envy24control hdspconf hdspmixer rmedigicontrol sbiload sb16_csp sscape_ctl us428control }
 %endif
 
-%{?!_without_firmware:  %define builddirsfirmw hdsploader mixartloader usx2yloader vxloader }
+%{?!_without_firmware:  %global builddirsfirmw hdsploader mixartloader usx2yloader vxloader }
 
 # The source tarball has been pruned to remove the "ac3dec" directory, due
 # to legal concerns that the contents might be subject to patent claims
@@ -22,8 +22,8 @@
 
 Summary:        Specialist tools for ALSA
 Name:           alsa-tools
-Version:        1.0.19
+Version:        1.0.22
-Release:        3%{?dist}
+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
@@ -46,6 +46,7 @@ BuildRequires:  gtk+-devel
 BuildRequires:  gtk2-devel
 BuildRequires:  fltk-devel
 Buildrequires:  desktop-file-utils
+Requires:       xorg-x11-fonts-misc
 %endif
 
 %description
@@ -216,6 +217,16 @@ install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/udev/rules.d
 %endif
 
 %changelog
+* Sun Jan 10 2010 Tim Jackson <rpm@timj.co.uk> - 1.0.22-1
+- Update to 1.0.22
+- use %%global instead of %%define
+
+* Wed Aug 26 2009 Tim Jackson <rpm@timj.co.uk> - 1.0.20-2
+- Add missing dep on xorg-x11-fonts-misc (#503284)
+
+* Sat May 30 2009 Tim Jackson <rpm@timj.co.uk> - 1.0.20-1
+- Update to 1.0.20
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.19-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 

echomixer.desktop

@@ -0,0 +1,11 @@
+[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.png
+Terminal=false
+Type=Application
+Categories=Application;AudioVideo;
+Version=0.9.4

envy24control.desktop

@@ -0,0 +1,11 @@
+[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.png
+Terminal=false
+Type=Application
+Categories=Application;AudioVideo;
+Version=0.9.4

sources

@@ -1,5 +1 @@
-57af85a810ed770885aec2a5b35648e6  echomixer.desktop
+8305f7137aa5542731df8fa351554645  alsa-tools-1.0.22-pruned.tar.bz2
-38db1b88c44adb5591f87173061d7d98  echomixer.png
-4c10f8d250a86bdb3ea138488aec8fc4  envy24control.desktop
-3a1a195f2b9641f68651e3d312e5476f  envy24control.png
-b12c748adc1bc4d4b454d61ee2e4432f  alsa-tools-1.0.19-pruned.tar.bz2