rpms/audacity/devel .cvsignore, 1.8, 1.8.2.1 audacity.spec, 1.35, 1.35.2.1 sources, 1.10, 1.10.2.1 audacity-1.3.2-fr.patch, 1.1, NONE

[Michael Schwendt (mschwendt)]

Author: mschwendt

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

Modified Files:
      Tag: audacity-1_3_3-test
	.cvsignore audacity.spec sources 
Removed Files:
      Tag: audacity-1_3_3-test
	audacity-1.3.2-fr.patch 
Log Message:
* Mon May 21 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.3.3-0.1.beta
- update to 1.3.3 beta
- now build with wxGTK2 2.8.x
- BR soundtouch-devel  and  --with-soundtouch=system
- disable some patches temporarily



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- .cvsignore	23 Feb 2007 22:01:51 -0000	1.8
+++ .cvsignore	27 May 2007 08:07:10 -0000	1.8.2.1
@@ -1 +1 @@
-audacity-src-1.3.2.tar.gz
+audacity-src-1.3.3.tar.gz


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.35
retrieving revision 1.35.2.1
diff -u -r1.35 -r1.35.2.1
--- audacity.spec	5 Mar 2007 19:12:42 -0000	1.35
+++ audacity.spec	27 May 2007 08:07:10 -0000	1.35.2.1
@@ -1,6 +1,6 @@
 Name:           audacity
-Version:        1.3.2
-Release:        14%{?dist}
+Version:        1.3.3
+Release:        0.1.beta%{?dist}
 Summary:        A multitrack audio editor
 
 Group:          Applications/Multimedia
@@ -10,12 +10,13 @@
 Source1:        audacity.png
 # iconv on src/Languages.cpp (ISO Latin-1 to UTF-8)
 Patch1:         audacity-1.3.2-languages.patch
-# iconv on locale/fr.po (MAC to ISO Latin-1)
-Patch2:         audacity-1.3.2-fr.patch
-Patch3:         audacity-1.3.2-exportmp3.patch
+# TODO: rewrite/rediff for major upstream changes
+#Patch3:         audacity-1.3.2-exportmp3.patch
 Patch4:         audacity-1.3.2-destdir.patch
-Patch5:         audacity-1.3.2-resample.patch
-Patch6:         audacity-1.3.2-FLAC.patch
+# TODO: verify 1st half, 2nd part merged upstream
+#Patch5:         audacity-1.3.2-resample.patch
+# TODO: rewrite/rediff
+#Patch6:         audacity-1.3.2-FLAC.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  alsa-lib-devel
 BuildRequires:  desktop-file-utils
@@ -29,7 +30,8 @@
 BuildRequires:  libsamplerate-devel
 BuildRequires:  libsndfile-devel
 BuildRequires:  libvorbis-devel
-BuildRequires:  compat-wxGTK26-devel
+BuildRequires:  wxGTK2-devel
+#BuildRequires:  compat-wxGTK26-devel
 BuildRequires:  zip
 BuildRequires:  zlib-devel
 %{?_with_mp3:BuildRequires: libmad-devel}
@@ -52,14 +54,13 @@
 %prep
 %setup -q -n %{name}-src-%{version}-beta
 %patch1 -p1 -b .languages
-%patch2 -p1 -b .fr
-%patch3 -p1 -b .exportmp3
+#%patch3 -p1 -b .exportmp3
 %patch4 -p1 -b .destdir
-%patch5 -p1 -b .resample
-%patch6 -p1 -b .FLAC
+#%patch5 -p1 -b .resample
+#%patch6 -p1 -b .FLAC
 
 # 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
+for i in locale/*.po src/export/ExportMP3.cpp
 do
     sed -i -e 's!libmp3lame.so\([^.]\)!libmp3lame.so.0\1!g' $i
 done
@@ -75,11 +76,11 @@
 %endif
 
 # for wxGTK26-compat
-sed -i -e 's!wx-config!wx-2.6-config!g' configure
+#sed -i -e 's!wx-config!wx-2.6-config!g' configure
 
 
 %build
-%configure --with-help --with-libsndfile=system --without-libresample --with-libsamplerate=system --with-libflac=system --with-ladspa --with-vorbis=system --with-id3tag=system --with-expat=system %{?_with_mp3:--with-libmad=system} 
+%configure --with-help --with-libsndfile=system --without-libresample --with-libsamplerate=system --with-libflac=system --with-ladspa --with-vorbis=system --with-id3tag=system --with-expat=system %{?_with_mp3:--with-libmad=system} --with-soundtouch=system
 make
 
 
@@ -141,6 +142,12 @@
 
 
 %changelog
+* Mon May 21 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.3.3-0.1.beta
+- update to 1.3.3 beta
+- now build with wxGTK2 2.8.x
+- BR soundtouch-devel  and  --with-soundtouch=system
+- disable some patches temporarily
+
 * Mon Mar  5 2007 Michael Schwendt <mschwendt[AT]users.sf.net>
 - add umask 022 to scriptlets
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/sources,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -r1.10 -r1.10.2.1
--- sources	23 Feb 2007 22:01:51 -0000	1.10
+++ sources	27 May 2007 08:07:10 -0000	1.10.2.1
@@ -1 +1 @@
-bf63673140254f1283dfd55b61ff2422  audacity-src-1.3.2.tar.gz
+72a9e3239f3b5af63030a1e1b07e40e7  audacity-src-1.3.3.tar.gz


--- audacity-1.3.2-fr.patch DELETED ---