X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=sox.spec;h=80c7ea8dca58cac20fa5ea803e16d600319bde6b;hb=81b99d876c56d6a925c9e4df53c52f9a0a498388;hp=ac9d0a29bf9a6cc37bc12eaf1a4e900d0e8f44f4;hpb=17c26746c09e00df3e8dcbf84ba18d2d334dadcc;p=packages%2Fsox.git

diff --git a/sox.spec b/sox.spec
index ac9d0a2..80c7ea8 100644
--- a/sox.spec
+++ b/sox.spec
@@ -1,10 +1,7 @@
 #
 # Conditional build:
-# _without_alsa - without ALSA support
+%bcond_without	alsa	# without ALSA support
 #
-
-%define		_pre		pre2
-
 Summary:	A general purpose sound file conversion tool
 Summary(de):	Mehrzweck-Sounddatei-Konvertierungs-Tool
 Summary(es):	Herramienta para conversión de archivos de sonido
@@ -15,22 +12,20 @@ Summary(ru):	
 Summary(tr):	Genel amaçlý ses dosyasý çevirme aracý
 Summary(uk):	õÔÉ̦ÔÁ ÚÁÇÁÌØÎÏÇÏ ÐÒÉÚÎÁÞÅÎÎÑ ÄÌÑ ÒÏÂÏÔÉ ¦Ú Ú×ÕËÏ×ÉÍÉ ÆÁÊÌÁÍÉ
 Name:		sox
-Version:	12.17.4
-Release:	0.%{_pre}.1
+Version:	12.17.6
+Release:	1
 License:	distributable
 Group:		Applications/Sound
-Source0:	http://sox.sourceforge.net/%{name}-%{version}-%{_pre}.tar.gz
+Source0:	http://dl.sourceforge.net/sox/%{name}-%{version}.tar.gz
+# Source0-md5:	ea368e7baf6618a2116f3ed6c111bd4a
 Patch0:		%{name}-play.patch
-Patch1:		%{name}-soundcard.patch
-Patch2:		%{name}-install.patch
+Patch1:		%{name}-install.patch
 URL:		http://sox.sourceforge.net/
-BuildRequires:	autoconf
+%{?with_alsa:BuildRequires:	alsa-driver-devel}
 BuildRequires:	automake
-BuildRequires:	libgsm-devel
+BuildRequires:	lame-libs-devel
+BuildRequires:	libmad-devel
 BuildRequires:	libvorbis-devel >= 1:1.0
-%ifnarch sparc sparc64
-%{!?_without_alsa:BuildRequires:	alsa-driver-devel}
-%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -52,7 +47,7 @@ manejo de sonido.
 SoX (Sound eXchange) jest konwerterem formatów plików d¼wiêkowych dla
 Linuksa, Uniksa i Dosa. SoX mo¿e wykonywaæ konwersjê miêdzy wieloma
 formatami cyfrowego d¼wiêku. Mo¿e tak¿e dokonywaæ prostych manipulacji
-na d¼wiêku, wliczaj±c w to ró¿ne efekty d¼wiekowe.
+na d¼wiêku, wliczaj±c w to ró¿ne efekty d¼wiêkowe.
 
 %description -l ru
 ëÁË ÇÏ×ÏÒÉÔÓÑ × ÄÏËÕÍÅÎÔÁÃÉÉ, "Û×ÅÊÃÁÒÓËÉÊ ÁÒÍÅÊÓËÉÊ ÎÏÖ Ú×ÕËÏ×ÙÈ
@@ -98,22 +93,19 @@ Bibliotecas que podem ser usadas para compilar aplica
 bibliotecas do sox.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
-%{__aclocal}
-%{__autoconf}
+cp -f /usr/share/automake/config.sub .
 %configure \
 	--with-oss-dsp \
 	--with-gsm \
-%ifnarch sparc sparc64
-	%{!?_without_alsa:--with-alsa-dsp}
-%endif
+	%{?with_alsa:--with-alsa-dsp}
 
-%{__make} PREFIX=%{_prefix}
+%{__make} \
+	PREFIX=%{_prefix}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -130,7 +122,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc monkey.* Changelog README TODO
+%doc src/monkey.* Changelog README TODO
 %attr(755,root,root) %{_bindir}/[!l]*
 %{_mandir}/man1/*