rpms/ardour/devel ardour-SConstruct.patch, 1.2, 1.3 ardour.spec, 1.28, 1.29

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/ardour/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21778

Modified Files:
	ardour.spec 
Added Files:
	ardour-SConstruct.patch 
Log Message:
* Tue Jul 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 2.8.2-2
- Fix libdir once more


ardour-SConstruct.patch:
 SConstruct |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Index: ardour-SConstruct.patch
===================================================================
RCS file: ardour-SConstruct.patch
diff -N ardour-SConstruct.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ardour-SConstruct.patch	22 Jul 2009 03:20:46 -0000	1.3
@@ -0,0 +1,18 @@
+diff -rupN ardour-2.8.2.old/SConstruct ardour-2.8.2/SConstruct
+--- ardour-2.8.2.old/SConstruct	2009-07-20 11:55:10.000000000 -0400
++++ ardour-2.8.2/SConstruct	2009-07-21 22:56:35.000000000 -0400
+@@ -742,10 +742,10 @@ if env['FPU_OPTIMIZATION']:
+ 
+ # handle x86/x86_64 libdir properly
+ 
+-if env['DIST_TARGET'] == 'x86_64':
+-    env['LIBDIR']='lib64'
+-else:
+-    env['LIBDIR']='lib'
++#if env['DIST_TARGET'] == 'x86_64':
++#    env['LIBDIR']='lib64'
++#else:
++#    env['LIBDIR']='lib'
+ 
+ #
+ # no VST on x86_64


Index: ardour.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ardour/devel/ardour.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- ardour.spec	22 Jul 2009 02:27:07 -0000	1.28
+++ ardour.spec	22 Jul 2009 03:20:46 -0000	1.29
@@ -1,11 +1,12 @@
 Summary:       Multichannel Digital Audio Workstation
 Name:          ardour
 Version:       2.8.2
-Release:       1%{?dist}
+Release:       2%{?dist}
 # No more direct links. Download from
 # http://ardour.org/download
 Source:        ardour-%{version}.tar.bz2
 Source2:       ardour.script
+Patch0:        ardour-SConstruct.patch
 Patch1:        ardour-2.8-session.cc-no_stomp.patch
 Patch3:        ardour-2.5-HOST_NOT_FOUND.patch
 URL:           http://ardour.org
@@ -59,6 +60,7 @@ digital mixers.
 
 %prep
 %setup -q
+%patch0 -p1 -b .SConstruct
 %patch1 -p1 -b .no_stomp
 %patch3 -p0 -b .host.not.found
 
@@ -173,6 +175,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_mandir}/ru/man1/ardour.1*
 
 %changelog
+* Tue Jul 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 2.8.2-2
+- Fix libdir once more
+
 * Tue Jul 21 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 2.8.2-1
 - New upstream release 2.8.2.