rpms/mono/devel mono-1.1.17.1-use-monodir.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 mono.spec, 1.43, 1.44 sources, 1.11, 1.12

Fri Sep 1 15:19:06 UTC 2006

Author: alexl

Update of /cvs/dist/rpms/mono/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11054

Modified Files:
	.cvsignore mono.spec sources 
Added Files:
	mono-1.1.17.1-use-monodir.patch 
Log Message:
* Fri Sep  1 2006 Alexander Larsson <alexl at redhat.com> - 1.1.17.1-1
- update to 1.1.17.1



mono-1.1.17.1-use-monodir.patch:
 mono-service.in |    2 +-
 script.in       |    2 +-
 script_umask.in |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE mono-1.1.17.1-use-monodir.patch ---
--- mono-1.1.17.1/scripts/script.in.use-monodir	2006-08-25 21:35:14.000000000 +0200
+++ mono-1.1.17.1/scripts/script.in	2006-09-01 14:57:01.000000000 +0200
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @bindir@/@mono_interp@ $MONO_OPTIONS @mono_instdir@/@framework_version@/@exe_name at .exe "$@"
+exec @bindir@/@mono_interp@ $MONO_OPTIONS `@bindir@/monodir`/@framework_version@/@exe_name at .exe "$@"
--- mono-1.1.17.1/scripts/mono-service.in.use-monodir	2006-08-25 21:35:14.000000000 +0200
+++ mono-1.1.17.1/scripts/mono-service.in	2006-09-01 14:57:20.000000000 +0200
@@ -29,4 +29,4 @@
 fi
 
 export MONO_DISABLE_SHM=1
-exec @bindir@/@mono_interp@ $MONO_OPTIONS @mono_instdir@/@framework_version@/@exe_name at .exe $args </dev/null >& /dev/null &
+exec @bindir@/@mono_interp@ $MONO_OPTIONS `@bindir@/monodir`/@framework_version@/@exe_name at .exe $args </dev/null >& /dev/null &
--- mono-1.1.17.1/scripts/script_umask.in.use-monodir	2006-08-25 21:35:14.000000000 +0200
+++ mono-1.1.17.1/scripts/script_umask.in	2006-09-01 14:57:27.000000000 +0200
@@ -1,3 +1,3 @@
 #!/bin/sh
 umask 077
-exec @bindir@/@mono_interp@ $MONO_OPTIONS @mono_instdir@/@framework_version@/@exe_name at .exe "$@"
+exec @bindir@/@mono_interp@ $MONO_OPTIONS `@bindir@/monodir`/@framework_version@/@exe_name at .exe "$@"


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mono/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	10 Aug 2006 09:44:06 -0000	1.11
+++ .cvsignore	1 Sep 2006 15:19:04 -0000	1.12
@@ -1 +1 @@
-mono-1.1.16.1.tar.gz
+mono-1.1.17.1.tar.gz


Index: mono.spec
===================================================================
RCS file: /cvs/dist/rpms/mono/devel/mono.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- mono.spec	18 Aug 2006 14:01:24 -0000	1.43
+++ mono.spec	1 Sep 2006 15:19:04 -0000	1.44
@@ -1,6 +1,6 @@
 Name:           mono
-Version:        1.1.16.1
-Release:        2%{?dist}
+Version:        1.1.17.1
+Release:        1%{?dist}
 Summary:        a .NET runtime environment
 
 Group:          Development/Languages
@@ -30,7 +30,7 @@
 Patch1: mono-1.1.13.4-selinux-ia64.patch
 Patch2: mono-1.1.13.4-ppc-threading.patch
 Patch3: mono-libdir.patch
-Patch4: mono-1.1.16.1-use-monodir.patch
+Patch4: mono-1.1.17.1-use-monodir.patch
 
 %description
 The Mono runtime implements a JIT engine for the ECMA CLI
@@ -53,6 +53,10 @@
 tools and libraries (corlib, XML, System.Security, ZipLib,
 I18N, Cairo and Mono.*).
 
+# Mono-basic was removed in 1.1.17
+Obsoletes:      mono-basic
+Provides:       mono-basic
+
 %package devel
 Summary:        Development tools for Mono
 Group:          Development/Languages
@@ -107,16 +111,6 @@
 This allows you to compile and run JScript.NET application and
 assemblies.
 
-%package basic
-Summary:        Visual Basic .NET support for Mono
-Group:          Development/Languages
-Requires:       mono-core = %{version}-%{release}
-
-%description basic
-This package contains the Visual Basic .NET compiler and language
-runtime. This allows you to compile and run VB.NET application and
-assemblies.
-
 %package extras
 Summary:        Provides the infrastructure for running and building daemons and services with Mono as well as various stub assemblies
 Group:          Development/Languages
@@ -277,6 +271,8 @@
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/mono-find-provides
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/mono-find-requires
 
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/mbas
+
 # This was removed upstream:
 %{__rm} -fr $RPM_BUILD_ROOT%{monodir}/gac/Mono.Security.Win32/[12]*
 %{__rm} $RPM_BUILD_ROOT%{monodir}/*/Mono.Security.Win32.dll
@@ -346,6 +342,7 @@
 %gac_dll System.Security
 %gac_dll System.Xml
 %gac_dll cscompmgd
+%gac_dll CustomMarshalers
 %{monodir}/?.0/mscorlib.dll
 %{monodir}/?.0/mscorlib.dll.mdb
 %dir /etc/mono
@@ -444,17 +441,12 @@
 %mono_bin mjs
 %gac_dll Microsoft.JScript
 
-%files basic
-%defattr(-,root,root,-)
-%mono_bin mbas
-%gac_dll Microsoft.VisualBasic
-%{_mandir}/man1/mbas.1.gz
-
 %files extras
 %defattr(-,root,root,-)
 %{_mandir}/man1/mono-service.1.gz
 %mono_bin_1 mono-service mono-service
-%{_bindir}/mono-service2
+%mono_bin_2 mono-service2 mono-service
+%{monodir}/gac/mono-service
 
 %gac_dll System.Management
 %gac_dll System.Messaging
@@ -532,6 +524,9 @@
 %gac_dll IBM.Data.DB2
 
 %changelog
+* Fri Sep  1 2006 Alexander Larsson <alexl at redhat.com> - 1.1.17.1-1
+- update to 1.1.17.1
+
 * Fri Aug 18 2006 Alexander Larsson <alexl at redhat.com> - 1.1.16.1-2
 - Move gac to libdir to be multilib compat
 - rename mono-devtools back to mono-devel


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mono/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	10 Aug 2006 09:44:06 -0000	1.11
+++ sources	1 Sep 2006 15:19:04 -0000	1.12
@@ -1 +1 @@
-11556607ba74cae225d9c73aef09e5e3  mono-1.1.16.1.tar.gz
+072cb3de1f19cbebd6034f7a5cff1292  mono-1.1.17.1.tar.gz


