diff --git a/audacity-nomac.patch b/audacity-nomac.patch new file mode 100644 index 0000000..b8b5432 --- /dev/null +++ b/audacity-nomac.patch @@ -0,0 +1,28 @@ +Index: audacity-src-1.3.11-beta/lib-src/portmixer/configure.ac +=================================================================== +--- audacity-src-1.3.11-beta.orig/lib-src/portmixer/configure.ac ++++ audacity-src-1.3.11-beta/lib-src/portmixer/configure.ac +@@ -64,10 +64,6 @@ AC_EGREP_HEADER([PaWinMME_GetStreamInput + 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 +- AC_MSG_WARN("Missing support in pa_mac_core.h"); +-fi + 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"); +Index: audacity-src-1.3.11-beta/lib-src/portmixer/configure +=================================================================== +--- audacity-src-1.3.11-beta.orig/lib-src/portmixer/configure 2010-01-18 22:34:54.000000000 +0100 ++++ audacity-src-1.3.11-beta/lib-src/portmixer/configure 2010-03-15 17:16:42.000000000 +0100 +@@ -3542,8 +3542,6 @@ _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "PaMacCore_GetStreamInputDevice" >/dev/null 2>&1; then + : +-else +- have_support=no + fi + rm -f conftest* + diff --git a/audacity.changes b/audacity.changes index c732bc9..478a7b9 100644 --- a/audacity.changes +++ b/audacity.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Mar 15 16:31:02 UTC 2010 - coolo@novell.com + +- rework previous fix without autoreconf in patching configure + directly + +------------------------------------------------------------------- +Mon Mar 15 11:43:14 UTC 2010 - dimstar@opensuse.org + +- Add audacity-nomac.patch: remove the mac checks from configure. + The check is actually build a test program which fails due to + missing headers. As consequence: start autoreconf in + lib-src/portmixer. + ------------------------------------------------------------------- Mon Jan 25 21:28:17 UTC 2010 - mseben@novell.com diff --git a/audacity.spec b/audacity.spec index 6ed3131..2b42159 100644 --- a/audacity.spec +++ b/audacity.spec @@ -42,7 +42,7 @@ BuildRequires: libtwolame-devel %endif Summary: A Free, Cross-Platform Digital Audio Editor Version: 1.3.11 -Release: 1 +Release: 2 License: GPLv2+ Group: Productivity/Multimedia/Sound/Editors and Convertors BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -53,6 +53,7 @@ Source1: %{name}.png Patch0: %{name}-no_buildstamp.patch Patch5: %{name}-retval.patch Patch12: %{name}-audiodevdefaults.patch +Patch13: audacity-nomac.patch %description Audacity is a program that manipulates digital audio wave forms. In @@ -61,33 +62,16 @@ imports many sound file formats, including WAV, AIFF, AU, IRCAM, MP, and Ogg Vorbis. With Audacity, you can edit wave data larger than the physical memory size of your computer. - - -Authors: --------- - Dominic Mazzoni - Roger Dannenberg - Jason Cohen - Robert Leidle - Mark Tomlinson - Joshua Haberman - Nasca Octavian Paul - Logan Lewis - Matt Brubeck - Mark Phillips - Tony Oetzmann - Harvey Lubin - Tom Woodhams - %prep %setup -q -n %{name}-src-%{version}-beta %patch0 %patch5 %patch12 -p1 +%patch13 -p1 %build -%{?suse_update_config:%{suse_update_config -f . lib-src/*/.}} -export AUTOMAKE="automake --foreign" +#%{?suse_update_config:%{suse_update_config -f . lib-src/*/.}} +#export AUTOMAKE="automake --foreign" %configure \ --enable-unicode \ --with-libvorbis=system \