rpms/audacity/devel audacity-1.3.2-allegro-cflags.patch, 1.1, 1.2 audacity-1.3.2-soundtouch-cxxflags.patch, 1.1, 1.2 audacity.spec, 1.46, 1.47

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31290

Modified Files:
	audacity.spec 
Added Files:
	audacity-1.3.2-allegro-cflags.patch 
	audacity-1.3.2-soundtouch-cxxflags.patch 
Log Message:
* Fri Mar 21 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.2-20
- make soundtouch and allegro build with RPM optflags


audacity-1.3.2-allegro-cflags.patch:

Index: audacity-1.3.2-allegro-cflags.patch
===================================================================
RCS file: audacity-1.3.2-allegro-cflags.patch
diff -N audacity-1.3.2-allegro-cflags.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ audacity-1.3.2-allegro-cflags.patch	22 Mar 2008 09:41:36 -0000	1.2
@@ -0,0 +1,12 @@
+diff -Nur audacity-src-1.3.2-beta-orig/lib-src/allegro/Makefile.in audacity-src-1.3.2-beta/lib-src/allegro/Makefile.in
+--- audacity-src-1.3.2-beta-orig/lib-src/allegro/Makefile.in	2006-10-29 01:05:59.000000000 +0200
++++ audacity-src-1.3.2-beta/lib-src/allegro/Makefile.in	2008-03-22 10:26:33.000000000 +0100
+@@ -4,7 +4,7 @@
+ CCC = @CXX@
+ srcdir=@srcdir@
+ 
+-CFLAGS = -g -O
++CFLAGS = @CFLAGS@
+ CPPOBJ = \
+ 	allegro.cpp.o \
+ 	allegrord.cpp.o \

audacity-1.3.2-soundtouch-cxxflags.patch:

Index: audacity-1.3.2-soundtouch-cxxflags.patch
===================================================================
RCS file: audacity-1.3.2-soundtouch-cxxflags.patch
diff -N audacity-1.3.2-soundtouch-cxxflags.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ audacity-1.3.2-soundtouch-cxxflags.patch	22 Mar 2008 09:41:36 -0000	1.2
@@ -0,0 +1,13 @@
+diff -Nur audacity-src-1.3.2-beta-orig/lib-src/soundtouch/configure audacity-src-1.3.2-beta/lib-src/soundtouch/configure
+--- audacity-src-1.3.2-beta-orig/lib-src/soundtouch/configure	2006-10-29 01:06:00.000000000 +0200
++++ audacity-src-1.3.2-beta/lib-src/soundtouch/configure	2008-03-22 10:15:28.000000000 +0100
+@@ -2443,7 +2443,8 @@
+ 
+ #AC_MAINTAINER_MODE
+ 
+-CXXFLAGS= ac_ext=cpp
++#CXXFLAGS= 
++ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- audacity.spec	11 Feb 2008 00:12:28 -0000	1.46
+++ audacity.spec	22 Mar 2008 09:41:36 -0000	1.47
@@ -1,6 +1,6 @@
 Name:           audacity
 Version:        1.3.2
-Release:        19%{?dist}
+Release:        20%{?dist}
 Summary:        A multitrack audio editor
 
 Group:          Applications/Multimedia
@@ -20,6 +20,8 @@
 Patch8:         audacity-1.3.2-gcc43.patch
 Patch9:         audacity-1.3.2-libdir.patch
 Patch10:        audacity-1.3.2-jack-api-109.patch
+Patch11:        audacity-1.3.2-soundtouch-cxxflags.patch
+Patch12:        audacity-1.3.2-allegro-cflags.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  alsa-lib-devel
 BuildRequires:  desktop-file-utils
@@ -74,6 +76,8 @@
 grep -q -s __RPM_LIB * -R && exit 1
 
 %patch10 -p1 -b .jack-api
+%patch11 -p1 -b .soundtouch-cxxflags
+%patch12 -p1 -b .allegro-cflags
 
 # Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
 for i in help/wxhelp/audacity.hhk help/wxhelp/exportmp3.htm locale/*.po src/export/ExportMP3.cpp
@@ -152,6 +156,9 @@
 
 
 %changelog
+* Fri Mar 21 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.2-20
+- make soundtouch and allegro build with RPM optflags
+
 * Sun Feb 10 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.2-19
 - patch for JACK 0.109.0 API changes (jack_port_lock/unlock removal).
 - rebuilt for GCC 4.3 as requested by Fedora Release Engineering