- updated to 1.0.6 (new Add Silence fuction, updates for new sox)

- updated patch, new %%doc, use proper CC

Changed files:
    SoundStudio.patch -> 1.3
    SoundStudio.spec -> 1.12

diff --git a/SoundStudio.patch b/SoundStudio.patch
index e5536d5623076ae422af09230c48de67c832d3ae..353b5627e98934e58a4865cf1a32083ed9838344 100644 (file)
--- a/SoundStudio.patch
+++ b/SoundStudio.patch
@@ -5,7 +5,7 @@
  
  # Which compiler would you like to invoke?
 -CC="gcc -O2"
-+CC="gcc ${OPT}"
++if [ -z "${CC}" ]; then CC="gcc -O2" ; fi
  
  if [ $# = 0 -o $# -gt 1 ] ; then
      printf "%s\n" "Usage: build (config|default|install|dfltinst|backup)"
@@ -13,7 +13,7 @@
             fi
             sedCmd2="s:@TEMP_DIR@:$TEMP_DIR:"
  
-+           if [ -z "$SOX_DIR" ]; then
++           if [ -z "$SOX_CMD" ]; then
             if SOX="`which sox`" ; then
                 SOX_DIR=`dirname $SOX`
                 if [ "$Ask" != "Don't" ] ; then
@@ -22,6 +22,6 @@
                 fi
             fi
 +           fi
-            sedCmd3="s:@SOX_DIR@:$SOX_DIR:"
+            sedCmd3="s=@SOX_DIR_CMD@=$SOX_CMD="
  
             printf "%s\n" "*** Building script \"studio\""

diff --git a/SoundStudio.spec b/SoundStudio.spec
index 137b870261b40db29f7c7d96c505eec1ce5da1e9..6afbd97db8ab5f1576c9db14560a32e238abbca4 100644 (file)
--- a/SoundStudio.spec
+++ b/SoundStudio.spec
@@ -1,17 +1,20 @@
 Summary:       tk sound editor, with record, playback, and mixer facilities 
 Summary(pl):   Edytor d¼wiêku z mo¿liwo¶ci± nagrywania, odtwarzania i miksowania
 Name:          SoundStudio
-Version:       1.0.5
+Version:       1.0.6
 Release:       1
 License:       GPL
 Group:         Applications/Sound
-Source0:       http://prdownloads.sourceforge.net/studio/%{name}-%{version}.tar.gz
+Source0:       ftp://ftp.sourceforge.net/pub/sourceforge/studio/%{name}-%{version}.tar.gz
 Source1:       %{name}.desktop
 Source2:       studio.xpm
 Patch0:                %{name}.patch
 URL:           http://studio.sourceforge.net/
+Requires:      tcl >= 7.4
+Requires:      tk >= 4.0
+Requires:      sox >= 11
+Requires:      /bin/more
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Requires:      tcl >= 7.4, tk >= 4.0, sox >= 11, /bin/more
 
 %description
 Sound Studio provides a graphical user interface for manipulating
@@ -34,7 +37,10 @@ innych format
 %patch0 -p1
 
 %build
-MYFILES=%{_libdir}/%{name} SOX_DIR=/usr/bin OPT="%{rpmcflags}" ./build default
+MYFILES=%{_libdir}/%{name} \
+SOX_CMD="set SOX_CMD [exec which sox]" \
+CC="%{__cc} %{rpmcflags}" \
+./build default
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -49,14 +55,12 @@ install help1.hlp v12.au StudioHelp $RPM_BUILD_ROOT%{_libdir}/%{name}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}/mini/studio.xpm
 install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Multimedia
 
-gzip -9nf README
-
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 %files
 %defattr(644,root,root,755)
-%doc README.gz
+%doc README
 %attr(755,root,root) %{_bindir}/studio
 %attr(755,root,root) %{_bindir}/reset_dsp
 %dir %{_libdir}/%{name}