- up to 1.3.6

Changed files:
    audacity-not_require_lame-libs-devel.patch -> 1.14
    audacity-opt.patch -> 1.8
    audacity-system-libs.patch -> 1.4
    audacity.spec -> 1.80

diff --git a/audacity-not_require_lame-libs-devel.patch b/audacity-not_require_lame-libs-devel.patch
deleted file mode 100644 (file)
index 0c29708..0000000
--- a/audacity-not_require_lame-libs-devel.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- audacity-src-1.3.3-beta/src/export/ExportMP3.cpp.orig      2007-06-16 12:49:14.000000000 +0000
-+++ audacity-src-1.3.3-beta/src/export/ExportMP3.cpp   2007-06-16 12:50:34.000000000 +0000
-@@ -1493,12 +1493,12 @@
- 
-    wxString GetLibraryName()
-    {
--      return wxT("libmp3lame.so");
-+      return wxT("libmp3lame.so.0");
-    }
- 
-    wxString GetLibraryTypeString()
-    {
--      return wxString(_("Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"));
-+      return wxString(_("Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"));
-    }
- 
- #endif

diff --git a/audacity-opt.patch b/audacity-opt.patch
index abfdc1923b7db855ef3b0d9385d08a90b281b915..3984a818a73745c9f099151391752bb2dc3ebb00 100644 (file)
--- a/audacity-opt.patch
+++ b/audacity-opt.patch
@@ -4,10 +4,10 @@
  INCL = -Inyqsrc -Itran -Ixlisp -Icmt -Isys -Isnd -Ifft
  
  CC = @CC@
--override CFLAGS += -g -DCMTSTUFF -O2 -DEXT $(INCL)
-+override CFLAGS = @CFLAGS@ -DCMTSTUFF -DEXT $(INCL)
- LN = $(CC)
- LFLAGS = -lm
+-CFLAGS += -DCMTSTUFF -DEXT @CFLAGS@ $(INCL)
++CFLAGS = @CFLAGS@ -DCMTSTUFF -DEXT @CFLAGS@ $(INCL)
+ 
+ INTGEN = misc/intgen
  
 --- audacity-src-1.3.2-beta/lib-src/portmixer/configure.ac.orig        2006-10-29 01:05:51.000000000 +0200
 +++ audacity-src-1.3.2-beta/lib-src/portmixer/configure.ac     2006-12-29 20:12:30.975109012 +0100
@@ -22,3 +22,15 @@
  #
  # Check for portaudio path
  #
+
+--- a/lib-src/portsmf/configure.ac~    2008-10-25 14:14:23.000000000 +0200
++++ a/lib-src/portsmf/configure.ac     2009-05-26 14:57:39.406323603 +0200
+@@ -24,7 +24,7 @@
+ AC_CONFIG_AUX_DIR(autotools)
+ # which also contains a subdir containing macros
+ AC_CONFIG_MACRO_DIR([autotools/m4])
+-AM_INIT_AUTOMAKE([-Wall foreign])
++AM_INIT_AUTOMAKE
+ 
+ dnl -------------------------------------------------------
+ dnl Checks for programs.

diff --git a/audacity-system-libs.patch b/audacity-system-libs.patch
index 80fa273e100ec019d03d7c3d2773d3835f4fec33..a2969fa317d0467b76b8dda3894623fa4d0ad954 100644 (file)
--- a/audacity-system-libs.patch
+++ b/audacity-system-libs.patch
@@ -1,5 +1,5 @@
---- audacity-src-1.3.2-beta/acinclude.m4.orig  2006-12-29 17:01:36.794372000 +0100
-+++ audacity-src-1.3.2-beta/acinclude.m4       2006-12-29 17:23:30.465234287 +0100
+--- audacity-src-1.3.2-beta/m4/audacity_checklib_libresample.m4.orig   2006-12-29 17:01:36.794372000 +0100
++++ audacity-src-1.3.2-beta/m4/audacity_checklib_libresample.m4        2006-12-29 17:23:30.465234287 +0100
 @@ -133,7 +151,22 @@
  
     dnl ... but libresample isn't generally installed as a system library...

diff --git a/audacity.spec b/audacity.spec
index 6f63e08108fe6a765914e2d5b0bcce0a95f88f4c..0d60cdd1a3889574337cf960ce741afb899813f5 100644 (file)
--- a/audacity.spec
+++ b/audacity.spec
@@ -9,18 +9,17 @@ Summary:      Audacity - manipulate digital audio waveforms
 Summary(pl.UTF-8):     Audacity - narzędzie do obróbki plików dźwiękowych
 Summary(ru.UTF-8):     Кроссплатформенный звуковой редактор
 Name:          audacity
-Version:       1.3.4
-Release:       2
+Version:       1.3.6
+Release:       1
 License:       GPL
 Vendor:                Dominic Mazzoni <dominic@minorninth.com>
 Group:         X11/Applications/Sound
 Source0:       http://dl.sourceforge.net/audacity/%{name}-src-%{version}.tar.bz2
-# Source0-md5: 6c4ada9085f916b5ae1675eaa4754442
+# Source0-md5: a59d30bcedd017c5b3ac7bcecf7a1628
 Source1:       %{name}.desktop
 Source2:       %{name}-icon.png
-Patch0:                %{name}-not_require_lame-libs-devel.patch
-Patch1:                %{name}-system-libs.patch
-Patch2:                %{name}-opt.patch
+Patch0:                %{name}-system-libs.patch
+Patch1:                %{name}-opt.patch
 URL:           http://audacity.sourceforge.net/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -70,18 +69,20 @@ Audacity - это звуковой редактор, позволяющий ра
 плагинов, к любой части звукового файла.
 
 %prep
-%setup -q -n %{name}-src-%{version}-beta
+%setup -q -n %{name}-src-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 sed -i 's/libmp3lame.so/libmp3lame.so.0/g' locale/*.po
 
 %build
 cd lib-src/portmixer
 %{__autoconf}
+cd ../portsmf
+%{__aclocal} -I autotools/m4
+%{__autoconf}
 cd ../..
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 
 export WX_CONFIG="`which wx-gtk2-unicode-config`"