Author: wade
Date: 2007-09-05 17:03:16 -0400 (Wed, 05 Sep 2007)
New Revision: 85383
Modified:
trunk/release/packaging/conf/suse-100-x86_64
trunk/release/packaging/defs/mono
trunk/release/packaging/rpm_defs/mono-basic/mono-basic.spec
trunk/release/packaging/rpm_defs/mono-core/mono-core.spec
trunk/release/packaging/rpm_defs/olive/olive.spec
Log:
mono-basic.spec:
-Provo urls instead of Boston machine
olive.spec:
-use %_prefix, filelist update, use License tag
suse-100-x86_64:
-source profile (this is needed for suse based distros)
mono-core:
-post 1.2.5 filelist updates
Modified: trunk/release/packaging/conf/suse-100-x86_64
===================================================================
--- trunk/release/packaging/conf/suse-100-x86_64 2007-09-05 20:58:39 UTC
(rev 85382)
+++ trunk/release/packaging/conf/suse-100-x86_64 2007-09-05 21:03:16 UTC
(rev 85383)
@@ -2,6 +2,7 @@
hostname=c201.mono.lab.novell.com
root_dir=/share/jails/suse-100-x86_64-root-0
chroot_path=/usr/bin/chroot
+target_command_prefix=". /etc/profile;"
YAST_REPO=1
YAST_INSTALL=1
Modified: trunk/release/packaging/defs/mono
===================================================================
--- trunk/release/packaging/defs/mono 2007-09-05 20:58:39 UTC (rev 85382)
+++ trunk/release/packaging/defs/mono 2007-09-05 21:03:16 UTC (rev 85383)
@@ -161,7 +161,7 @@
#export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
# Use /opt/mono for prefix. Even though env vars can be used for
relocation, this will help
- ./configure --prefix=/opt/mono || exit 1
+ ./configure --prefix=/opt/mono --with-moonlight=yes || exit 1
make || exit 1
rm -Rf /tmp/temp_install
@@ -187,7 +187,7 @@
# Change offsize from 64 to 32 in configure
# Removed -mt option from gthread .pc file
- ./configure --prefix=/opt/mono
+ ./configure --prefix=/opt/mono --with-moonlight=yes
gmake || exit 1
rm -Rf $build_location/temp_install
@@ -202,7 +202,7 @@
win_4_i386_ZIP_BUILD () {
- ./configure --prefix=/tmp/install
+ ./configure --prefix=/tmp/install --with-moonlight=yes
make || exit 1
make install || exit 1
@@ -269,7 +269,7 @@
#export CFLAGS="-gdwarf-2"
# Need a version here...
- ./configure --prefix=$MONO_PREFIX --with-preview=yes
+ ./configure --prefix=$MONO_PREFIX --with-moonlight=yes
make || exit 1
@@ -285,7 +285,7 @@
debian_ZIP_BUILD () {
- ./configure --prefix=/tmp/install
+ ./configure --prefix=/tmp/install --with-moonlight=yes
make || exit 1
make install || exit 1
Modified: trunk/release/packaging/rpm_defs/mono-basic/mono-basic.spec
===================================================================
--- trunk/release/packaging/rpm_defs/mono-basic/mono-basic.spec 2007-09-05
20:58:39 UTC (rev 85382)
+++ trunk/release/packaging/rpm_defs/mono-basic/mono-basic.spec 2007-09-05
21:03:16 UTC (rev 85383)
@@ -71,8 +71,8 @@
# Check for binaries built on windows (for building on monobuild)
f="mono-basic-%{version}-0.win4.novell.x86.zip"
p="win-4-i386/mono-basic/%{version}/files/downloads/$f"
- wget --tries=1 --timeout=10
http://monobuild2.boston.ximian.com/builds/RELEASE/$p || true
- wget --tries=1 --timeout=10
http://monobuild2.boston.ximian.com/builds/HEAD/$p || true
+ wget --tries=1 --timeout=10
http://c243.mono.lab.novell.com/builds/RELEASE/$p || true
+ wget --tries=1 --timeout=10
http://c243.mono.lab.novell.com/builds/HEAD/$p || true
# If we have windows built binaries, inject them into the package (to
provide the 1.0 runtime)
if [ -e "$f" ] ; then
Modified: trunk/release/packaging/rpm_defs/mono-core/mono-core.spec
===================================================================
--- trunk/release/packaging/rpm_defs/mono-core/mono-core.spec 2007-09-05
20:58:39 UTC (rev 85382)
+++ trunk/release/packaging/rpm_defs/mono-core/mono-core.spec 2007-09-05
21:03:16 UTC (rev 85383)
@@ -153,6 +153,7 @@
%_prefix/lib/mono/gac/System.Xml
%_prefix/lib/mono/1.0/System.Xml.dll
%_prefix/lib/mono/2.0/System.Xml.dll
+%_prefix/lib/mono/gac/System.Xml.Core
%_prefix/lib/mono/gac/System
%_prefix/lib/mono/1.0/System.dll
%_prefix/lib/mono/2.0/System.dll
@@ -160,6 +161,8 @@
%_prefix/lib/mono/2.0/System.Configuration.dll
%_prefix/lib/mono/1.0/mscorlib.dll*
%_prefix/lib/mono/2.0/mscorlib.dll*
+%_prefix/lib/mono/2.1/mscorlib.dll*
+%_prefix/lib/mono/2.1/smcs.exe*
%dir /etc/mono
%dir /etc/mono/1.0
%dir /etc/mono/2.0
@@ -376,7 +379,7 @@
%_prefix/lib/mono/1.0/System.Drawing.Design.dll
%_prefix/lib/mono/2.0/System.Drawing.Design.dll
# TODO: Post 1.2.5:
-#%_prefix/lib/mono/gac/Mono.Mozilla
+%_prefix/lib/mono/gac/Mono.Mozilla
%package -n ibm-data-db2
Summary: Database connectivity for DB2
@@ -585,6 +588,7 @@
%config /etc/mono/1.0/DefaultWsdlHelpGenerator.aspx
%config /etc/mono/2.0/DefaultWsdlHelpGenerator.aspx
%config /etc/mono/2.0/web.config
+%_prefix/lib/mono/gac/System.Web.Extensions
%package -n mono-data-oracle
Summary: Database connectivity for Mono
Group: Development/Languages/Mono
@@ -881,6 +885,7 @@
%_prefix/lib/mono/gac/Microsoft.Build.Engine
%_prefix/lib/mono/2.0/Microsoft.Build.Engine.dll
%_prefix/lib/mono/gac/Mono.Cecil
+%_prefix/lib/mono/gac/Mono.Cecil.Mdb
%_bindir/monograph
%_prefix/include/mono-1.0
%_libdir/libmono-profiler-cov.*
@@ -888,6 +893,7 @@
%_libdir/pkgconfig/mono.pc
%_libdir/pkgconfig/dotnet.pc
%_libdir/pkgconfig/mono-cairo.pc
+%_libdir/pkgconfig/cecil.pc
%_mandir/man1/monoburg.*
%_prefix/share/mono-1.0/mono/cil/cil-opcodes.xml
# dirs
@@ -941,7 +947,8 @@
%configure \
--with-jit=yes \
--with-ikvm=yes \
- --with-sigaltstack=no
+ --with-sigaltstack=no \
+ --with-moonlight=yes
make
%install
@@ -1016,6 +1023,8 @@
# 1.2.4 changes
rm -f ./usr/lib/mono/1.0/culevel.exe*
+# Post 1.2.5
+rm -f ./usr/lib/mono/1.0/transform.exe
%clean
rm -rf ${RPM_BUILD_ROOT}
Modified: trunk/release/packaging/rpm_defs/olive/olive.spec
===================================================================
--- trunk/release/packaging/rpm_defs/olive/olive.spec 2007-09-05 20:58:39 UTC
(rev 85382)
+++ trunk/release/packaging/rpm_defs/olive/olive.spec 2007-09-05 21:03:16 UTC
(rev 85383)
@@ -6,7 +6,7 @@
Release: 1.novell
Vendor: Novell, Inc.
Distribution: Novell Packages for SuSE Linux 10.0 / i586
-Copyright: LGPL
+License: LGPL
BuildRoot: /var/tmp/%{name}-%{version}-root
BuildArch: noarch
@@ -23,52 +23,51 @@
%files
%defattr(-, root, root)
%doc README
-/usr/bin/svcutil
-/usr/lib/mono/3.0/svcutil.exe*
-/usr/bin/client-proxy-gen
-/usr/lib/mono/3.0/client-proxy-gen.exe*
-/usr/bin/sts
-/usr/lib/mono/3.0/sts.exe*
-/usr/bin/xamlc
-/usr/lib/mono/3.0/xamlc.exe*
-/usr/lib/mono/gac/PresentationFramework
-/usr/lib/mono/3.0/PresentationFramework.dll*
-/usr/lib/mono/gac/WindowsBase
-/usr/lib/mono/3.0/WindowsBase.dll*
-/usr/lib/mono/gac/System.IdentityModel
-/usr/lib/mono/3.0/System.IdentityModel.dll*
-/usr/lib/mono/gac/System.IdentityModel.Selectors
-/usr/lib/mono/3.0/System.IdentityModel.Selectors.dll*
-/usr/lib/mono/gac/System.Workflow.Runtime
-/usr/lib/mono/3.0/System.Workflow.Runtime.dll*
-/usr/lib/mono/gac/System.Runtime.Serialization
-/usr/lib/mono/3.0/System.Runtime.Serialization.dll*
-/usr/lib/mono/gac/System.ServiceModel
-/usr/lib/mono/3.0/System.ServiceModel.dll*
-/usr/lib/mono/gac/System.Workflow.Activities
-/usr/lib/mono/3.0/System.Workflow.Activities.dll*
-/usr/lib/mono/gac/System.Workflow.ComponentModel
-/usr/lib/mono/3.0/System.Workflow.ComponentModel.dll*
-/usr/lib/mono/gac/System.Xml.Linq
-/usr/lib/mono/3.0/System.Xml.Linq.dll*
-/usr/lib/mono/gac/System.ServiceModel.Web
-/usr/lib/mono/3.0/System.ServiceModel.Web*
-/usr/lib/mono/gac/PresentationCore
-/usr/lib/mono/3.0/PresentationCore*
-/usr/lib/mono/gac/System.SilverLight
-/usr/lib/mono/3.0/System.SilverLight*
-/usr/lib/mono/gac/agmono
-/usr/lib/mono/3.0/agmono*
-/usr/lib/mono/gac/agclr
-/usr/lib/mono/3.0/agclr*
-/usr/lib/pkgconfig/*.pc
+%_prefix/bin/svcutil
+%_prefix/lib/mono/3.0/svcutil.exe*
+%_prefix/bin/client-proxy-gen
+%_prefix/lib/mono/3.0/client-proxy-gen.exe*
+%_prefix/bin/sts
+%_prefix/lib/mono/3.0/sts.exe*
+%_prefix/bin/xamlc
+%_prefix/lib/mono/3.0/xamlc.exe*
+%_prefix/lib/mono/gac/PresentationFramework
+%_prefix/lib/mono/3.0/PresentationFramework.dll*
+%_prefix/lib/mono/gac/WindowsBase
+%_prefix/lib/mono/3.0/WindowsBase.dll*
+%_prefix/lib/mono/gac/System.IdentityModel
+%_prefix/lib/mono/3.0/System.IdentityModel.dll*
+%_prefix/lib/mono/gac/System.IdentityModel.Selectors
+%_prefix/lib/mono/3.0/System.IdentityModel.Selectors.dll*
+%_prefix/lib/mono/gac/System.Workflow.Runtime
+%_prefix/lib/mono/3.0/System.Workflow.Runtime.dll*
+%_prefix/lib/mono/gac/System.Runtime.Serialization
+%_prefix/lib/mono/3.0/System.Runtime.Serialization.dll*
+%_prefix/lib/mono/gac/System.ServiceModel
+%_prefix/lib/mono/3.0/System.ServiceModel.dll*
+%_prefix/lib/mono/gac/System.Workflow.Activities
+%_prefix/lib/mono/3.0/System.Workflow.Activities.dll*
+%_prefix/lib/mono/gac/System.Workflow.ComponentModel
+%_prefix/lib/mono/3.0/System.Workflow.ComponentModel.dll*
+%_prefix/lib/mono/gac/System.Xml.Linq
+%_prefix/lib/mono/gac/System.Data.Linq
+%_prefix/lib/mono/gac/System.ServiceModel.Web
+%_prefix/lib/mono/gac/PresentationCore
+%_prefix/lib/mono/3.0/PresentationCore*
+%_prefix/lib/mono/gac/System.SilverLight
+%_prefix/lib/mono/3.0/System.SilverLight*
+%_prefix/lib/mono/gac/agmono
+%_prefix/lib/mono/3.0/agmono*
+%_prefix/lib/mono/gac/agclr
+%_prefix/lib/mono/3.0/agclr*
+%_prefix/lib/pkgconfig/*.pc
%prep
%setup -q
%build
-./configure --prefix=/usr
+./configure --prefix=%_prefix
make
%install
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
