Author: tpg
Date: Tue Feb 13 05:35:30 2007
New Revision: 120262

Added:
   packages/cooker/sox/current/SOURCES/sox-13.0.0.tar.bz2   (contents, props 
changed)
Removed:
   packages/cooker/sox/current/SOURCES/sox-12.18.2.tar.bz2
Modified:
   packages/cooker/sox/current/SPECS/sox.spec

Log:
- new version
- fix buildrequires
- move libraries to its own package
- set %multiarch on libst-config
- spec file clean

Added: packages/cooker/sox/current/SOURCES/sox-13.0.0.tar.bz2
==============================================================================
Binary file. No diff available.

Modified: packages/cooker/sox/current/SPECS/sox.spec
==============================================================================
--- packages/cooker/sox/current/SPECS/sox.spec  (original)
+++ packages/cooker/sox/current/SPECS/sox.spec  Tue Feb 13 05:35:30 2007
@@ -4,25 +4,27 @@
 %define distsuffix plf
 %endif
 
-%define        name    sox
-%define version 12.18.2
-%define release %mkrel 2
+%define major 0
+%define libname %mklibname st %{major}
 
 Summary:       A general purpose sound file conversion tool
-Name:          %{name}
-Version:       %{version}
-Release:       %{release}
+Name:          sox
+Version:       13.0.0
+Release:       %mkrel 1
 License:       LGPL
 Group:         Sound
-Source:                
http://heanet.dl.sourceforge.net/sourceforge/sox/%{name}-%{version}.tar.bz2
-#Patch1:               sox-12.17.6-system_gsm_libs.diff
 Url:           http://sox.sourceforge.net/
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:  oggvorbis-devel mad-devel gsm-devel
+Source:                
http://heanet.dl.sourceforge.net/sourceforge/sox/%{name}-%{version}.tar.bz2
+BuildRequires: oggvorbis-devel
+BuildRequires: mad-devel
+BuildRequires: gsm-devel
+Buildrequires: libflac-devel
+BuildRequires: libsndfile-devel
 %if %build_plf
-BuildRequires:  lame-devel
+BuildRequires: lame-devel
 %endif
- 
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+
 %description
 SoX (Sound eXchange) is a sound file format converter for Linux,
 UNIX and DOS PCs. The self-described 'Swiss Army knife of sound
@@ -37,71 +39,95 @@
 This package is in PLF as it was build with lame encoder support, which is in 
PLF.
 %endif
 
-%package -n    sox-devel
+%package -n    %{name}-devel
 Summary:       The SoX sound file format converter libraries
 Group:         Development/C
-Requires:      oggvorbis-devel libgsm-devel libmad-devel
+Requires:      oggvorbis-devel libgsm-devel libmad-devel libflac-devel
 
-%description -n        sox-devel 
+%description -n        %{name}-devel 
 This package contains the library needed for compiling applications
 which will use the SoX sound file format converter.
 
 Install sox-devel if you want to develop applications which will use
 SoX.
 
+%package -n    %{libname}
+Summary:       Libraries for SoX
+Group:         System/Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description -n        %{libname}
+Libraries for SoX.
+
+%package -n    %{libname}-devel
+Summary:       Development libraries for libst
+Group:         Development/C
+Provides:      %{libname}-devel
+Requires:      %{name}-devel
+
+%description -n        %{libname}-devel 
+Development libraries for libst.
+
 %prep
 %setup -q
-#%patch0 -p0 -b .alsa-header
-#%patch1 -p0 -b .system_gsm_libs
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS -DHAVE_SYS_SOUNDCARD_H=1 -D_FILE_OFFSET_BITS=64 
-fPIC -DPIC"
-%configure2_5x --with-oss-dsp \
-%if %build_plf
-               --with-lame
-%endif
+export CFLAGS="%{optflags} -DHAVE_SYS_SOUNDCARD_H=1 -D_FILE_OFFSET_BITS=64 
-fPIC -DPIC"
+
+%configure2_5x
 
 %make
 
 %install
-rm -rf $RPM_BUILD_ROOT
+[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
 
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_libdir}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/{man1,man3}
+%makeinstall_std
 
+%multiarch_binaries %{buildroot}%{_bindir}/libst-config
 
-%makeinstall install install-lib install-play
+ln -sf play %{buildroot}%{_bindir}/rec
 
-ln -sf play $RPM_BUILD_ROOT%{_bindir}/rec
-
-cat << EOF > $RPM_BUILD_ROOT%{_bindir}/soxplay
+cat << EOF > %{buildroot}%{_bindir}/soxplay
 #!/bin/sh
 
 %{_bindir}/sox \$1 -t .au - > /dev/audio
 
 EOF
 
-chmod 755 $RPM_BUILD_ROOT%{_bindir}/soxplay
-
 ln -snf play %{buildroot}%{_bindir}/rec
-ln -s play.1.bz2 $RPM_BUILD_ROOT%{_mandir}/man1/rec.1.bz2
+ln -s play.1.bz2 %{buildroot}%{_mandir}/man1/rec.1.bz2
+
+%post   -n %libname -p /sbin/ldconfig
+
+%postun -n %libname -p /sbin/ldconfig
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
 
 %files
-%defattr(-, root, root)
-%doc Changelog README 
-%{_bindir}/play
-%{_bindir}/rec
-%{_bindir}/sox*
+%defattr(644,root,root,755)
+%doc ChangeLog README NEWS AUTHORS
+%attr(755,root,root) %{_bindir}/play
+%attr(755,root,root) %{_bindir}/rec
+%attr(755,root,root) %{_bindir}/sox*
 %{_mandir}/man1/*
 %{_mandir}/man3/*
+%{_mandir}/man7/*
+
+%files -n %{libname}
 
-%files -n sox-devel
-%defattr(-, root, root)
-%doc TODO
-%{_bindir}/libst-config
+%attr(755,root,root) %{_libdir}/libst.so.%{major}*
+
+%files -n %{libname}-devel
+%defattr(644,root,root,755)
+%doc
 %{_libdir}/libst.a
+%{_libdir}/libst.la
+%{_libdir}/libst.so
+
+%files -n %{name}-devel
+%defattr(644,root,root,755)
+%doc COPYING
+%multiarch %attr(755,root,root) %{multiarch_bindir}/libst-config
+%attr(755,root,root) %{_bindir}/libst-config
 %{_includedir}/*.h

Reply via email to