diff --git a/import.log b/import.log index 0481c85..02f1240 100644 --- a/import.log +++ b/import.log @@ -37,3 +37,4 @@ mono-2_4-6_pre2_20091002svn126522_fc11:HEAD:mono-2.4-6.pre2.20091002svn126522.fc mono-2_4-7_pre3_20091702svn127216_fc11:HEAD:mono-2.4-7.pre3.20091702svn127216.fc11.src.rpm:1234914090 mono-2_4-7_pre3_20091802svn127307_fc11:HEAD:mono-2.4-7.pre3.20091802svn127307.fc11.src.rpm:1234999657 mono-2_4-8_RC1_fc11:HEAD:mono-2.4-8.RC1.fc11.src.rpm:1235776176 +mono-2_4-9_RC1_fc11:HEAD:mono-2.4-9.RC1.fc11.src.rpm:1236470243 diff --git a/mono-22-libdir.patch b/mono-22-libdir.patch index 592fb4b..df22860 100644 --- a/mono-22-libdir.patch +++ b/mono-22-libdir.patch @@ -39,25 +39,13 @@ Name: Mono Internal -- Do not use. --- mono-2.2/data/mint.pc.in 2008-11-18 21:10:32.000000000 +0000 +++ mono-2.2/data/mint.pc-new.in 2008-11-18 21:12:55.000000000 +0000 -@@ -1,6 +1,6 @@ +@@ -1,5 +1,5 @@ prefix=${pcfiledir}/../.. exec_prefix=${pcfiledir}/../.. -libdir=${prefix}/lib +libdir=@libdir@ includedir=${prefix}/include/mono-@API_VER@ - ---- mono-2.2/data/mono-cairo.pc.in 2008-11-18 21:10:32.000000000 +0000 -+++ mono-2.2/data/mono-cairo.pc-new.in 2008-11-18 21:13:30.000000000 +0000 -@@ -1,6 +1,6 @@ - prefix=${pcfiledir}/../.. - exec_prefix=${pcfiledir}/../.. --libdir=${prefix}/@reloc_libdir@ -+libdir=@libdir@ - includedir=${prefix}/include - - Name: Mono.Cairo - --- mono-2.2/data/mono-lineeditor.pc.in 2008-11-11 04:56:15.000000000 +0000 +++ mono-2.2/data/mono-lineeditor.pc-new.in 2008-11-18 21:14:18.000000000 +0000 @@ -1,5 +1,5 @@ @@ -128,5 +116,19 @@ -mono_instdir = $(prefix)/lib/mono +mono_instdir = $(libdir)/mono endif + +--- mono-2.4/data/mono-cairo.pc.in 2009-02-13 23:34:32.000000000 +0000 ++++ mono-2.4/data/mono-cairo.pc-new.in 2009-03-07 23:32:13.000000000 +0000 +@@ -1,9 +1,9 @@ + prefix=${pcfiledir}/../.. + exec_prefix=${pcfiledir}/../.. +-libdir=${prefix}/@reloc_libdir@ ++libdir=@libdir@ + includedir=${prefix}/include + Name: Mono.Cairo + Description: Cairo bindings for Mono + Version: @VERSION@ +-Libs: -r:${prefix}/lib/mono/1.0/Mono.Cairo.dll ++Libs: -r:${libdir}/mono/1.0/Mono.Cairo.dll diff --git a/mono.spec b/mono.spec index 374eac9..ef1a8a3 100644 --- a/mono.spec +++ b/mono.spec @@ -282,7 +282,6 @@ sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH7} sed -i -e 's!@prefix@/lib/!%{_libdir}/!' data/system.web.extensions_1.0.pc.in sed -i -e 's!@prefix@/lib/!%{_libdir}/!' data/system.web.extensions.design_1.0.pc.in sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' docs/Makefile.{am,in} -sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' data/mono-cairo.pc.in autoreconf -f -i -s @@ -686,8 +685,8 @@ install monodir %{buildroot}%{_bindir} %{_libdir}/pkgconfig/monodoc.pc %changelog -* Sat Mar 07 2009 Xavier Lamien - 2.4-9.RC1 -- Fix libdir on mono-cairo pkg-config. +* Sat Mar 07 2009 Paul F. Johnson 2.4-9.RC1 +- Fix libdir issue with mono-cairo * Fri Feb 27 2009 Paul F. Johnson 2.4-8.RC1 - Built using official tarball release