rpms/ardour/F-9 ardour-2.5-gcc43.patch, NONE, 1.1 ardour.script, 1.2, 1.3 ardour.spec, 1.15, 1.16 sources, 1.6, 1.7 ardour-2.4-gcc43.patch, 1.1, NONE ardour-session.cc-_total_free_4k_blocks.patch, 1.1, NONE

[Anthony Green (green)]

Author: green

Update of /cvs/pkgs/rpms/ardour/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23542

Modified Files:
	ardour.script ardour.spec sources 
Added Files:
	ardour-2.5-gcc43.patch 
Removed Files:
	ardour-2.4-gcc43.patch 
	ardour-session.cc-_total_free_4k_blocks.patch 
Log Message:
Upgrade to 2.5

ardour-2.5-gcc43.patch:

--- NEW FILE ardour-2.5-gcc43.patch ---
--- libs/surfaces/tranzport/screen.cc~	2008-04-18 06:54:21.000000000 -0700
+++ libs/surfaces/tranzport/screen.cc	2008-07-13 22:19:39.000000000 -0700
@@ -19,6 +19,7 @@
  *   */
 
 #include <tranzport_control_protocol.h>
+#include <cstring>
 
 void
 TranzportControlProtocol::screen_clear ()


Index: ardour.script
===================================================================
RCS file: /cvs/pkgs/rpms/ardour/F-9/ardour.script,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ardour.script	22 Jan 2008 22:09:11 -0000	1.2
+++ ardour.script	14 Jul 2008 16:56:15 -0000	1.3
@@ -5,6 +5,7 @@
 if ! test -d $A2DIR; then
   mkdir -p $A2DIR
   touch $A2DIR/ardourver2.2
+  touch $A2DIR/ardourver2.5
 else
   if ! test -a $A2DIR/ardourver2.2; then
     if test -a $A2DIR/ardour2_ui.rc; then
@@ -18,6 +19,12 @@
     fi
     touch $A2DIR/ardourver2.2
   fi
+  if ! test -a $A2DIR/ardourver2.5; then
+    if test -a $A2DIR/ardour.bindings; then
+      mv -f $A2DIR/ardour.bindings $A2DIR/ardour.bindings.bak
+    fi
+    touch $A2DIR/ardourver2.5
+  fi
 fi
 
 exec /usr/libexec/ardour2 "$@"


Index: ardour.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ardour/F-9/ardour.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ardour.spec	10 Apr 2008 12:48:05 -0000	1.15
+++ ardour.spec	14 Jul 2008 16:56:15 -0000	1.16
@@ -1,14 +1,13 @@
 Summary:       Multichannel Digital Audio Workstation
 Name:          ardour
-Version:       2.4.1
+Version:       2.5
 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
 Patch1:        ardour-session.cc-no_stomp.patch
-Patch2:        ardour-session.cc-_total_free_4k_blocks.patch
-Patch3:        ardour-2.4-gcc43.patch
+Patch2:        ardour-2.5-gcc43.patch
 URL:           http://ardour.org
 License:       GPLv2+
 Group:         Applications/Multimedia
@@ -25,6 +24,7 @@
 BuildRequires: fftw-devel
 BuildRequires: gtkmm24-devel >= 2.8
 BuildRequires: libgnomecanvasmm26-devel >= 2.12
+BuildRequires: aubio-devel
 Requires: hicolor-icon-theme
 
 BuildRequires:    desktop-file-utils
@@ -54,7 +54,7 @@
 %patch0 -p1
 %patch1 -p0
 %patch2 -p0
-%patch3 -p1
+#%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
@@ -142,6 +142,10 @@
 %{_datadir}/applications/fedora-ardour2.desktop
 
 %changelog
+* Sun Jul 13 2008 Anthony Green <green at redhat.com> 2.5-1
+- New upstream release 2.5.
+- Update script to backup pre-2.5 ardour.bindings files, and start fresh.
+
 * Thu Apr 10 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.4.1-1
 - New upstream release 2.4.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ardour/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Apr 2008 12:48:05 -0000	1.6
+++ sources	14 Jul 2008 16:56:15 -0000	1.7
@@ -1 +1 @@
-f132caaf613f3cb44ca9f9dafb38fbae  ardour-2.4.1.tar.bz2
+88180d400e8c19ceea41aabadc098116  ardour-2.5.tar.bz2


--- ardour-2.4-gcc43.patch DELETED ---


--- ardour-session.cc-_total_free_4k_blocks.patch DELETED ---