rpms/audacity/F-11 audacity-1.3.8-gsocket-conflict.patch, NONE, 1.1 audacity-1.3.9-libdir.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 audacity.spec, 1.77, 1.78 sources, 1.12, 1.13 README, 1.26, NONE audacity-1.3.6-flac-import.patch, 1.2, NONE audacity-1.3.7-audiodevdefaults.patch, 1.2, NONE audacity-1.3.7-libdir.patch, 1.2, NONE audacity-1.3.7-portaudio-non-mmap-alsa.patch, 1.3, NONE audacity-1.3.7-repeat.patch, 1.2, NONE

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13562

Modified Files:
	.cvsignore audacity.spec sources 
Added Files:
	audacity-1.3.8-gsocket-conflict.patch 
	audacity-1.3.9-libdir.patch 
Removed Files:
	README audacity-1.3.6-flac-import.patch 
	audacity-1.3.7-audiodevdefaults.patch 
	audacity-1.3.7-libdir.patch 
	audacity-1.3.7-portaudio-non-mmap-alsa.patch 
	audacity-1.3.7-repeat.patch 
Log Message:
sync with F-12 devel to offer as F-11 test-update

audacity-1.3.8-gsocket-conflict.patch:
 AudacityApp.cpp |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE audacity-1.3.8-gsocket-conflict.patch ---
diff -Nur audacity-src-1.3.8-orig/src/AudacityApp.cpp audacity-src-1.3.8/src/AudacityApp.cpp
--- audacity-src-1.3.8-orig/src/AudacityApp.cpp	2009-07-16 05:27:35.000000000 +0200
+++ audacity-src-1.3.8/src/AudacityApp.cpp	2009-07-20 23:45:41.000000000 +0200
@@ -331,7 +331,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <dlfcn.h>
-#include <gtk/gtk.h>
+/*#include <gtk/gtk.h>*/
+#include <glib/gtypes.h>
+#include <glib-object.h>
 
 typedef struct _GnomeProgram GnomeProgram;
 typedef struct _GnomeModuleInfo GnomeModuleInfo;

audacity-1.3.9-libdir.patch:
 LoadLadspa.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE audacity-1.3.9-libdir.patch ---
diff -Nur audacity-src-1.3.9-orig/src/effects/ladspa/LoadLadspa.cpp audacity-src-1.3.9/src/effects/ladspa/LoadLadspa.cpp
--- audacity-src-1.3.9-orig/src/effects/ladspa/LoadLadspa.cpp	2009-08-31 12:45:40.000000000 +0200
+++ audacity-src-1.3.9/src/effects/ladspa/LoadLadspa.cpp	2009-09-03 12:01:49.823505468 +0200
@@ -286,7 +286,7 @@
 
    #ifdef __WXGTK__
    wxGetApp().AddUniquePathToPathList(wxT(INSTALL_PREFIX) wxT("/ladspa"), pathList);
-   wxGetApp().AddUniquePathToPathList(wxT("/usr/local/lib/ladspa"), pathList);
+   wxGetApp().AddUniquePathToPathList(wxT("/usr/local/__RPM_LIB__/ladspa"), pathList);
    wxGetApp().AddUniquePathToPathList(wxT(LIBDIR) wxT("/ladspa"), pathList);
    #endif
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	28 Feb 2009 14:21:16 -0000	1.10
+++ .cvsignore	5 Sep 2009 13:25:04 -0000	1.11
@@ -1 +1 @@
-audacity-minsrc-1.3.7.tar.bz2
+audacity-minsrc-1.3.9.tar.bz2


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/F-11/audacity.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- audacity.spec	13 May 2009 08:37:01 -0000	1.77
+++ audacity.spec	5 Sep 2009 13:25:06 -0000	1.78
@@ -1,27 +1,24 @@
 # Compile options:
 # --with mp3          : enable mp3 support
 
-%define tartopdir audacity-src-1.3.7
+%define tartopdir audacity-src-1.3.9
 
 Name: audacity
