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.10-desktop.patch b/audacity-1.3.10-desktop.patch deleted file mode 100644 index 30a3cec..0000000 --- a/audacity-1.3.10-desktop.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Nur audacity-src-1.3.10-orig/src/audacity.desktop audacity-src-1.3.10/src/audacity.desktop ---- audacity-src-1.3.10-orig/src/audacity.desktop 2009-12-01 20:32:08.000000000 +0100 -+++ audacity-src-1.3.10/src/audacity.desktop 2010-01-21 10:29:58.667825990 +0100 -@@ -12,9 +12,10 @@ - Icon=audacity - - Type=Application --Categories=AudioVideo;Audio;AudioVideoEditing; -+Categories=AudioVideo;Audio;AudioVideoEditing;Sequencer;X-Jack; - - Exec=audacity --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/x-aiff;audio/x-wav;application/x-audacity-project;audio/x-flac; diff --git a/audacity-1.3.12-gcc45.patch b/audacity-1.3.12-gcc45.patch deleted file mode 100644 index ad54b63..0000000 --- a/audacity-1.3.12-gcc45.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- audacity-src-1.3.9-orig/lib-src/portmixer/configure.ac 2010-12-10 15:09:24.153495606 -0800 -+++ audacity-src-1.3.9/lib-src/portmixer/configure.ac 2010-12-10 15:10:33.201143282 -0800 -@@ -49,34 +49,57 @@ - fi - - # -+# Check which APIs are available -+# -+ -+have_oss=no -+AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h machine/soundcard.h], have_oss=yes) -+ -+AC_CHECK_HEADER(alsa/asoundlib.h, have_alsa=yes, have_alsa=no) -+AC_CHECK_HEADER(CoreAudio/CoreAudio.h, have_coreaudio=yes, have_coreaudio=no) -+AC_CHECK_HEADER(windows.h, have_windows=yes, have_windows=no) -+ -+# - # Make sure the support is there - # - have_support=yes --AC_EGREP_HEADER([PaWinDS_GetStreamInputGUID], [pa_win_ds.h], , [have_support=no]) --if [[ $have_support = "no" ]] ; then -- AC_MSG_WARN("Missing support in pa_win_ds.h"); --fi --AC_EGREP_HEADER([PaAlsa_GetStreamInputCard], [pa_linux_alsa.h], , [have_support=no]) --if [[ $have_support = "no" ]] ; then -+ -+if [[ $have_alsa = "yes" ]] ; then -+ AC_EGREP_HEADER([PaAlsa_GetStreamInputCard], [pa_linux_alsa.h], , [have_support=no]) -+ if [[ $have_support = "no" ]] ; then - AC_MSG_WARN("Missing support in pa_linux_alsa.h"); -+ fi - fi --AC_EGREP_HEADER([PaWinMME_GetStreamInputHandle], [pa_win_wmme.h], , [have_support=no]) --if [[ $have_support = "no" ]] ; then -- AC_MSG_WARN("Missing support in pa_win_wmme.h"); --fi --AC_EGREP_HEADER([PaMacCore_GetStreamInputDevice], [pa_mac_core.h], , [have_support=no]) --if [[ $have_support = "no" ]] ; then -+ -+if [[ $have_coreaudio = "yes" ]] ; then -+ AC_EGREP_HEADER([PaMacCore_GetStreamInputDevice], [pa_mac_core.h], , [have_support=no]) -+ if [[ $have_support = "no" ]] ; then - AC_MSG_WARN("Missing support in pa_mac_core.h"); -+ fi - fi --AC_EGREP_HEADER([PaOSS_GetStreamInputDevice], [pa_unix_oss.h], , [have_support=no]) --if [[ $have_support = "no" ]] ; then -+ -+if [[ $have_oss = "yes" ]] ; then -+ AC_EGREP_HEADER([PaOSS_GetStreamInputDevice], [pa_unix_oss.h], , [have_support=no]) -+ if [[ $have_support = "no" ]] ; then - AC_MSG_WARN("Missing support in pa_unix_oss.h"); -+ fi -+fi -+ -+if [[ $have_windows = "yes" ]] ; then -+ AC_EGREP_HEADER([PaWinDS_GetStreamInputGUID], [pa_win_ds.h], , [have_support=no]) -+ if [[ $have_support = "no" ]] ; then -+ AC_MSG_WARN("Missing support in pa_win_ds.h"); -+ fi -+ AC_EGREP_HEADER([PaWinMME_GetStreamInputHandle], [pa_win_wmme.h], , [have_support=no]) -+ if [[ $have_support = "no" ]] ; then -+ AC_MSG_WARN("Missing support in pa_win_wmme.h"); -+ fi - fi -+ - AC_EGREP_HEADER([Pa_GetStreamHostApiType], [portaudio.h], , [have_support=no]) - if [[ $have_support = "no" ]] ; then - AC_MSG_WARN("Missing support in portaudio.h"); - fi -- - if [[ $have_support = "no" ]] ; then - AC_MSG_ERROR("Your version of portaudio does not include required functions"); - fi -@@ -88,16 +111,6 @@ - AC_SUBST( objects, [px_mixer.o] ) - - # --# Check which APIs are available --# -- --have_oss=no --AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h machine/soundcard.h], have_oss=yes) -- --AC_CHECK_HEADER(alsa/asoundlib.h, have_alsa=yes, have_alsa=no) --AC_CHECK_HEADER(CoreAudio/CoreAudio.h, have_coreaudio=yes, have_coreaudio=no) -- --# - # Set up to use the identified ones - # - AC_MSG_NOTICE(---------------------------------------); 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-1.3.7-vamp-1.3.patch b/audacity-1.3.7-vamp-1.3.patch deleted file mode 100644 index 185a936..0000000 --- a/audacity-1.3.7-vamp-1.3.patch +++ /dev/null @@ -1,97 +0,0 @@ -diff -Nur audacity-src-1.3.7-orig/configure audacity-src-1.3.7/configure ---- audacity-src-1.3.7-orig/configure 2009-01-27 21:50:59.000000000 +0100 -+++ audacity-src-1.3.7/configure 2009-02-28 16:06:02.000000000 +0100 -@@ -7774,12 +7774,12 @@ - pkg_cv_VAMP_CFLAGS="$VAMP_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vamp-hostsdk >= 2.0\"") >&5 -- ($PKG_CONFIG --exists --print-errors "vamp-hostsdk >= 2.0") 2>&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vamp-hostsdk >= 1.1.0\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "vamp-hostsdk >= 1.1.0") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_VAMP_CFLAGS=`$PKG_CONFIG --cflags "vamp-hostsdk >= 2.0" 2>/dev/null` -+ pkg_cv_VAMP_CFLAGS=`$PKG_CONFIG --cflags "vamp-hostsdk >= 1.1.0" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -7790,12 +7790,12 @@ - pkg_cv_VAMP_LIBS="$VAMP_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vamp-hostsdk >= 2.0\"") >&5 -- ($PKG_CONFIG --exists --print-errors "vamp-hostsdk >= 2.0") 2>&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vamp-hostsdk >= 1.1.0\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "vamp-hostsdk >= 1.1.0") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_VAMP_LIBS=`$PKG_CONFIG --libs "vamp-hostsdk >= 2.0" 2>/dev/null` -+ pkg_cv_VAMP_LIBS=`$PKG_CONFIG --libs "vamp-hostsdk >= 1.1.0" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -7813,9 +7813,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- VAMP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "vamp-hostsdk >= 2.0" 2>&1` -+ VAMP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "vamp-hostsdk >= 1.1.0" 2>&1` - else -- VAMP_PKG_ERRORS=`$PKG_CONFIG --print-errors "vamp-hostsdk >= 2.0" 2>&1` -+ VAMP_PKG_ERRORS=`$PKG_CONFIG --print-errors "vamp-hostsdk >= 1.1.0" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$VAMP_PKG_ERRORS" >&5 -diff -Nur audacity-src-1.3.7-orig/src/effects/vamp/VampEffect.cpp audacity-src-1.3.7/src/effects/vamp/VampEffect.cpp ---- audacity-src-1.3.7-orig/src/effects/vamp/VampEffect.cpp 2009-01-27 21:50:58.000000000 +0100 -+++ audacity-src-1.3.7/src/effects/vamp/VampEffect.cpp 2009-02-28 15:45:52.000000000 +0100 -@@ -13,9 +13,9 @@ - - #include "VampEffect.h" - --#include --#include --#include -+#include -+#include -+#include - - #include - #include -@@ -311,20 +311,12 @@ - Vamp::RealTime ftime0 = fli->timestamp; - double ltime0 = ftime0.sec + (double(ftime0.nsec) / 1000000000.0); - -- Vamp::RealTime ftime1 = ftime0; -- if (fli->hasDuration) ftime1 = ftime0 + fli->duration; -- double ltime1 = ftime1.sec + (double(ftime1.nsec) / 1000000000.0); -- - wxString label = LAT1CTOWX(fli->label.c_str()); - if (label == wxString()) { -- if (fli->values.empty()) { - label = wxString::Format(LAT1CTOWX("%.3f"), ltime0); -- } else { -- label = wxString::Format(LAT1CTOWX("%.3f"), *fli->values.begin()); -- } - } - -- ltrack->AddLabel(ltime0, ltime1, label); -+ ltrack->AddLabel(ltime0, ltime0, label); - } - } - -diff -Nur audacity-src-1.3.7-orig/src/effects/vamp/VampEffect.h audacity-src-1.3.7/src/effects/vamp/VampEffect.h ---- audacity-src-1.3.7-orig/src/effects/vamp/VampEffect.h 2009-01-27 21:50:58.000000000 +0100 -+++ audacity-src-1.3.7/src/effects/vamp/VampEffect.h 2009-02-28 15:45:52.000000000 +0100 -@@ -22,7 +22,7 @@ - - #include - --#include -+#include - - void LoadVampPlugins(); - diff --git a/audacity.png b/audacity.png deleted file mode 100644 index 02343ac..0000000 Binary files a/audacity.png and /dev/null differ 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 - 1.3.13-0.3.beta +- add audacity manual help file Source and subpackage + +* Sun Apr 24 2011 David Timms - 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 - 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