rpms/mono/devel import.log, 1.39, 1.40 mono-22-libdir.patch, 1.1, 1.2 mono.spec, 1.114, 1.115

[Paul F. Johnson]

Author: pfj

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

Modified Files:
	import.log mono-22-libdir.patch mono.spec 
Log Message:

Fix libdir issue with mono-cairo



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/import.log,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- import.log	27 Feb 2009 23:10:23 -0000	1.39
+++ import.log	7 Mar 2009 23:58:29 -0000	1.40
@@ -37,3 +37,4 @@
 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

mono-22-libdir.patch:

Index: mono-22-libdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono-22-libdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mono-22-libdir.patch	15 Dec 2008 11:57:49 -0000	1.1
+++ mono-22-libdir.patch	7 Mar 2009 23:58:29 -0000	1.2
@@ -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- at 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


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- mono.spec	7 Mar 2009 23:27:58 -0000	1.114
+++ mono.spec	7 Mar 2009 23:58:29 -0000	1.115
@@ -282,7 +282,6 @@
 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 @@
 %{_libdir}/pkgconfig/monodoc.pc
 
 %changelog
-* Sat Mar 07 2009 Xavier Lamien <lxtnow at gmail.com> - 2.4-9.RC1
-- Fix libdir on mono-cairo pkg-config.
+* Sat Mar 07 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4-9.RC1
+- Fix libdir issue with mono-cairo
 
 * Fri Feb 27 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.4-8.RC1
 - Built using official tarball release