OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 10-Nov-2006 08:51:22
Branch: HEAD Handle: 2006111007512200
Modified files:
openpkg-src/mono mono.patch mono.spec
Log:
upgrading package: mono 1.1.18 -> 1.2
Summary:
Revision Changes Path
1.14 +63 -57 openpkg-src/mono/mono.patch
1.42 +4 -3 openpkg-src/mono/mono.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mono/mono.patch
============================================================================
$ cvs diff -u -r1.13 -r1.14 mono.patch
--- openpkg-src/mono/mono.patch 24 Oct 2006 13:32:53 -0000 1.13
+++ openpkg-src/mono/mono.patch 10 Nov 2006 07:51:22 -0000 1.14
@@ -1,33 +1,37 @@
-Index: configure
---- configure.orig 2006-04-01 04:05:54 +0200
-+++ configure 2006-04-03 08:36:58 +0200
-@@ -35663,6 +35663,11 @@
- INTERP_SUPPORTED=no
- LIBC="libc.so.6"
- INTL="libc.so.6"
-+case "$host" in
-+ *-*-freebsd* )
-+ LIBC="libc.so"
-+ ;;
-+esac
- SQLITE="libsqlite.so.0"
- SQLITE3="libsqlite3.so.0"
- X11="libX11.so"
-Index: mono/mini/aot-runtime.c
---- mono/mini/aot-runtime.c.orig 2006-10-12 02:10:21 +0200
-+++ mono/mini/aot-runtime.c 2006-10-14 09:07:11 +0200
-@@ -10,6 +10,7 @@
+Index: mcs/jay/Makefile
+--- mcs/jay/Makefile.orig 2006-11-10 08:13:27 +0100
++++ mcs/jay/Makefile 2006-11-10 08:23:02 +0100
+@@ -2,7 +2,7 @@
+ SUBDIRS :=
+ include ../build/rules.make
+
+-LOCAL_CFLAGS = -DSKEL_DIRECTORY=\""$(prefix)/share/jay"\"
++LOCAL_CFLAGS = -DSKEL_DIRECTORY=\""$(prefix)/share/mono/jay"\"
+
+ sources = closure.c error.c lalr.c lr0.c main.c mkpar.c output.c reader.c \
+ symtab.c verbose.c warshall.c
+@@ -20,13 +20,13 @@
+ ifndef NO_INSTALL
+ install-local:
+ $(MKINSTALLDIRS) $(DESTDIR)$(prefix)/bin
+- $(MKINSTALLDIRS) $(DESTDIR)$(prefix)/share/jay
+- $(MKINSTALLDIRS) $(DESTDIR)$(prefix)/share/man/man1
++ $(MKINSTALLDIRS) $(DESTDIR)$(prefix)/share/mono/jay
++ $(MKINSTALLDIRS) $(DESTDIR)$(prefix)/man/man1
+ $(INSTALL_BIN) jay $(DESTDIR)$(prefix)/bin
+ for datafile in $(datafiles) ; do \
+- $(INSTALL_DATA) $$datafile $(DESTDIR)$(prefix)/share/jay ; \
++ $(INSTALL_DATA) $$datafile $(DESTDIR)$(prefix)/share/mono/jay ; \
+ done
+- $(INSTALL_DATA) jay.1 $(DESTDIR)$(prefix)/share/man/man1
++ $(INSTALL_DATA) jay.1 $(DESTDIR)$(prefix)/man/man1
- #include "config.h"
- #include <sys/types.h>
-+#include <sys/wait.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <string.h>
+ uninstall-local:
+ -rm -f $(DESTDIR)$(prefix)/bin/jay
Index: mono/Makefile.in
---- mono/Makefile.in.orig 2006-04-01 04:05:44 +0200
-+++ mono/Makefile.in 2006-04-03 08:41:32 +0200
-@@ -263,7 +263,7 @@
+--- mono/Makefile.in.orig 2006-11-02 19:15:52 +0100
++++ mono/Makefile.in 2006-11-10 08:02:45 +0100
+@@ -264,7 +264,7 @@
target_os = @target_os@
target_vendor = @target_vendor@
SUBDIRS = utils io-layer monoburg os cil metadata \
@@ -36,10 +40,21 @@
all: all-recursive
+Index: mono/mini/aot-runtime.c
+--- mono/mini/aot-runtime.c.orig 2006-11-02 19:09:51 +0100
++++ mono/mini/aot-runtime.c 2006-11-10 08:02:45 +0100
+@@ -10,6 +10,7 @@
+
+ #include "config.h"
+ #include <sys/types.h>
++#include <sys/wait.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <string.h>
Index: mono/mini/mini-x86.c
---- mono/mini/mini-x86.c.orig 2006-04-01 03:58:28 +0200
-+++ mono/mini/mini-x86.c 2006-04-03 08:36:58 +0200
-@@ -412,6 +412,34 @@
+--- mono/mini/mini-x86.c.orig 2006-11-02 19:09:51 +0100
++++ mono/mini/mini-x86.c 2006-11-10 08:02:45 +0100
+@@ -418,6 +418,34 @@
return cinfo;
}
@@ -74,10 +89,22 @@
/*
* mono_arch_get_argument_info:
* @csig: a method signature
+Index: mono/utils/mono-codeman.c
+--- mono/utils/mono-codeman.c.orig 2006-10-12 02:10:22 +0200
++++ mono/utils/mono-codeman.c 2006-11-10 08:02:45 +0100
+@@ -45,7 +45,7 @@
+ #endif
+ #endif
+
+-#ifdef __x86_64__
++#if defined(__x86_64__) && !defined(__FreeBSD__)
+ #define ARCH_MAP_FLAGS MAP_32BIT
+ #else
+ #define ARCH_MAP_FLAGS 0
Index: support/stdio.c
---- support/stdio.c.orig 2006-03-13 23:58:00 +0100
-+++ support/stdio.c 2006-04-03 08:36:58 +0200
-@@ -141,14 +141,14 @@
+--- support/stdio.c.orig 2006-11-02 19:09:53 +0100
++++ support/stdio.c 2006-11-10 08:02:45 +0100
+@@ -142,14 +142,14 @@
Mono_Posix_Stdlib_setvbuf (void* stream, void *buf, int mode, mph_size_t
size)
{
mph_return_if_size_t_overflow (size);
@@ -94,7 +121,7 @@
return errno == 0 ? 0 : -1;
}
-@@ -157,13 +157,13 @@
+@@ -158,13 +158,13 @@
{
mph_return_if_long_overflow (offset);
@@ -110,7 +137,7 @@
}
void*
-@@ -176,20 +176,20 @@
+@@ -177,20 +177,20 @@
gint32
Mono_Posix_Stdlib_fgetpos (void* stream, void *pos)
{
@@ -134,24 +161,3 @@
return errno == 0 ? 0 : -1;
}
-@@ -197,7 +197,7 @@
- Mono_Posix_Stdlib_clearerr (void* stream)
- {
- errno = 0;
-- clearerr (stream);
-+ clearerr ((FILE *)stream);
- return errno == 0 ? 0 : -1;
- }
-
-Index: mono/utils/mono-codeman.c
---- mono/utils/mono-codeman.c.orig 2006-10-12 02:10:22 +0200
-+++ mono/utils/mono-codeman.c 2006-10-24 14:47:36 +0200
-@@ -45,7 +45,7 @@
- #endif
- #endif
-
--#ifdef __x86_64__
-+#if defined(__x86_64__) && !defined(__FreeBSD__)
- #define ARCH_MAP_FLAGS MAP_32BIT
- #else
- #define ARCH_MAP_FLAGS 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mono/mono.spec
============================================================================
$ cvs diff -u -r1.41 -r1.42 mono.spec
--- openpkg-src/mono/mono.spec 24 Oct 2006 13:32:53 -0000 1.41
+++ openpkg-src/mono/mono.spec 10 Nov 2006 07:51:22 -0000 1.42
@@ -23,8 +23,8 @@
##
# package version
-%define V_major 1.1
-%define V_minor 18
+%define V_major 1
+%define V_minor 2
# package information
Name: mono
@@ -37,7 +37,7 @@
Group: Language
License: GPL
Version: %{V_major}.%{V_minor}
-Release: 20061024
+Release: 20061110
# list of sources
Source0: http://go-mono.com/sources/mono/mono-%{version}.tar.gz
@@ -131,6 +131,7 @@
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
'%config %{l_prefix}/etc/mono/*' \
+ '%config %{l_prefix}/etc/mono/*/*' \
'%not %dir %{l_prefix}/lib/pkgconfig'
%files -f files
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