-Version: 1.3.7
-Release: 0.7.beta%{?dist}
+Version: 1.3.9
+Release: 0.1.beta%{?dist}
 Summary: Multitrack audio editor
 Group: Applications/Multimedia
 License: GPLv2
 URL: http://audacity.sourceforge.net
 
-Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-1.3.7.tar.bz2
+Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%{version}.tar.bz2
 Source1: audacity.png
 Source2: audacity.desktop
 
 Patch1: audacity-1.3.7-libmp3lame-default.patch
-Patch2: audacity-1.3.7-libdir.patch
-Patch3: audacity-1.3.6-flac-import.patch
-Patch4: audacity-1.3.7-portaudio-non-mmap-alsa.patch
-Patch5: audacity-1.3.7-repeat.patch
+Patch2: audacity-1.3.9-libdir.patch
+Patch3: audacity-1.3.8-gsocket-conflict.patch
 Patch6: audacity-1.3.7-vamp-1.3.patch
-Patch7: audacity-1.3.7-audiodevdefaults.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
@@ -32,6 +29,7 @@ BuildRequires: gettext
 BuildRequires: jack-audio-connection-kit-devel
 BuildRequires: ladspa-devel
 BuildRequires: libid3tag-devel
+BuildRequires: taglib-devel
 BuildRequires: libogg-devel
 BuildRequires: libsamplerate-devel
 BuildRequires: libsndfile-devel
@@ -69,13 +67,10 @@ do
 done
 grep -q -s __RPM_LIB * -R && exit 1
 
-%patch3 -p1 -b .dumb-flac-import
-%patch4 -p1 -b .pa-non-mmap-alsa
-%patch5 -p1 -b .repeat
+%patch3 -p1 -b .gsocket-conflict
 %if 0%{?fedora} < 11
 %patch6 -p1 -b .vamp-1.3
 %endif
-%patch7 -p1 -b .audiodevdefaults
 
 # Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
 for i in locale/*.po src/export/ExportMP3.cpp
@@ -110,6 +105,10 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}
 
 make DESTDIR=${RPM_BUILD_ROOT} install
 
+# Audacity 1.3.8-beta complains if the help/manual directories
+# don't exist.
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/help/manual
+
 %{find_lang} %{name}
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
@@ -147,6 +146,27 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Thu Sep  3 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.9-0.1.beta
+- upgrade to 1.3.9-beta
+- upstream's changes in the device prefs code make the audiodevdefaults
+  patch unnecessary afaic see
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.8-0.3.beta
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jul 20 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.8-0.2.beta
+- glib2 2.21.1's gio in Rawhide F-12 introduces a GSocket that
+  conflicts with wxGTK's GSocket class (gsocket.h): as a work-around,
+  include less glib headers
+
+* Mon Jul 20 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.8-0.1.beta
+- upgrade to 1.3.8-beta
+- BR taglib-devel
+- patches merged/obsoleted upstream:
+  audacity-1.3.7-portaudio-non-mmap-alsa.patch
+  audacity-1.3.7-repeat.patch
+  audacity-1.3.6-flac-import.patch
+
 * Wed May 13 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.7-0.7.beta
 - retag up-to-date files and copy to F-10/F-11
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	28 Feb 2009 14:21:17 -0000	1.12
+++ sources	5 Sep 2009 13:25:06 -0000	1.13
@@ -1 +1 @@
-7dcbcd8ed417413fd824d446001058d9  audacity-minsrc-1.3.7.tar.bz2
+0f2bc8971c6e2c4d39457c28aea16b5c  audacity-minsrc-1.3.9.tar.bz2


--- README DELETED ---


--- audacity-1.3.6-flac-import.patch DELETED ---


--- audacity-1.3.7-audiodevdefaults.patch DELETED ---


--- audacity-1.3.7-libdir.patch DELETED ---


--- audacity-1.3.7-portaudio-non-mmap-alsa.patch DELETED ---


--- audacity-1.3.7-repeat.patch DELETED ---