rpms/mono/devel mono-libdir-126.patch, NONE, 1.1 mono-mcs-config.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 mono.spec, 1.59, 1.60 sources, 1.17, 1.18 mono-libdir.patch, 1.5, NONE
Paul F. Johnson (pfj)
fedora-extras-commits at redhat.com
Mon Dec 17 01:00:00 UTC 2007
Author: pfj
Update of /cvs/extras/rpms/mono/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4821/devel
Modified Files:
.cvsignore mono.spec sources
Added Files:
mono-libdir-126.patch mono-mcs-config.patch
Removed Files:
mono-libdir.patch
Log Message:
Update to the latest version
Spec file changes
mono-libdir-126.patch:
--- NEW FILE mono-libdir-126.patch ---
Index: mono-1.1.16/scripts/Makefile.am
===================================================================
--- mono-1.1.16.orig/scripts/Makefile.am
+++ mono-1.1.16/scripts/Makefile.am
@@ -80,7 +80,7 @@ plat_bindir = $(shell cygpath -m $(libdi
mono_instdir = $(shell cygpath -m $(libdir))/mono
else
plat_bindir = $(bindir)
-mono_instdir = $(prefix)/lib/mono
+mono_instdir = $(libdir)/mono
endif
REWRITE_COMMON = sed \
Index: mono-1.1.16/scripts/mono-nunit.pc.in
===================================================================
--- mono-1.1.16.orig/scripts/mono-nunit.pc.in
+++ mono-1.1.16/scripts/mono-nunit.pc.in
@@ -1,6 +1,6 @@
prefix=${pcfiledir}/../..
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=${exec_prefix}/@reloc_libdir@
Name: Mono NUnit
Index: mono-1.1.16/mcs/tools/cilc/res-Makefile
===================================================================
--- mono-1.1.16.orig/mcs/tools/cilc/res-Makefile
+++ mono-1.1.16/mcs/tools/cilc/res-Makefile
@@ -2,7 +2,7 @@ include defs.mk
LIBNAME = $(shell echo $(basename $(SONAME)) | sed -e 's/^lib//')
HTARGET = $(prefix)/include/$(LIBNAME)/
-LIBTARGET = $(prefix)/lib/
+LIBTARGET = $(libdir)
CFLAGS += -static -fpic $(shell pkg-config --cflags glib-2.0 gobject-2.0 mono) $(EXTRAINCLUDES) -I.
--- mono-1.1.16.1/mono/metadata/assembly.c.libdir 2006-08-17 17:52:42.000000000 +0200
+++ mono-1.1.16.1/mono/metadata/assembly.c 2006-08-17 17:56:21.000000000 +0200
@@ -521,7 +521,7 @@
}
config = g_build_filename (base, "etc", NULL);
- lib = g_build_filename (base, "lib", NULL);
+ lib = g_build_filename (base, MONO_RELOC_LIBDIR, NULL);
mono = g_build_filename (lib, "mono/1.0", NULL);
if (stat (mono, &buf) == -1)
fallback ();
@@ -1844,7 +1844,7 @@
if (extra_gac_paths) {
paths = extra_gac_paths;
while (!res && *paths) {
- gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", aname->name, NULL);
+ gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, MONO_RELOC_LIBDIR, "mono", "gac", aname->name, NULL);
res = probe_for_partial_name (gacpath, fullname, aname, status);
g_free (gacpath);
paths++;
@@ -1908,7 +1908,7 @@
paths = extra_gac_paths;
while (!image && *paths) {
fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths,
- "lib", "mono", "gac", subpath, NULL);
+ MONO_RELOC_LIBDIR, "mono", "gac", subpath, NULL);
image = mono_image_open (fullpath, NULL);
g_free (fullpath);
paths++;
@@ -2058,7 +2058,7 @@
if (extra_gac_paths) {
paths = extra_gac_paths;
while (!result && *paths) {
- fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", subpath, NULL);
+ fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, MONO_RELOC_LIBDIR, "mono", "gac", subpath, NULL);
result = mono_assembly_open_full (fullpath, status, refonly);
g_free (fullpath);
paths++;
--- mono-1.1.16.1/mcs/tools/gacutil/driver.cs.libdir 2006-08-17 15:40:14.000000000 +0200
+++ mono-1.1.16.1/mcs/tools/gacutil/driver.cs 2006-08-17 15:40:19.000000000 +0200
@@ -667,7 +667,7 @@
private static string EnsureLib (string dir)
{
DirectoryInfo d = new DirectoryInfo (dir);
- if (d.Name == "lib")
+ if (d.Name == "lib" || d.Name == "lib64")
return dir;
return Path.Combine (dir, "lib");
}
--- mono-1.1.16.1/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/MonoLocationHelper.cs.libdir 2006-08-17 15:46:11.000000000 +0200
+++ mono-1.1.16.1/mcs/class/Microsoft.Build.Utilities/Mono.XBuild.Utilities/MonoLocationHelper.cs 2006-08-17 15:46:53.000000000 +0200
@@ -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");
}
public static string GetBinDir ()
mono-mcs-config.patch:
--- NEW FILE mono-mcs-config.patch ---
--- mono-1.2.6/mcs/build/config-default.make 2007-11-08 22:08:59.000000000 +0000
+++ mono-1.2.6/mcs/build/config-default-new.make 2007-12-14 22:25:20.000000000 +0000
@@ -17,7 +17,7 @@
CFLAGS = -g -O2
prefix = /usr/local
exec_prefix = $(prefix)
-mono_libdir = $(exec_prefix)/lib
+mono_libdir = $(libdir)
sysconfdir = $(prefix)/etc
#RUNTIME = mono
RUNTIME = false
--- mono-1.2.6/configure.in 2007-11-08 22:07:57.000000000 +0000
+++ mono-1.2.6/configure-new.in 2007-12-14 22:56:17.000000000 +0000
@@ -2182,7 +2182,7 @@
echo "prefix=$prefix" > $srcdir/$mcsdir/build/config.make
echo "exec_prefix=$exec_prefix" >> $srcdir/$mcsdir/build/config.make
echo "sysconfdir=$sysconfdir" >> $srcdir/$mcsdir/build/config.make
- echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$mcsdir/build/config.make
+ echo 'mono_libdir=/usr/lib64' >> $srcdir/$mcsdir/build/config.make
echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$mcsdir/build/config.make
echo 'IL_FLAGS = /debug' >> $srcdir/$mcsdir/build/config.make
echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$mcsdir/build/config.make
@@ -2215,7 +2215,7 @@
if test x$cross_compiling = xno && test x$enable_olive_build != xno; then
echo "prefix=$prefix" > $srcdir/$olivedir/build/config.make
echo "exec_prefix=$exec_prefix" >> $srcdir/$olivedir/build/config.make
- echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$olivedir/build/config.make
+ echo 'mono_libdir=/usr/lib64' >> $srcdir/$olivedir/build/config.make
echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$olivedir/build/config.make
echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$olivedir/build/config.make
echo "MONO_VERSION = $myver" >> $srcdir/$olivedir/build/config.make
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mono/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 11 Nov 2007 23:17:19 -0000 1.17
+++ .cvsignore 17 Dec 2007 00:59:27 -0000 1.18
@@ -1 +1 @@
-mono-1.2.5.2.tar.bz2
+mono-1.2.6.tar.bz2
Index: mono.spec
===================================================================
RCS file: /cvs/extras/rpms/mono/devel/mono.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- mono.spec 16 Nov 2007 00:36:32 -0000 1.59
+++ mono.spec 17 Dec 2007 00:59:27 -0000 1.60
@@ -1,11 +1,11 @@
Name: mono
-Version: 1.2.5.2
-Release: 2%{?dist}
+Version: 1.2.6
+Release: 4%{?dist}
Summary: a .NET runtime environment
Group: Development/Languages
License: GPL, LGPL, MIT X11
-URL: http://www.mono-project.com/
+URL: http://go-mono.com/sources-stable/%{name}-%{version}.tar.bz2
Source0: %{name}-%{version}.tar.bz2
Source1: monodir.c
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -14,7 +14,7 @@
BuildRequires: glib2-devel
BuildRequires: pkgconfig
BuildRequires: libicu-devel
-BuildRequires: libgdiplus-devel >= 1.2.4
+BuildRequires: libgdiplus-devel >= 1.2.6
BuildRequires: zlib-devel
%ifarch ia64
BuildRequires: libunwind
@@ -29,12 +29,12 @@
Patch1: mono-1.1.13.4-selinux-ia64.patch
Patch2: mono-1.1.13.4-ppc-threading.patch
-Patch3: mono-libdir.patch
+Patch3: mono-libdir-126.patch
Patch4: mono-1.2.3-use-monodir.patch
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
%description
The Mono runtime implements a JIT engine for the ECMA CLI
@@ -47,14 +47,6 @@
Group: Development/Languages
Requires: libgdiplus
-# Temporary provides due to transient package, remove when rawhide is settled
-Obsoletes: mono-lib
-Provides: mono-lib
-
-# Mono-basic was removed in 1.1.17
-Obsoletes: mono-basic
-Provides: mono-basic
-
%description core
This package contains the core of the Mono runtime including its
Virtual Machine, Just-in-time compiler, C# compiler, security
@@ -68,14 +60,6 @@
Requires: pkgconfig
Requires: glib2-devel
-# Temporary provides due to transient package, remove when rawhide is settled
-Obsoletes: mono-lib-devel
-Provides: mono-lib-devel
-
-# Temporary provides due to transient package, remove when rawhide is settled
-Obsoletes: mono-devtools
-Provides: mono-devtools
-
%description devel
This package completes the Mono developer toolchain with the mono profiler,
assembler and other various tools.
@@ -253,13 +237,14 @@
%prep
%setup -q
+sed -i -e "s!@LIBDIR@!%{_libdir}!" %{PATCH8}
+%patch8 -p1 -b .config
%patch1 -p1 -b .selinux-ia64
%patch2 -p1 -b .ppc-threading
%patch5 -p1
%patch3 -p1 -b .libdir
%patch4 -p1 -b .use-monodir
%patch6 -p1 -b .metadata
-
%patch7 -p0 -b .big-integer
%build
@@ -292,7 +277,8 @@
# This was removed upstream:
%{__rm} -fr $RPM_BUILD_ROOT%{monodir}/gac/Mono.Security.Win32/[12]*
-%{__rm} $RPM_BUILD_ROOT%{monodir}/*/Mono.Security.Win32.dll
+%{__rm} -rf $RPM_BUILD_ROOT%{monodir}/1.0/Mono.Security.Win32.dll
+%{__rm} -rf $RPM_BUILD_ROOT%{monodir}/2.0/Mono.Security.Win32.dll
%{__rm} $RPM_BUILD_ROOT%{_datadir}/libgc-mono/README*
%{__rm} $RPM_BUILD_ROOT%{_datadir}/libgc-mono/barrett_diagram
%{__rm} $RPM_BUILD_ROOT%{_datadir}/libgc-mono/*.html
@@ -326,16 +312,19 @@
%{_bindir}/monodir
%{_bindir}/mono-api-*
%{_bindir}/smcs
+%{_bindir}/mono-test-install
%mono_bin certmgr
%mono_bin chktrust
%mono_bin gacutil
%mono_bin gmcs
%mono_bin mcs
%mono_bin mozroots
+%mono_bin mconfig
%mono_bin setreg
%mono_bin sn
%mono_bin installvst
%mono_bin monolinker
+%{monodir}/1.0/transform.exe
%{_bindir}/mkbundle2
%{_libdir}/libmono.so.*
%{_libdir}/libMonoPosixHelper.so
@@ -351,6 +340,7 @@
%{_mandir}/man1/vbnc.1.gz
%{_mandir}/man1/monolinker.1.gz
%{_mandir}/man1/resgen.1.gz
+%{_mandir}/man1/mconfig.1.gz
%{_mandir}/man5/mono-config.5.gz
%dir %{monodir}
%dir %{monodir}/1.0
@@ -366,6 +356,8 @@
%gac_dll Mono.C5
%gac_dll Mono.Cairo
%{_libdir}/mono/gac/Mono.Cecil
+%{_libdir}/mono/gac/Mono.Cecil.Mdb
+%gac_dll Mono.Mozilla
%gac_dll Mono.CompilerServices.SymbolWriter
%gac_dll Mono.GetOptions
%gac_dll Mono.Posix
@@ -387,6 +379,7 @@
%config (noreplace) %{_sysconfdir}/mono/config
%config (noreplace) %{_sysconfdir}/mono/1.0/machine.config
%config (noreplace) %{_sysconfdir}/mono/2.0/machine.config
+%config (noreplace) %{_sysconfdir}/mono/mconfig/config.xml
%{_libdir}/libikvm-native.so
%mono_bin httpcfg
@@ -457,6 +450,7 @@
%{_libdir}/pkgconfig/dotnet.pc
%{_libdir}/pkgconfig/mono-cairo.pc
%{_libdir}/pkgconfig/mono.pc
+%{_libdir}/pkgconfig/cecil.pc
%{_includedir}/mono-1.0
%{_datadir}/mono-1.0/mono/cil/cil-opcodes.xml
%dir %{_datadir}/mono-1.0
@@ -516,6 +510,8 @@
%gac_dll System.Web
%gac_dll System.Runtime.Serialization.Formatters.Soap
%gac_dll System.Web.Services
+%gac_dll System.Web.Extensions.Design
+%gac_dll System.Web.Extensions
%mono_bin disco
%mono_bin soapsuds
%mono_bin_1 wsdl wsdl
@@ -576,6 +572,15 @@
%gac_dll IBM.Data.DB2
%changelog
+* Tue Dec 16 2007 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.2.6-4
+- bump new version
+- removed more redundant bits
+- url fix
+
+* Thu Nov 22 2007 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.2.6-1
+- bump to preview 2
+- removed redundant bits of the spec file
+
* Thu Nov 15 2007 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.2.5.2-2
- Added R libgdiplus to the winforms package. Fixes BZ 380131
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mono/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 11 Nov 2007 23:17:19 -0000 1.17
+++ sources 17 Dec 2007 00:59:27 -0000 1.18
@@ -1 +1 @@
-50b379ce60c1550dcd7be50bae25fa30 mono-1.2.5.2.tar.bz2
+391f85b4f962269e044ceac2b5235310 mono-1.2.6.tar.bz2
--- mono-libdir.patch DELETED ---
More information about the fedora-extras-commits
mailing list