rpms/mono/F-10 import.log, 1.12, 1.13 mono-22-libdir.patch, 1.1, 1.2 mono.spec, 1.86, 1.87
Paul F. Johnson
pfj at fedoraproject.org
Sun Mar 15 11:54:35 UTC 2009
- Previous message: rpms/ejabberd/EL-5 .cvsignore, 1.10, 1.11 ejabberd.spec, 1.24, 1.25 import.log, 1.5, 1.6 sources, 1.10, 1.11
- Next message: rpms/tibetan-machine-uni-fonts/devel sources, 1.3, 1.4 tibetan-machine-uni-fonts.spec, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pfj
Update of /cvs/pkgs/rpms/mono/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv342/F-10
Modified Files:
import.log mono-22-libdir.patch mono.spec
Log Message:
Fix mono-cairo libdir issue for 64 bit
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono/F-10/import.log,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- import.log 16 Jan 2009 21:17:36 -0000 1.12
+++ import.log 15 Mar 2009 11:54:05 -0000 1.13
@@ -10,3 +10,4 @@
mono-2_0_1-12_fc10:HEAD:mono-2.0.1-12.fc10.src.rpm:1224923536
mono-2_0_1-13_fc10:HEAD:mono-2.0.1-13.fc10.src.rpm:1225659728
mono-2_2-1_fc11:F-10:mono-2.2-1.fc11.src.rpm:1232140558
+mono-2_2-2_fc11:F-10:mono-2.2-2.fc11.src.rpm:1237118002
mono-22-libdir.patch:
Index: mono-22-libdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mono/F-10/mono-22-libdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mono-22-libdir.patch 16 Jan 2009 21:17:37 -0000 1.1
+++ mono-22-libdir.patch 15 Mar 2009 11:54:05 -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/F-10/mono.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- mono.spec 16 Jan 2009 21:17:37 -0000 1.86
+++ mono.spec 15 Mar 2009 11:54:05 -0000 1.87
@@ -1,6 +1,6 @@
Name: mono
Version: 2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A .NET runtime environment
Group: Development/Languages
@@ -668,6 +668,9 @@
%{_libdir}/pkgconfig/monodoc.pc
%changelog
+* Tue Mar 10 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-2
+- Fix mono-cairo libdir issue
+
* Fri Jan 16 2009 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.2-1
- Bump to 2.2 release
- Huge number of changes since 2.01
- Previous message: rpms/ejabberd/EL-5 .cvsignore, 1.10, 1.11 ejabberd.spec, 1.24, 1.25 import.log, 1.5, 1.6 sources, 1.10, 1.11
- Next message: rpms/tibetan-machine-uni-fonts/devel sources, 1.3, 1.4 tibetan-machine-uni-fonts.spec, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list