packages: audacity/audacity-opt.patch, audacity/audacity-system-libs.patch, ...

[arekm]

Author: arekm                        Date: Tue May 26 13:05:34 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.3.6

---- Files affected:
packages/audacity:
   audacity-opt.patch (1.7 -> 1.8) , audacity-system-libs.patch (1.3 -> 1.4) , audacity.spec (1.79 -> 1.80) , audacity-not_require_lame-libs-devel.patch (1.13 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/audacity/audacity-opt.patch
diff -u packages/audacity/audacity-opt.patch:1.7 packages/audacity/audacity-opt.patch:1.8
--- packages/audacity/audacity-opt.patch:1.7	Fri Dec 29 21:45:15 2006
+++ packages/audacity/audacity-opt.patch	Tue May 26 15:05:28 2009
@@ -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.

================================================================
Index: packages/audacity/audacity-system-libs.patch
diff -u packages/audacity/audacity-system-libs.patch:1.3 packages/audacity/audacity-system-libs.patch:1.4
--- packages/audacity/audacity-system-libs.patch:1.3	Sun Nov 25 05:09:07 2007
+++ packages/audacity/audacity-system-libs.patch	Tue May 26 15:05:28 2009
@@ -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...

================================================================
Index: packages/audacity/audacity.spec
diff -u packages/audacity/audacity.spec:1.79 packages/audacity/audacity.spec:1.80
--- packages/audacity/audacity.spec:1.79	Tue May 26 14:36:40 2009
+++ packages/audacity/audacity.spec	Tue May 26 15:05:28 2009
@@ -10,18 +10,17 @@
 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 at 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
@@ -71,18 +70,20 @@
 плагинов, к любой части звукового файла.
 
 %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`"
@@ -143,6 +144,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.80  2009/05/26 13:05:28  arekm
+- up to 1.3.6
+
 Revision 1.79  2009/05/26 12:36:40  arekm
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/audacity/audacity-opt.patch?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/audacity/audacity-system-libs.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/audacity/audacity.spec?r1=1.79&r2=1.80&f=u