rpms/mono/devel mono-2.2-uselibdir.patch, NONE, 1.1 import.log, 1.14, 1.15 mono.spec, 1.87, 1.88 mono-2.0-uselibdir.patch, 1.1, NONE

[Paul F. Johnson]

Author: pfj

Update of /cvs/pkgs/rpms/mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv605/devel

Modified Files:
	import.log mono.spec 
Added Files:
	mono-2.2-uselibdir.patch 
Removed Files:
	mono-2.0-uselibdir.patch 
Log Message:

Fix libdir problem for monodoc


mono-2.2-uselibdir.patch:

--- NEW FILE mono-2.2-uselibdir.patch ---
--- 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 \


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/import.log,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- import.log	25 Nov 2008 15:44:43 -0000	1.14
+++ import.log	25 Nov 2008 21:50:28 -0000	1.15
@@ -12,3 +12,4 @@
 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


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- mono.spec	25 Nov 2008 15:44:43 -0000	1.87
+++ mono.spec	25 Nov 2008 21:50:28 -0000	1.88
@@ -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 @@
 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 @@
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
+* Tue Nov 25 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-2.pre1
+- fix monodoc libdir issues
+
 * Tue Nov 25 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-1.1.pre1
 - rebuild
 


--- mono-2.0-uselibdir.patch DELETED ---