diff --git a/.cvsignore b/.cvsignore index e709d03..d1ad8c4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -audacity-src-1.2.5.tar.gz +audacity-src-1.2.6.tar.gz diff --git a/audacity-1.2.3-gcc41.patch b/audacity-1.2.3-gcc41.patch deleted file mode 100644 index 6c881ee..0000000 --- a/audacity-1.2.3-gcc41.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur audacity-src-1.2.3-orig/lib-src/soundtouch/include/SoundTouch.h audacity-src-1.2.3/lib-src/soundtouch/include/SoundTouch.h ---- audacity-src-1.2.3-orig/lib-src/soundtouch/include/SoundTouch.h 2004-11-18 07:17:35.000000000 +0100 -+++ audacity-src-1.2.3/lib-src/soundtouch/include/SoundTouch.h 2006-03-17 21:26:04.000000000 +0100 -@@ -146,7 +146,7 @@ - static const char *getVersionString(); - - /// Get SoundTouch library version Id -- static uint SoundTouch::getVersionId(); -+ static uint getVersionId(); - - /// Sets new rate control value. Normal rate = 1.0, smaller values - /// represent slower rate, larger faster rates. diff --git a/audacity.spec b/audacity.spec index 6f1d6e7..14378a0 100644 --- a/audacity.spec +++ b/audacity.spec @@ -1,15 +1,14 @@ Name: audacity -Version: 1.2.5 -Release: 3%{?dist} +Version: 1.2.6 +Release: 1%{?dist} Summary: A multitrack audio editor Group: Applications/Multimedia License: GPL URL: http://audacity.sourceforge.net -Source: http://dl.sf.net/sourceforge/audacity/audacity-src-1.2.5.tar.gz +Source: http://dl.sf.net/sourceforge/audacity/audacity-src-1.2.6.tar.gz Source1: audacity.png Patch1: audacity-1.2.2-aboutdialog.patch -Patch2: audacity-1.2.3-gcc41.patch Patch3: audacity-1.2.4b-missing-pango.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libogg-devel @@ -49,7 +48,6 @@ Linux/*BSD, MacOS, and Windows. %prep %setup -q -n %{name}-src-%{version} %patch1 -p1 -b .aboutdialog -#%patch2 -p1 -b .gcc4 %{?_with_gtk2: %patch3 -p1 -b .missing-pango } cp -a src/Languages.cpp src/Languages.cpp.orig iconv -f ISO_8859-1 -t UTF-8 src/Languages.cpp.orig > src/Languages.cpp @@ -57,9 +55,10 @@ for i in help/wxhelp/audacity.hhk help/wxhelp/exportmp3.htm locale/*.po src/expo do perl -pi -e 's!libmp3lame.so([^.0-9]+)!libmp3lame.so.0$1!g' $i done -%ifnarch %{ix86} x86_64 -# this flag is not available on ppc -perl -pi -e 's|-msse||' lib-src/soundtouch/source/SoundTouch/Makefile.* +%ifarch %{ix86} x86_64 +perl -pi -e 's|^CXXFLAGS =|CXXFLAGS = -msse |' lib-src/soundtouch/source/SoundTouch/Makefile.in +%else +perl -pi -e 's|.define ALLOW_SSE.*||' lib-src/soundtouch/include/*.h %endif %build @@ -123,6 +122,9 @@ rm -rf ${RPM_BUILD_ROOT} %doc %{_datadir}/doc/* %changelog +* Tue Jan 2 2007 Gerard Milmeister - 1.2.6-1 +- new version 1.2.6 + * Sat Nov 11 2006 Gerard Milmeister - 1.2.5-3 - correct mime types in .desktop file - msse flag only on intel diff --git a/sources b/sources index f1a6690..66d27b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7558373bee9fd4e7195901b9c0a747f1 audacity-src-1.2.5.tar.gz +5477ddca23592ae06cc3295f91961ec0 audacity-src-1.2.6.tar.gz