rpms/ardour/F-9 ardour-2.7-SConstruct.patch, NONE, 1.1 ardour.spec, 1.19, 1.20 sources, 1.9, 1.10 ardour-2.6-SConstruct.patch, 1.1, NONE

[Anthony Green]

Author: green

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

Modified Files:
	ardour.spec sources 
Added Files:
	ardour-2.7-SConstruct.patch 
Removed Files:
	ardour-2.6-SConstruct.patch 
Log Message:
Upgrade to 2.7

ardour-2.7-SConstruct.patch:

--- NEW FILE ardour-2.7-SConstruct.patch ---
--- SConstruct.Sconstruct	2008-11-20 02:07:26.000000000 -0800
+++ SConstruct	2008-11-21 02:57:19.000000000 -0800
@@ -49,6 +49,7 @@
     BoolOption('LIBLO', 'Compile with support for liblo library', 1),
     BoolOption('NLS', 'Set to turn on i18n support', 1),
     PathOption('PREFIX', 'Set the install "prefix"', '/usr/local'),
+    ('LIBDIR', 'Set librarydir (lib/lib64)', 'lib'),
     BoolOption('SURFACES', 'Build support for control surfaces', 1),
     BoolOption('WIIMOTE', 'Build the wiimote control surface', 0),
     BoolOption('SYSLIBS', 'USE AT YOUR OWN RISK: CANCELS ALL SUPPORT FROM ARDOUR AUTHORS: Use existing system versions of various libraries instead of internal ones', 0),
@@ -753,13 +754,6 @@
             print "\nWarning: you are building Ardour with SSE support even though your system does not support these instructions. (This may not be an error, especially if you are a package maintainer)"
 # end optimization section
 
-# handle x86/x86_64 libdir properly
-
-if env['DIST_TARGET'] == 'x86_64':
-    env['LIBDIR']='lib64'
-else:
-    env['LIBDIR']='lib'
-
 #
 # a single way to test if we're on OS X
 #
@@ -792,18 +786,6 @@
 if env['ARCH'] != '':
     opt_flags = env['ARCH'].split()
 
-#
-# prepend boiler plate optimization flags
-#
-
-opt_flags[:0] = [
-    "-O3",
-    "-fomit-frame-pointer",
-    "-ffast-math",
-    "-fstrength-reduce",
-    "-pipe"
-    ]
-
 if env['DEBUG'] == 1:
     env.Append(CCFLAGS=" ".join (debug_flags))
     env.Append(LINKFLAGS=" ".join (debug_flags))
@@ -1096,9 +1078,10 @@
 
 #    libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas')
     libraries['soundtouch'] = LibraryInfo()
-    libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0')
-    # Comment the previous line and uncomment this for old versions of Debian:
-    #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
+    if env['VST'] or not env['RUBBERBAND']:
+         #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0')
+         # Comment the previous line and uncomment this for Debian:
+         libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
 
     libraries['appleutility'] = LibraryInfo(LIBS='libappleutility',
                                             LIBPATH='#libs/appleutility',
@@ -1247,7 +1230,11 @@
 # timestretch libraries
 #
 
-timefx_subdirs = ['libs/soundtouch']
+if not env['SYSLIBS'] and (env['VST'] or not env['RUBBERBAND']):
+  timefx_subdirs = ['libs/soundtouch']
+else:
+  timefx_subdirs = [ ]
+
 if env['RUBBERBAND']:
     timefx_subdirs += ['libs/rubberband']
 


Index: ardour.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ardour/F-9/ardour.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ardour.spec	27 Oct 2008 13:45:57 -0000	1.19
+++ ardour.spec	21 Nov 2008 12:57:30 -0000	1.20
@@ -1,11 +1,11 @@
 Summary:       Multichannel Digital Audio Workstation
 Name:          ardour
-Version:       2.6.1
+Version:       2.7
 Release:       1%{?dist}
-Source:        http://ardour.org/files/releases/ardour-%{version}-4010.tar.bz2
+Source:        http://ardour.org/files/releases/ardour-%{version}-4225.tar.bz2
 Source1:       ardour2.desktop
 Source2:       ardour.script
-Patch0:        ardour-2.6-SConstruct.patch
+Patch0:        ardour-2.7-SConstruct.patch
 Patch1:        ardour-session.cc-no_stomp.patch
 Patch2:        ardour-2.5-gcc43.patch
 Patch3:        ardour-2.5-HOST_NOT_FOUND.patch
@@ -53,14 +53,10 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .Sconstruct
+%patch0 -p0 -b .SConstruct
 %patch1 -p0
 %patch2 -p0
 %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
-done
 
 %build
 # <sigh> ardours SConstruct script is a mess when it comes to determining
@@ -110,6 +106,14 @@
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
   %{SOURCE1}
 
+# install the man pages
+install -dm 755 $RPM_BUILD_ROOT%{_mandir}/man1/
+install -p -m 0644 ardour.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+for lang in es fr ru ; do
+  install -dm 755 $RPM_BUILD_ROOT%{_mandir}/${lang}/man1/
+  install -p -m 0644 ardour.1.${lang} $RPM_BUILD_ROOT%{_mandir}/${lang}/man1/
+done
+
 %find_lang gtk2_ardour
 cat gtk2_ardour.lang > ardour.lang
 %find_lang libardour2
@@ -134,7 +138,7 @@
 
 %files -f ardour.lang
 %defattr(-,root,root,-)
-%doc README COPYING DOCUMENTATION
+%doc README COPYING
 %config(noreplace) %{_sysconfdir}/ardour2
 %{_bindir}/ardour2
 %{_libexecdir}/ardour2
@@ -143,14 +147,18 @@
 %{_datadir}/ardour/
 %{_datadir}/icons/hicolor/*/apps/ardour.png
 %{_datadir}/applications/fedora-ardour2.desktop
+%{_mandir}/man1/ardour.1*
+%{_mandir}/es/man1/ardour.1*
+%{_mandir}/fr/man1/ardour.1*
+%{_mandir}/ru/man1/ardour.1*
 
 %changelog
+* Fri Nov 21 2008 Anthony Green <green at redhat.com> 2.7-1
+- New upstream release 2.7.
+
 * Mon Oct 27 2008 Anthony Green <green at redhat.com> 2.6.1-1
 - New upstream release 2.6.1.
 
-* Sat Oct 25 2008 Anthony Green <green at redhat.com> 2.6-4
-- Fix tagging bug.
-
 * Sat Oct 25 2008 Anthony Green <green at redhat.com> 2.6-3
 - BuildRequire libcurl-devel.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ardour/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	27 Oct 2008 13:45:57 -0000	1.9
+++ sources	21 Nov 2008 12:57:30 -0000	1.10
@@ -1 +1 @@
-6a761b07912d16c2db3fdf94574af8e5  ardour-2.6.1-4010.tar.bz2
+cda1db24e93bb443534bf7232bf02ca2  ardour-2.7-4225.tar.bz2


--- ardour-2.6-SConstruct.patch DELETED ---