diff --git a/mono-mcs-config.patch b/mono-mcs-config.patch index 96f034c..6faea25 100644 --- a/mono-mcs-config.patch +++ b/mono-mcs-config.patch @@ -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='$libdir' >> $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=$libdir' >> $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 diff --git a/mono.spec b/mono.spec index fc8d980..29498d1 100644 --- a/mono.spec +++ b/mono.spec @@ -1,6 +1,6 @@ Name: mono Version: 1.2.6 -Release: 6%{?dist} +Release: 6.1%{?dist} Summary: a .NET runtime environment Group: Development/Languages @@ -238,7 +238,9 @@ which is fully managed and actively maintained. %prep %setup -q +sed -i -e 's!@@LIBDIR@@!%{_libdir}!' %{PATCH8} %patch8 -p1 -b .config +sed -i -e 's!%{_libdir}!@@LIBDIR@@!' %{PATCH8} %patch1 -p1 -b .selinux-ia64 %patch2 -p1 -b .ppc-threading %patch5 -p1 @@ -246,6 +248,7 @@ which is fully managed and actively maintained. %patch4 -p1 -b .use-monodir %patch6 -p1 -b .metadata %patch7 -p0 -b .big-integer +autoreconf -f -i -s %build %ifarch ia64 s390 @@ -253,12 +256,12 @@ export CFLAGS="-O2 -fno-strict-aliasing" %else export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %endif -autoreconf -f -i -s +#autoreconf -f -i -s gcc -o monodir %{SOURCE1} -DMONODIR=\"%{_libdir}/mono\" %configure --with-ikvm=yes --with-jit=yes --with-xen_opt=yes -make %{?_smp_mflags} +make %install @@ -572,7 +575,7 @@ install monodir $RPM_BUILD_ROOT%{_bindir} %gac_dll IBM.Data.DB2 %changelog -* Wed Dec 19 2007 Paul F. Johnson 1.2.6-6 +* Wed Dec 19 2007 Paul F. Johnson 1.2.6-6.1 - added BR libunwind-devel for ia64 (bz426180) - fix for LIBDIR problem