Author: peroyvind
Date: Fri Feb 16 01:55:54 2007
New Revision: 121583

Modified:
   packages/cooker/sox/current/SPECS/sox.spec

Log:
drop useless dependencies
- fix libification
- revert some changes

Modified: packages/cooker/sox/current/SPECS/sox.spec
==============================================================================
--- packages/cooker/sox/current/SPECS/sox.spec  (original)
+++ packages/cooker/sox/current/SPECS/sox.spec  Fri Feb 16 01:55:54 2007
@@ -4,27 +4,22 @@
 %define distsuffix plf
 %endif
 
-%define soxlib st
-%define major 0
-%define libname %mklibname %{soxlib} %{major}
+%define        soxlib  st
+%define        major   0
+%define        libname %mklibname %{soxlib} %{major}
 
 Summary:       A general purpose sound file conversion tool
 Name:          sox
 Version:       13.0.0
-Release:       %mkrel 2
+Release:       %mkrel 3
 License:       LGPL
 Group:         Sound
 Url:           http://sox.sourceforge.net/
 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
+BuildRequires: oggvorbis-devel mad-devel gsm-devel libflac-devel 
libsndfile-devel
 %if %build_plf
 BuildRequires: lame-devel
 %endif
-Requires:      %{libname} = %{version}-%{release}
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 %description
@@ -41,39 +36,23 @@
 This package is in PLF as it was build with lame encoder support, which is in 
PLF.
 %endif
 
-%package -n    %{name}-devel
-Summary:       The SoX sound file format converter libraries
-Group:         Development/C
-Requires:      oggvorbis-devel
-Requires:      libgsm-devel
-Requires:      libmad-devel
-Requires:      libflac-devel
-Requires:      libsndfile-devel
-Requires:      %{libname}-devel = %{version}-%{release}
-
-%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
+Summary:       Development headers and libraries for libst
 Group:         Development/C
-Provides:      lib%{soxlib}-devel
-Requires:      %{name}-devel
+Provides:      lib%{soxlib}-devel = %{version}-%{release}
+Provides:      %{soxlib}-devel = %{version}-%{release}
+Provides:      %{name}-devel = %{version}-%{release}
+Requires:      %{libname} = %{version}
 
-%description -n        %{libname}-devel 
-Development libraries for libst.
+%description -n        %{libname}-devel
+Development headers and libraries for libst.
 
 %prep
 %setup -q
@@ -81,17 +60,18 @@
 %build
 export CFLAGS="%{optflags} -DHAVE_SYS_SOUNDCARD_H=1 -D_FILE_OFFSET_BITS=64 
-fPIC -DPIC"
 
-%configure2_5x
+%configure2_5x --with-sndfile \
+               --with-flac \
+               --with-mad \
+               --with-lame
 
 %make
 
 %install
-[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+rm -rf %{buildroot}
 
 %makeinstall_std
 
-%multiarch_binaries %{buildroot}%{_bindir}/libst-config
-
 ln -sf play %{buildroot}%{_bindir}/rec
 
 cat << EOF > %{buildroot}%{_bindir}/soxplay
@@ -100,40 +80,37 @@
 %{_bindir}/sox \$1 -t .au - > /dev/audio
 
 EOF
+chmod 755 %{buildroot}%{_bindir}/soxplay
 
 ln -snf play %{buildroot}%{_bindir}/rec
-ln -s play.1.bz2 %{buildroot}%{_mandir}/man1/rec.1.bz2
+ln -s play.1%{_extension} %{buildroot}%{_mandir}/man1/rec.1%{_extension}
+
+rm -rf %{buildroot}%{_libdir}/*.la
 
-%post   -n %libname -p /sbin/ldconfig
+%post   -n %{libname} -p /sbin/ldconfig
 
-%postun -n %libname -p /sbin/ldconfig
+%postun -n %{libname} -p /sbin/ldconfig
 
 %clean
-[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+rm -rf %{buildroot}
 
 %files
-%defattr(644,root,root,755)
+%defattr(-,root,root)
 %doc ChangeLog README NEWS AUTHORS
-%attr(755,root,root) %{_bindir}/play
-%attr(755,root,root) %{_bindir}/rec
-%attr(755,root,root) %{_bindir}/sox*
+%{_bindir}/play
+%{_bindir}/rec
+%{_bindir}/sox*
 %{_mandir}/man1/*
 %{_mandir}/man3/*
 %{_mandir}/man7/*
 
 %files -n %{libname}
-%attr(755,root,root) %{_libdir}/libst.so.%{major}*
+%defattr(-,root,root)
+%{_libdir}/libst.so.%{major}*
 
 %files -n %{libname}-devel
-%defattr(644,root,root,755)
-%doc
-%multiarch %attr(755,root,root) %{multiarch_bindir}/libst-config
-%attr(755,root,root) %{_bindir}/libst-config
+%defattr(-,root,root)
+%{_bindir}/libst-config
 %{_libdir}/libst.a
-%{_libdir}/libst.la
 %{_libdir}/libst.so
-
-%files -n %{name}-devel
-%defattr(644,root,root,755)
-%doc COPYING
 %{_includedir}/*.h

Reply via email to