rpms/ardour/F-9 ardour-2.5-HOST_NOT_FOUND.patch, NONE, 1.1 ardour-2.5-gcc43.patch, 1.1, 1.2 ardour.spec, 1.16, 1.17 sources, 1.7, 1.8 ardour-2.1-SConstruct.patch, 1.3, NONE

[Anthony Green]

Author: green

Update of /cvs/pkgs/rpms/ardour/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22834

Modified Files:
	ardour-2.5-gcc43.patch ardour.spec sources 
Added Files:
	ardour-2.5-HOST_NOT_FOUND.patch 
Removed Files:
	ardour-2.1-SConstruct.patch 
Log Message:
Upgrade to ardour 2.6

ardour-2.5-HOST_NOT_FOUND.patch:

--- NEW FILE ardour-2.5-HOST_NOT_FOUND.patch ---
--- gtk2_ardour/ardour_ui.h~	2008-06-17 07:58:37.000000000 -0700
+++ gtk2_ardour/ardour_ui.h	2008-09-21 08:19:26.000000000 -0700
@@ -53,6 +53,9 @@
 #include <gtkmm/textbuffer.h>
 #include <gtkmm/adjustment.h>
 #include <gtkmm2ext/gtk_ui.h>
+#ifdef HOST_NOT_FOUND
+#undef HOST_NOT_FOUND
+#endif
 #include <gtkmm2ext/click_box.h>
 #include <gtkmm2ext/stateful_button.h>
 #include <gtkmm2ext/bindable_button.h>

ardour-2.5-gcc43.patch:

Index: ardour-2.5-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ardour/F-9/ardour-2.5-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ardour-2.5-gcc43.patch	14 Jul 2008 16:56:15 -0000	1.1
+++ ardour-2.5-gcc43.patch	25 Oct 2008 14:50:56 -0000	1.2
@@ -1,8 +1,8 @@
---- 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 @@
-  *   */
+--- libs/surfaces/tranzport/screen.cc.gcc43	2008-09-19 03:16:28.000000000 -0700
++++ libs/surfaces/tranzport/screen.cc	2008-10-25 06:57:26.000000000 -0700
+@@ -20,6 +20,7 @@
  
+ #include <cstring>
  #include <tranzport_control_protocol.h>
 +#include <cstring>
  


Index: ardour.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ardour/F-9/ardour.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ardour.spec	14 Jul 2008 16:56:15 -0000	1.16
+++ ardour.spec	25 Oct 2008 14:50:56 -0000	1.17
@@ -1,13 +1,14 @@
 Summary:       Multichannel Digital Audio Workstation
 Name:          ardour
-Version:       2.5
-Release:       1%{?dist}
-Source:        http://ardour.org/files/releases/ardour-%{version}.tar.bz2
+Version:       2.6
+Release:       3%{?dist}
+Source:        http://ardour.org/files/releases/ardour-%{version}-4004.tar.bz2
 Source1:       ardour2.desktop
 Source2:       ardour.script
-Patch0:        ardour-2.1-SConstruct.patch
+Patch0:        ardour-2.6-SConstruct.patch
 Patch1:        ardour-session.cc-no_stomp.patch
 Patch2:        ardour-2.5-gcc43.patch
+Patch3:        ardour-2.5-HOST_NOT_FOUND.patch
 URL:           http://ardour.org
 License:       GPLv2+
 Group:         Applications/Multimedia
@@ -25,6 +26,7 @@
 BuildRequires: gtkmm24-devel >= 2.8
 BuildRequires: libgnomecanvasmm26-devel >= 2.12
 BuildRequires: aubio-devel
+BuildRequires: libcurl-devel
 Requires: hicolor-icon-theme
 
 BuildRequires:    desktop-file-utils
@@ -51,10 +53,10 @@
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p0 -b .Sconstruct
 %patch1 -p0
 %patch2 -p0
-#%patch3 -p1
+%patch3 -p0
 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
@@ -76,6 +78,7 @@
 %endif
 
 scons %{?_smp_mflags} PREFIX=%{_prefix} LIBDIR=%{_lib} SYSLIBS=1 \
+      FREESOUND=1 \
       DIST_TARGET="${TARGETCPU}" \
       ARCH="$RPM_OPT_FLAGS $ARCH_FLAGS -ffast-math"
 
@@ -142,9 +145,21 @@
 %{_datadir}/applications/fedora-ardour2.desktop
 
 %changelog
-* Sun Jul 13 2008 Anthony Green <green at redhat.com> 2.5-1
+* Sat Oct 25 2008 Anthony Green <green at redhat.com> 2.6-3
+- BuildRequire libcurl-devel.
+
+* Sat Oct 25 2008 Anthony Green <green at redhat.com> 2.6-2
+- Upgrade gcc43 patch to apply with fuzz = 0.
+
+* Sat Oct 25 2008 Anthony Green <green at redhat.com> 2.6-1
+- New upstream release 2.6.
+- Update SConstruct patch.
+
+* Sun Sep 21 2008 Anthony Green <green at redhat.com> 2.5-2
+- Add HOST_NOT_FOUND patch.
+
+* Thu Jul 10 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Jul 2008 16:56:15 -0000	1.7
+++ sources	25 Oct 2008 14:50:56 -0000	1.8
@@ -1 +1 @@
-88180d400e8c19ceea41aabadc098116  ardour-2.5.tar.bz2
+0ff3da07f9b283b10927f35343de765b  ardour-2.6-4004.tar.bz2


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