rpms/mono/devel mono-mcs-config.patch,1.1,1.2 mono.spec,1.61,1.62

[Paul F. Johnson (pfj)]

Author: pfj

Update of /cvs/extras/rpms/mono/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12070/devel

Modified Files:
	mono-mcs-config.patch mono.spec 
Log Message:

Fixed build problem 


mono-mcs-config.patch:

Index: mono-mcs-config.patch
===================================================================
RCS file: /cvs/extras/rpms/mono/devel/mono-mcs-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mono-mcs-config.patch	17 Dec 2007 00:59:27 -0000	1.1
+++ mono-mcs-config.patch	19 Dec 2007 14:21:33 -0000	1.2
@@ -16,7 +16,7 @@
      echo "exec_prefix=$exec_prefix" >> $srcdir/$mcsdir/build/config.make
      echo "sysconfdir=$sysconfdir" >> $srcdir/$mcsdir/build/config.make
 -    echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$mcsdir/build/config.make
-+    echo 'mono_libdir=/usr/lib64' >> $srcdir/$mcsdir/build/config.make
++    echo 'mono_libdir='$libdir' >> $srcdir/$mcsdir/build/config.make
      echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$mcsdir/build/config.make
      echo 'IL_FLAGS = /debug' >> $srcdir/$mcsdir/build/config.make
      echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$mcsdir/build/config.make
@@ -25,7 +25,7 @@
        echo "prefix=$prefix" > $srcdir/$olivedir/build/config.make
        echo "exec_prefix=$exec_prefix" >> $srcdir/$olivedir/build/config.make
 -      echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$olivedir/build/config.make
-+      echo 'mono_libdir=/usr/lib64' >> $srcdir/$olivedir/build/config.make
++      echo 'mono_libdir=$libdir' >> $srcdir/$olivedir/build/config.make
        echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$olivedir/build/config.make
        echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$olivedir/build/config.make
        echo "MONO_VERSION = $myver" >> $srcdir/$olivedir/build/config.make


Index: mono.spec
===================================================================
RCS file: /cvs/extras/rpms/mono/devel/mono.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- mono.spec	19 Dec 2007 10:36:06 -0000	1.61
+++ mono.spec	19 Dec 2007 14:21:33 -0000	1.62
@@ -1,6 +1,6 @@
 Name:           mono
 Version:        1.2.6
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        a .NET runtime environment
 
 Group:          Development/Languages
@@ -238,7 +238,6 @@
 
 %prep
 %setup -q
-sed -i -e "s!@LIBDIR@!%{_libdir}!" %{PATCH8}
 %patch8 -p1 -b .config
 %patch1 -p1 -b .selinux-ia64
 %patch2 -p1 -b .ppc-threading
@@ -254,12 +253,12 @@
 %else
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %endif
-autoreconf --force --install
+autoreconf -f -i -s
 
 gcc -o monodir %{SOURCE1} -DMONODIR=\"%{_libdir}/mono\"
 
-%configure --with-ikvm=yes --with-jit=yes --with-xen_opt=yes
-make
+%configure --with-ikvm=yes --with-jit=yes --with-xen_opt=yes 
+make %{?_smp_mflags}
 
 
 %install
@@ -573,8 +572,9 @@
 %gac_dll IBM.Data.DB2
 
 %changelog
-* Wed Dec 19 2007 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.2.6-5
+* Wed Dec 19 2007 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.2.6-6
 - added BR libunwind-devel for ia64 (bz426180)
+- fix for LIBDIR problem
 
 * Tue Dec 16 2007 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.2.6-4
 - bump new version