[audacity/f16] update to 2.0.2 final update to manual-2.0.2 adjust manual extract path to suit changes to manual.zi

Mon Aug 27 21:50:38 UTC 2012

commit 1eeb87706c75c884d6a520d6c4542eb7015a8ad7
Author: David Timms <dtimms at iinet.net.au>
Date:   Tue Aug 28 07:48:03 2012 +1000

    update to 2.0.2 final
    update to manual-2.0.2
    adjust manual extract path to suit changes to manual.zip
    rebase libmp3lame-default.patch
    rebase desktop.in.patch

 .gitignore                                         |    4 +-
 audacity-1.3.7-libmp3lame-default.patch            |   12 --------
 audacity-2.0.1-libmp3lame-default.patch            |   12 ++++++++
 ...top.in.patch => audacity-2.0.2-desktop.in.patch |   16 ++++------
 audacity.spec                                      |   30 ++++++++++++++++----
 sources                                            |    4 +-
 6 files changed, 47 insertions(+), 31 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index f88ea81..7ccc96d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/audacity-minsrc-2.0.0.tar.bz2
-/help.zip
+/audacity-minsrc-2.0.2.tar.bz2
+/audacity-manual-2.0.2.zip
diff --git a/audacity-2.0.1-libmp3lame-default.patch b/audacity-2.0.1-libmp3lame-default.patch
new file mode 100644
index 0000000..6d28a12
--- /dev/null
+++ b/audacity-2.0.1-libmp3lame-default.patch
@@ -0,0 +1,12 @@
+diff -Nur audacity-src-2.0.0/src/AudacityApp.cpp audacity-src-2.0.1/src/AudacityApp.cpp
+--- audacity-src-2.0.0/src/AudacityApp.cpp	2012-07-03 20:49:56.494204862 +1000
++++ audacity-src-2.0.1/src/AudacityApp.cpp	2012-07-03 20:46:51.994199900 +1000
+@@ -1172,6 +1172,8 @@
+       return false;
+    }
+ 
++   gPrefs->Write(wxT("/MP3/MP3LibPath"), wxT("__RPM_LIBDIR__/libmp3lame.so.0"));
++
+    // More initialization
+ #ifdef CLEANSPEECH
+    InitCleanSpeech();
diff --git a/audacity-1.3.13-desktop.in.patch b/audacity-2.0.2-desktop.in.patch
similarity index 51%
rename from audacity-1.3.13-desktop.in.patch
rename to audacity-2.0.2-desktop.in.patch
index a8142b0..c302c98 100644
--- a/audacity-1.3.13-desktop.in.patch
+++ b/audacity-2.0.2-desktop.in.patch
@@ -1,6 +1,6 @@
---- src/audacity.desktop.in.orig	2011-04-07 09:35:51.000000000 +1000
-+++ src/audacity.desktop.in	2011-04-24 23:03:04.226793699 +1000
-@@ -5,16 +5,17 @@
+--- src/audacity.desktop.in.orig	2012-08-21 18:48:21.000000000 +1000
++++ src/audacity.desktop.in	2012-08-21 22:34:31.376045927 +1000
+@@ -5,16 +5,16 @@
  GenericName=Sound Editor
  GenericName[de]=Audio-Editor
  GenericName[ru]=Редактор звуковых файлов
@@ -15,10 +15,8 @@
 -Categories=AudioVideo;Audio;AudioVideoEditing;
 +Categories=AudioVideo;Audio;GTK;GNOME;Sequencer;X-Jack;AudioVideoEditing;
  
- Exec=@AUDACITY_NAME@
--StartupNotify=false
-+StartupNotify=true
-+StartupWMClass=Audacity
+ Exec=@AUDACITY_NAME@ %F
+ StartupNotify=false
  Terminal=false
--MimeType=application/ogg;audio/basic;audio/mpeg;audio/x-aiff;audio/x-mp3;audio/x-wav;application/x-audacity-project;
-+MimeType=application/ogg;audio/basic;audio/mpeg;audio/x-aiff;audio/x-aiffc;audio/x-aifc;audio/x-mp3;audio/x-wav;application/x-audacity-project;audio/midi;audio/x-flac;
+-MimeType=application/x-audacity-project;@MIMETYPES@
++MimeType=application/x-audacity-project;@MIMETYPES at audio/x-aifc;audio/x-mp3;audio/midi;
diff --git a/audacity.spec b/audacity.spec
index d4a5759..8192e6f 100644
--- a/audacity.spec
+++ b/audacity.spec
@@ -3,7 +3,7 @@
 
 Name: audacity
 
-Version: 2.0.0
+Version: 2.0.2
 Release: 1%{?dist}
 Summary: Multitrack audio editor
 Group:   Applications/Multimedia
@@ -17,16 +17,15 @@ URL:     http://audacity.sourceforge.net
 Source0: http://audacity.googlecode.com/files/audacity-minsrc-%{version}.tar.bz2
 %define tartopdir audacity-src-%{version}
 
-# The manual is not versioned; it is essentially a work in progress
-Source1: http://manual.audacityteam.org/help.zip
+Source1: http://audacity.googlecode.com/files/audacity-manual-%{version}.zip
 
-Patch1: audacity-1.3.7-libmp3lame-default.patch
+Patch1: audacity-2.0.1-libmp3lame-default.patch
 Patch2: audacity-1.3.9-libdir.patch
 # add audio/x-flac
 # remove audio/mpeg, audio/x-mp3
 # enable startup notification
 # add categories Sequencer X-Jack AudioVideoEditing for F-12 Studio feature
-Patch3: audacity-1.3.13-desktop.in.patch
+Patch3: audacity-2.0.2-desktop.in.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
@@ -135,7 +134,7 @@ desktop-file-install \
 
 
 # audacity manual must be unzipped to correct location
-unzip %{SOURCE1} -d $RPM_BUILD_ROOT%{_datadir}/%{realname}/help
+unzip %{SOURCE1} -d $RPM_BUILD_ROOT%{_datadir}/%{realname}
 
 
 %clean
@@ -174,6 +173,25 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Mon Aug 27 2012 David Timms <iinet.net.au at dtimms> - 2.0.2-1
+- update to 2.0.2 final
+- update to manual-2.0.2
+- adjust manual extract path to suit changes to manual.zip
+
+* Tue Aug 21 2012 David Timms <iinet.net.au at dtimms> - 2.0.2-0.3.rc4
+- update to 2.0.2 release candidate 4
+
+* Mon Aug 13 2012 David Timms <iinet.net.au at dtimms> - 2.0.2-0.1.rc2
+- update to 2.0.2 release candidate 2
+
+* Tue Jul  3 2012 David Timms <iinet.net.au at dtimms> - 2.0.1-1
+- update to 2.0.1 final
+- rebase libmp3lame-default.patch
+- rebase desktop.in.patch
+
+* Wed Jun 26 2012 David Timms <iinet.net.au at dtimms> - 2.0.1-0.1.rc2
+- update to 2.0.1 release candidate 2
+
 * Wed Mar 14 2012 David Timms <iinet.net.au at dtimms> - 2.0.0-1
 - update to 2.0.0 final
 
diff --git a/sources b/sources
index 66a8fff..b79af62 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-094b7001af29818cd84961b83397377f  audacity-minsrc-2.0.0.tar.bz2
-bc918c34b86b3faf2fa3d5f999fed66d  help.zip
+c838bc4485b0af104a7f6d9c6955a284  audacity-minsrc-2.0.2.tar.bz2
+2c80017f602dd6239ec3b6b0c25e68df  audacity-manual-2.0.2.zip
