rpms/ardour/F-8 ardour-2.3-SConstruct.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 ardour.spec, 1.11, 1.12 sources, 1.4, 1.5 ardour-2.1-SConstruct.patch, 1.2, NONE

[Anthony Green (green)]

Author: green

Update of /cvs/extras/rpms/ardour/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19719

Modified Files:
	.cvsignore ardour.spec sources 
Added Files:
	ardour-2.3-SConstruct.patch 
Removed Files:
	ardour-2.1-SConstruct.patch 
Log Message:
Upgrade to ardour 2.3.


ardour-2.3-SConstruct.patch:

--- NEW FILE ardour-2.3-SConstruct.patch ---
--- SConstruct~	2008-02-07 13:33:13.000000000 -0800
+++ SConstruct	2008-02-07 13:35:15.000000000 -0800
@@ -34,7 +34,7 @@
     BoolOption('OLDFONTS', 'Old school font sizes', 0),
     BoolOption('DEBUG', 'Set to build with debugging information and no optimizations', 0),
     PathOption('DESTDIR', 'Set the intermediate install "prefix"', '/'),
-    EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'tiger', 'panther', 'leopard', 'none' ), ignorecase=2),
+    EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'powerpc64', 'tiger', 'panther', 'leopard', 'none' ), ignorecase=2),
     BoolOption('DMALLOC', 'Compile and link using the dmalloc library', 0),
     BoolOption('EXTRA_WARN', 'Compile with -Wextra, -ansi, and -pedantic.  Might break compilation.  For pedants', 0),
     BoolOption('FFT_ANALYSIS', 'Include FFT analysis window', 0),


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ardour/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Jan 2008 11:53:59 -0000	1.4
+++ .cvsignore	9 Feb 2008 15:25:39 -0000	1.5
@@ -1 +1 @@
-ardour-2.2.tar.bz2
+ardour-2.3.1.tar.bz2


Index: ardour.spec
===================================================================
RCS file: /cvs/extras/rpms/ardour/F-8/ardour.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ardour.spec	8 Feb 2008 22:52:07 -0000	1.11
+++ ardour.spec	9 Feb 2008 15:25:39 -0000	1.12
@@ -1,20 +1,21 @@
 Summary:       Multichannel Digital Audio Workstation
 Name:          ardour
-Version:       2.2
-Release:       4%{?dist}
+Version:       2.3.1
+Release:       1%{?dist}
 Source:        http://ardour.org/files/releases/ardour-%{version}.tar.bz2
 Source1:       ardour2.desktop
 Source2:       ardour.script
-Patch0:        ardour-2.1-SConstruct.patch
+Patch0:        ardour-2.3-SConstruct.patch
 Patch1:        ardour-session.cc-no_stomp.patch
 Patch2:        ardour-session.cc-_total_free_4k_blocks.patch
+Patch3:        ardour-2.1-glib215.patch
 URL:           http://ardour.org
 License:       GPLv2+
 Group:         Applications/Multimedia
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: scons, pkgconfig, libtool
+BuildRequires: scons, pkgconfig, libtool, fftw-devel
 BuildRequires: libxslt-devel, libgnomecanvas-devel, boost-devel
 BuildRequires: alsa-lib-devel, jack-audio-connection-kit-devel
 BuildRequires: liblo-devel, libusb-devel
@@ -46,10 +47,11 @@
 modern digital mixers.
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -n ardour-2.3
+%patch0 -p0
 %patch1 -p0
 %patch2 -p0
+# %patch3 -p1
 for i in README.fr README.it TRANSLATORS; do
   iconv -f ISO-8859-1 -t UTF8 DOCUMENTATION/$i > DOCUMENTATION/$i.tmp
   mv DOCUMENTATION/$i.tmp DOCUMENTATION/$i
@@ -155,11 +157,10 @@
 %{_datadir}/applications/fedora-ardour2.desktop
 
 %changelog
-* Fri Feb 08 2008 Anthony Green <green at redhat.com> 2.2-4
-- Don't refer to glib-2.15.0 patch anywhere.
-
-* Wed Jan 23 2008 Anthony Green <green at redhat.com> 2.2-3
-- Fix tagging glitch.
+* Thu Feb 07 2008 Anthony Green <green at redhat.com> 2.3.1-1
+- Upgrade to ardour 2.3.1.
+- Update SConstruct patch.
+- BuildRequire fftw-devel.
 
 * Tue Jan 22 2008 Anthony Green <green at redhat.com> 2.2-2
 - Fix wrapper script.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ardour/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Jan 2008 11:53:59 -0000	1.4
+++ sources	9 Feb 2008 15:25:39 -0000	1.5
@@ -1 +1 @@
-151dcc194dfdba3cd7f61faeed6e06f5  ardour-2.2.tar.bz2
+54abb231ae0c1fa3b3f2c2177c644c22  ardour-2.3.1.tar.bz2


--- ardour-2.1-SConstruct.patch DELETED ---