pc file fixes

This commit is contained in:
Paul F. Johnson 2008-04-23 08:39:14 +00:00
parent 650f00a286
commit aa69705504
2 changed files with 32 additions and 1 deletions

26
mono-191-pcfiles.patch Normal file
View File

@ -0,0 +1,26 @@
--- mono-1.9.1/data/cecil.pc.in 2008-01-29 22:02:46.000000000 +0000
+++ mono-1.9.1/data/cecil.pc-new.in 2008-04-21 15:05:05.000000000 +0100
@@ -1,4 +1,4 @@
-assemblies_dir=@prefix@/lib/mono
+assemblies_dir=@libdir@/mono
Libraries=${assemblies_dir}/gac/Mono.Cecil/0.6.8.8607__0738eb9f132ed756/Mono.Cecil.dll
Name: Mono Internal -- Do not use.
--- mono-1.9.1/data/mint.pc.in 2007-11-08 22:07:46.000000000 +0000
+++ mono-1.9.1/data/mint.pc-new.in 2008-04-21 15:05:55.000000000 +0100
@@ -1,6 +1,6 @@
prefix=${pcfiledir}/../..
exec_prefix=${pcfiledir}/../..
-libdir=${prefix}/lib
+libdir=@libdir@
includedir=${prefix}/include/mono-@API_VER@
--- mono-1.9.1/data/mono-cairo.pc.in 2007-11-08 22:07:46.000000000 +0000
+++ mono-1.9.1/data/mono-cairo.pc-new.in 2008-04-21 15:06:41.000000000 +0100
@@ -6,4 +6,4 @@
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

View File

@ -1,6 +1,6 @@
Name: mono
Version: 1.9.1
Release: 1%{?dist}
Release: 2%{?dist}
Summary: A .NET runtime environment
Group: Development/Languages
@ -42,6 +42,7 @@ Patch5: mono-1.2.4-metadata.patch
Patch6: mono-1251-metadata.patch
Patch7: mono-big-integer-CVE-2007-5197.patch
Patch8: mono-mcs-config.patch
Patch9: mono-191-pcfiles.patch
%description
The Mono runtime implements a JIT engine for the ECMA CLI
@ -256,6 +257,7 @@ sed -i -e 's!%{_libdir}!@@LIBDIR@@!' %{PATCH8}
%patch4 -p1 -b .use-monodir
%patch6 -p1 -b .metadata
%patch7 -p0 -b .big-integer
%patch9 -p1 -b .original
autoreconf -f -i -s
# Add undeclared Arg
@ -600,6 +602,9 @@ install monodir $RPM_BUILD_ROOT%{_bindir}
%gac_dll IBM.Data.DB2
%changelog
* Mon Apr 21 2008 Paul F. Johnson <paul@all-the-johnsons.co.uk> 1.9.1-2
- pc file fixes
* Tue Apr 15 2008 Paul F. Johnson <paul@all-the-johnsons.co.uk> 1.9.1-1
- bump to new beta