From bfd9df6685d00c085d4c044cbd19939b5a9bc0af3d63b35f31b816fec20e204e Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Mon, 15 Mar 2010 16:13:59 +0000
Subject: [PATCH 1/3] Accepting request 34784 from
 home:dimstar:branches:multimedia:apps

Copy from home:dimstar:branches:multimedia:apps/audacity via accept of submit request 34784 revision 2.
Request was accepted with message:
I'll try to find a solution without autoreconf before forwarding

OBS-URL: https://build.opensuse.org/request/show/34784
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=32
---
 audacity-nomac.patch | 15 +++++++++++++++
 audacity.changes     |  8 ++++++++
 audacity.spec        |  9 +++++++--
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 audacity-nomac.patch

diff --git a/audacity-nomac.patch b/audacity-nomac.patch
new file mode 100644
index 0000000..85d8a7f
--- /dev/null
+++ b/audacity-nomac.patch
@@ -0,0 +1,15 @@
+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");
diff --git a/audacity.changes b/audacity.changes
index c732bc9..564117c 100644
--- a/audacity.changes
+++ b/audacity.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+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..1575d1e 100644
--- a/audacity.spec
+++ b/audacity.spec
@@ -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
@@ -84,10 +85,14 @@ Authors:
 %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"
+pushd lib-src/portmixer
+autoreconf
+popd
 %configure \
     --enable-unicode \
     --with-libvorbis=system \

From 8592ddcd40ba32062900cd18b978bb7591e5390a9cef26cc1931ad875d40eae2 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Mon, 15 Mar 2010 16:33:29 +0000
Subject: [PATCH 2/3] - rework previous fix without autoreconf in patching
 configure   directly

OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=33
---
 audacity-nomac.patch | 13 +++++++++++++
 audacity.changes     |  6 ++++++
 audacity.spec        | 21 ---------------------
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/audacity-nomac.patch b/audacity-nomac.patch
index 85d8a7f..b8b5432 100644
--- a/audacity-nomac.patch
+++ b/audacity-nomac.patch
@@ -13,3 +13,16 @@ Index: audacity-src-1.3.11-beta/lib-src/portmixer/configure.ac
  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 564117c..478a7b9 100644
--- a/audacity.changes
+++ b/audacity.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+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
 
diff --git a/audacity.spec b/audacity.spec
index 1575d1e..051d7c6 100644
--- a/audacity.spec
+++ b/audacity.spec
@@ -62,24 +62,6 @@ 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 <dominic@minorninth.com>
-    Roger Dannenberg <rbd+@cs.cmu.edu>
-    Jason Cohen <cohen3+@andrew.cmu.edu>
-    Robert Leidle <rfl+@andrew.cmu.edu>
-    Mark Tomlinson <marktoml@hotmail.com>
-    Joshua Haberman <joshua@haberman.com>
-    Nasca Octavian Paul <paulnasca@email.ro>
-    Logan Lewis <proxima@proxc.com>
-    Matt Brubeck <mbrubeck@hmc.edu>
-    Mark Phillips <mitb@totaldeath.com>
-    Tony Oetzmann <airon@epost.de>
-    Harvey Lubin <agrapha@agrapha.com>
-    Tom Woodhams <tom@imaginemedia.co.uk>
-
 %prep
 %setup -q -n %{name}-src-%{version}-beta
 %patch0
@@ -90,9 +72,6 @@ Authors:
 %build
 #%{?suse_update_config:%{suse_update_config -f . lib-src/*/.}}
 #export AUTOMAKE="automake --foreign"
-pushd lib-src/portmixer
-autoreconf
-popd
 %configure \
     --enable-unicode \
     --with-libvorbis=system \

From 3a354a2d377de104aeb43bd04c06c8b2d5326c97c03b4cab590fd254fbc52e93 Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Tue, 16 Mar 2010 00:51:32 +0000
Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/audacity
 revision 28.0

OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=a4b7f7c8937dc5c1eb97a48985ad72d9
---
 audacity.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/audacity.spec b/audacity.spec
index 051d7c6..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