[audacity] add audacity manual help file Source and subpackage upgrade to 1.3.13-beta drop patches included in

Wed Apr 27 14:18:58 UTC 2011

commit 7dc44064a32a8e4fa48b0da80b3e2b6a799cedee
Author: DT <davidt at davidtdesktop.(none)>
Date:   Thu Apr 28 00:17:59 2011 +1000

    add audacity manual help file Source and subpackage
    upgrade to 1.3.13-beta
    drop patches included in upstream release
    convert desktop file to a patch against new upstream .desktop file.

 .gitignore                       |    2 +
 README                           |    4 ++
 audacity-1.3.10-desktop.patch    |   17 -------
 audacity-1.3.12-gcc45.patch      |   92 ------------------------------------
 audacity-1.3.13-desktop.in.patch |   24 +++++++++
 audacity-1.3.7-vamp-1.3.patch    |   97 --------------------------------------
 audacity.png                     |  Bin 4291 -> 0 bytes
 audacity.spec                    |   57 ++++++++++++++--------
 sources                          |    3 +-
 9 files changed, 68 insertions(+), 228 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index cf7eec9..b6994aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 audacity-minsrc-1.3.12-beta.tar.bz2
+/audacity-minsrc-1.3.13-beta.tar.bz2
+/help.zip
diff --git a/README b/README
index d949192..e0c9bb3 100644
--- a/README
+++ b/README
@@ -1,3 +1,7 @@
+audacity 1.3.13 beta release 2011-04
+updating rawhide to this, hopefully to be able to back port to f15, f14 and drop all post 1.3.12 beta patches.
+
+-----
 $ md5sum audacity-minsrc-1.3.9.tar.bz2 
 0f2bc8971c6e2c4d39457c28aea16b5c  audacity-minsrc-1.3.9.tar.bz2
 
diff --git a/audacity-1.3.13-desktop.in.patch b/audacity-1.3.13-desktop.in.patch
new file mode 100644
index 0000000..a8142b0
--- /dev/null
+++ b/audacity-1.3.13-desktop.in.patch
@@ -0,0 +1,24 @@
+--- 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 @@
+ GenericName=Sound Editor
+ GenericName[de]=Audio-Editor
+ GenericName[ru]=Редактор звуковых файлов
+-Comment=Record and edit audio files
++Comment=Record and edit audio files with multitrack capability
+ Comment[de]=Audio-Dateien aufnehmen und bearbeiten
+ Comment[ru]=Запись и редактирование звуковых файлов
+ 
+ Icon=@AUDACITY_NAME@
+ 
+ Type=Application
+-Categories=AudioVideo;Audio;AudioVideoEditing;
++Categories=AudioVideo;Audio;GTK;GNOME;Sequencer;X-Jack;AudioVideoEditing;
+ 
+ Exec=@AUDACITY_NAME@
+-StartupNotify=false
++StartupNotify=true
++StartupWMClass=Audacity
+ 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;
diff --git a/audacity.spec b/audacity.spec
index 9e19164..a8cebb0 100644
--- a/audacity.spec
+++ b/audacity.spec
@@ -3,18 +3,18 @@
 
 Name: audacity
 
-Version: 1.3.12
-Release: 0.7.beta%{?dist}
+Version: 1.3.13
+Release: 0.3.beta%{?dist}
 Summary: Multitrack audio editor
-Group: Applications/Multimedia
+Group:   Applications/Multimedia
 License: GPLv2
-URL: http://audacity.sourceforge.net
+URL:     http://audacity.sourceforge.net
 
 %define tartopdir audacity-src-%{version}-beta
 %define realname audacity
 
 Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%{version}-beta.tar.bz2
-Source1: audacity.png
+Source1: http://manual.audacityteam.org/help.zip
 
 Patch1: audacity-1.3.7-libmp3lame-default.patch
 Patch2: audacity-1.3.9-libdir.patch
@@ -22,9 +22,7 @@ Patch2: audacity-1.3.9-libdir.patch
 # remove audio/mpeg, audio/x-mp3
 # enable startup notification
 # add categories Sequencer X-Jack AudioVideoEditing for F-12 Studio feature
-Patch3: audacity-1.3.10-desktop.patch
-Patch6: audacity-1.3.7-vamp-1.3.patch
-Patch7: audacity-1.3.12-gcc45.patch
+Patch3: audacity-1.3.13-desktop.in.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
@@ -60,12 +58,21 @@ unlimited undo. The GUI was built with wxWidgets and the audio I/O
 supports OSS and ALSA under Linux.
 
 
+%package manual
+Summary: manual for Audacity - offline install
+
+%description manual
+Audacity Manual can be installed locally if preferred, or accessed on-line
+if internet connection is available.
+For the most up to date manual content, use the on-line manual.
+
+
 %prep
 %setup -q -n %{tartopdir}
 
 # Substitute hardcoded library paths.
-%patch1 -p1
-%patch2 -p1
+%patch1 -p1 -b .libmp3lame-default
+%patch2 -p1 -b .libdir
 for i in src/effects/ladspa/LoadLadspa.cpp src/AudacityApp.cpp src/export/ExportMP3.cpp
 do
     sed -i -e 's!__RPM_LIBDIR__!%{_libdir}!g' $i
@@ -73,19 +80,14 @@ do
 done
 grep -q -s __RPM_LIB * -R && exit 1
 
-%patch3 -p1 -b .old-desktop-file
-%if 0%{?fedora} < 11
-%patch6 -p1 -b .vamp-1.3
-%endif
-%patch7 -p1 -b .gcc45
-autoreconf -i lib-src/portmixer/
-
 # Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
 for i in locale/*.po src/export/ExportMP3.cpp
 do
     sed -i -e 's!libmp3lame.so\([^.]\)!libmp3lame.so.0\1!g' $i
 done
 
+%patch3 -b .desktop.old
+
 
 %build
 %configure \
@@ -108,9 +110,6 @@ make
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps
-
 make DESTDIR=${RPM_BUILD_ROOT} install
 
 # Audacity 1.3.8-beta complains if the help/manual directories
@@ -121,11 +120,15 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/help/manual
 
 desktop-file-install \
     --vendor fedora \
-    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     --delete-original \
+    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     $RPM_BUILD_ROOT%{_datadir}/applications/audacity.desktop
 
 
+# audacity manual must be unzipped to correct location
+unzip %{SOURCE1} -d $RPM_BUILD_ROOT%{_datadir}/%{realname}/help
+
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -154,7 +157,19 @@ update-desktop-database &> /dev/null || :
 %doc %{_datadir}/doc/*
 
 
+%files manual
+%{_datadir}/%{realname}/help/manual/
+
+
 %changelog
+* Tue Apr 26 2011 David Timms <iinet.net.au at dtimms> - 1.3.13-0.3.beta
+- add audacity manual help file Source and subpackage
+
+* Sun Apr 24 2011 David Timms <iinet.net.au at dtimms> - 1.3.13-0.2.beta
+- upgrade to 1.3.13-beta
+- drop patches included in upstream release
+- convert desktop file to a patch against new upstream .desktop file.
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.12-0.7.beta
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index b3af38e..ab42e2b 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-76996fec67181ca82ba191e012518b57  audacity-minsrc-1.3.12-beta.tar.bz2
+57be7fadb8c8dd17b8462c7ac1561d03  audacity-minsrc-1.3.13-beta.tar.bz2
+7c0a8fd66409e431a1454cae2d1125b7  help.zip
