diff --git a/import.log b/import.log index 6439544..8852956 100644 --- a/import.log +++ b/import.log @@ -12,3 +12,4 @@ mono-2_0_1-13_fc10:HEAD:mono-2.0.1-13.fc10.src.rpm:1225659728 mono-2_0_1-13_fc10:HEAD:mono-2.0.1-13.fc10.src.rpm:1226836107 mono-2_2-1_pre1_fc10:HEAD:mono-2.2-1.pre1.fc10.src.rpm:1227626955 mono-2_2-1_1_pre1_fc10:HEAD:mono-2.2-1.1.pre1.fc10.src.rpm:1227627723 +mono-2_2-2_pre1_fc10:HEAD:mono-2.2-2.pre1.fc10.src.rpm:1227649766 diff --git a/mono-2.0-uselibdir.patch b/mono-2.0-uselibdir.patch deleted file mode 100644 index befe114..0000000 --- a/mono-2.0-uselibdir.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- mono-2.0/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/MonoLocationHelper.cs 2008-08-03 07:58:47.000000000 +0100 -+++ mono-2.0/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/MonoLocationHelper-new.cs 2008-08-03 08:06:47.000000000 +0100 -@@ -53,10 +53,10 @@ - //xbuildDir = Path.Combine (t2.FullName, "xbuild"); - // /usr/local/lib - t3 = t2.Parent; -+ libDir = t3.FullName; - // /usr/local - t4 = t3.Parent; - binDir = Path.Combine (t4.FullName, "bin"); -- libDir = Path.Combine (t4.FullName, "lib"); - } - - internal static string GetBinDir () diff --git a/mono-2.2-uselibdir.patch b/mono-2.2-uselibdir.patch new file mode 100644 index 0000000..84d3d47 --- /dev/null +++ b/mono-2.2-uselibdir.patch @@ -0,0 +1,22 @@ +--- mono-2.0/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/MonoLocationHelper.cs 2008-08-03 07:58:47.000000000 +0100 ++++ mono-2.0/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/MonoLocationHelper-new.cs 2008-08-03 08:06:47.000000000 +0100 +@@ -53,10 +53,10 @@ + //xbuildDir = Path.Combine (t2.FullName, "xbuild"); + // /usr/local/lib + t3 = t2.Parent; ++ libDir = t3.FullName; + // /usr/local + t4 = t3.Parent; + binDir = Path.Combine (t4.FullName, "bin"); +- libDir = Path.Combine (t4.FullName, "lib"); + } + + internal static string GetBinDir () +--- mono-2.2/docs/Makefile.am 2008-11-19 22:34:05.000000000 +0000 ++++ mono-2.2/docs/Makefile-new.am 2008-11-25 19:45:45.000000000 +0000 +@@ -1,4 +1,4 @@ +-sourcesdir = $(prefix)/lib/monodoc/sources ++sourcesdir = $(libdir)/monodoc/sources + + sources_DATA = \ + monoapi.source \ diff --git a/mono.spec b/mono.spec index 41eefc7..3418016 100644 --- a/mono.spec +++ b/mono.spec @@ -1,6 +1,6 @@ Name: mono Version: 2.2 -Release: 1.1.pre1%{?dist} +Release: 2.pre1%{?dist} Summary: A .NET runtime environment Group: Development/Languages @@ -41,7 +41,7 @@ Patch4: mono-1.2.3-use-monodir.patch Patch5: mono-big-integer-CVE-2007-5197.patch Patch8: mono-mcs-config.patch Patch7: mono-2.2-pcfiles.patch -Patch6:mono-2.0-uselibdir.patch +Patch6:mono-2.2-uselibdir.patch Patch9:mono-2.0-monoservice.patch Patch10: mono-2.0-metadata-makefile.patch Patch11: mono-2.2-script.patch @@ -677,6 +677,9 @@ install monodir $RPM_BUILD_ROOT%{_bindir} %{_libdir}/pkgconfig/monodoc.pc %changelog +* Tue Nov 25 2008 Paul F. Johnson 2.2-2.pre1 +- fix monodoc libdir issues + * Tue Nov 25 2008 Paul F. Johnson 2.2-1.1.pre1 - rebuild