diff --git a/import.log b/import.log index 06ec4cd..62542fa 100644 --- a/import.log +++ b/import.log @@ -18,3 +18,4 @@ mono-2_2-4_pre1_fc10:HEAD:mono-2.2-4.pre1.fc10.src.rpm:1227705354 mono-2_2-5_pre1_fc11:HEAD:mono-2.2-5.pre1.fc11.src.rpm:1228072254 mono-2_2-6_pre1_fc11:HEAD:mono-2.2-6.pre1.fc11.src.rpm:1228075040 mono-2_2-7_pre1_fc11:HEAD:mono-2.2-7.pre1.fc11.src.rpm:1228347891 +mono-2_2-8_pre2_fc11:HEAD:mono-2.2-8.pre2.fc11.src.rpm:1228759110 diff --git a/mono-22-libgdiwinform.patch b/mono-22-libgdiwinform.patch index 27a6f2a..8b88331 100644 --- a/mono-22-libgdiwinform.patch +++ b/mono-22-libgdiwinform.patch @@ -4,7 +4,7 @@ -+ ++ diff --git a/mono.spec b/mono.spec index 29f89d8..7bfc1f7 100644 --- a/mono.spec +++ b/mono.spec @@ -1,6 +1,6 @@ Name: mono Version: 2.2 -Release: 7.pre1%{?dist} +Release: 8.pre2%{?dist} Summary: A .NET runtime environment Group: Development/Languages @@ -274,23 +274,19 @@ Development file for monodoc %patch6 -p1 -b .winforms %patch7 -p1 -b .libgdiplus -mv configure.in configure.ini - -find . -name Makefile.in -or -name Makefile.am -or -name \*.pc.in \ +find . -name Makefile.am -or -name \*.pc.in \ -or -name \*.in -or -name \*.make \ | while read f ; do - sed -i -e 's!$(prefix)/lib!%{_libdir}!' "$f" - sed -i -e 's!@prefix@/lib!%{_libdir}!' "$f" - sed -i -e 's!/usr/lib!%{_libdir}!' "$f" - sed -i -e 's!${prefix}/lib!%{_libdir}!' "$f" - sed -i -e 's!${exec_prefix}/lib!%{_libdir}!' "$f" - sed -i -e 's!$(exec_prefix)/lib!%{_libdir}!' "$f" - sed -i -e 's!${prefix}/@reloc_libdir@!%{_libdir}!' "$f"; + sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' "$f" + sed -i -e 's!@prefix@/lib/!%{_libdir}/!' "$f" + sed -i -e 's!/usr/lib/!%{_libdir}/!' "$f" + sed -i -e 's!${prefix}/lib/!%{_libdir}/!' "$f" + sed -i -e 's!${exec_prefix}/lib/!%{_libdir}/!' "$f" + sed -i -e 's!$(exec_prefix)/lib/!%{_libdir}/!' "$f" + sed -i -e 's!${prefix}/@reloc_libdir@/!%{_libdir}/!' "$f"; done -mv configure.ini configure.in - autoreconf -f -i -s # Add undeclared Arg @@ -689,6 +685,10 @@ install monodir $RPM_BUILD_ROOT%{_bindir} %{_libdir}/pkgconfig/monodoc.pc %changelog +* Fri Dec 05 2008 Paul F. Johnson 2.2-8.pre2 +- Bump to 2.2 preview 2 +- More sed fixes + * Thu Dec 04 2008 Paul F. Johnson 2.2-7.pre1 - Add fix so that winforms doesn't need libgdiplus-devel - Add fix so the sed script works correctly on x86_64 diff --git a/sources b/sources index 9cba420..2135b6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4f3c266fde3cbf47f4d3c1e201faa3ef mono-2.2.tar.bz2 +a311545a0003f1a599297d57e4e27916 mono-2.2.tar.bz2