Author: wade
Date: 2007-11-09 14:57:58 -0500 (Fri, 09 Nov 2007)
New Revision: 89339
Added:
trunk/release/packaging/conf/win-4-i386-1
Modified:
trunk/release/packaging/bundles/PRE-RELEASE
trunk/release/packaging/conf/win-4-i386
trunk/release/packaging/defs/gluezilla
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/xsp/xsp.spec
Log:
Mono 1.2.6 preview related changes.
filelist updates,
fix gluezilla tag path
add a win32 box we have
Modified: trunk/release/packaging/bundles/PRE-RELEASE
===================================================================
--- trunk/release/packaging/bundles/PRE-RELEASE 2007-11-09 19:56:56 UTC (rev
89338)
+++ trunk/release/packaging/bundles/PRE-RELEASE 2007-11-09 19:57:58 UTC (rev
89339)
@@ -1,6 +1,6 @@
# Directory used when created go-mono.com/archive/<archive_version>
# This will need to be manually bumped each time on head... don't forget!!
-archive_version="1.2.5.1"
+archive_version="1.2.6"
bundle_urlname="preview"
Modified: trunk/release/packaging/conf/win-4-i386
===================================================================
--- trunk/release/packaging/conf/win-4-i386 2007-11-09 19:56:56 UTC (rev
89338)
+++ trunk/release/packaging/conf/win-4-i386 2007-11-09 19:57:58 UTC (rev
89339)
@@ -1,6 +1,5 @@
username=builder
-#hostname=x32-win-1.mono.lab.novell.com
-hostname=cygwin-mono.boston.ximian.com
+hostname=x32-win-1.mono.lab.novell.com
USE_ZIP_PKG=1
# Cygwin's ssh server doesn't load this information
# ... let's do it explicitly through sshutils
Added: trunk/release/packaging/conf/win-4-i386-1
===================================================================
--- trunk/release/packaging/conf/win-4-i386-1 2007-11-09 19:56:56 UTC (rev
89338)
+++ trunk/release/packaging/conf/win-4-i386-1 2007-11-09 19:57:58 UTC (rev
89339)
@@ -0,0 +1,7 @@
+username=builder
+hostname=cygwin-mono.boston.ximian.com
+USE_ZIP_PKG=1
+# Cygwin's ssh server doesn't load this information
+# ... let's do it explicitly through sshutils
+target_command_prefix='source /etc/profile;'
+
Modified: trunk/release/packaging/defs/gluezilla
===================================================================
--- trunk/release/packaging/defs/gluezilla 2007-11-09 19:56:56 UTC (rev
89338)
+++ trunk/release/packaging/defs/gluezilla 2007-11-09 19:57:58 UTC (rev
89339)
@@ -38,7 +38,7 @@
trunk/gluezilla
)
RELEASE_PATH=(
- tags/gluezilla-[[version]]
+ tags/mono-[[version]]/gluezilla
)
update_version_file () {
Modified: trunk/release/packaging/defs/mono
===================================================================
--- trunk/release/packaging/defs/mono 2007-11-09 19:56:56 UTC (rev 89338)
+++ trunk/release/packaging/defs/mono 2007-11-09 19:57:58 UTC (rev 89339)
@@ -338,8 +338,8 @@
POSTBUILD_STEP_NAME3="test-profiles"
POSTBUILD_STEP3 () {
- TEST_HARNESS_VERBOSE=1
- export TEST_HARNESS_VERBOSE
+ #TEST_HARNESS_VERBOSE=1
+ #export TEST_HARNESS_VERBOSE
#echo "Skipping..."
cd runtime
$make_path -k check
@@ -359,8 +359,8 @@
POSTBUILD_STEP_NAME5="test-swf"
POSTBUILD_STEP5 () {
- TEST_HARNESS_VERBOSE=1
- export TEST_HARNESS_VERBOSE
+ #TEST_HARNESS_VERBOSE=1
+ #export TEST_HARNESS_VERBOSE
DISPLAY=x64-linux-2.mono.lab.novell.com:1
export DISPLAY
Modified: trunk/release/packaging/rpm_defs/mono-basic/mono-basic.spec
===================================================================
--- trunk/release/packaging/rpm_defs/mono-basic/mono-basic.spec 2007-11-09
19:56:56 UTC (rev 89338)
+++ trunk/release/packaging/rpm_defs/mono-basic/mono-basic.spec 2007-11-09
19:57:58 UTC (rev 89339)
@@ -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://x64-linux-2.mono.lab.novell.com/builds/RELEASE/$p || true
- wget --tries=1 --timeout=10
http://x64-linux-2.mono.lab.novell.com/builds/HEAD/$p || true
+ wget --tries=1 --timeout=10
http://build.mono.lab.novell.com/builds/RELEASE/$p || true
+ wget --tries=1 --timeout=10
http://build.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-11-09
19:56:56 UTC (rev 89338)
+++ trunk/release/packaging/rpm_defs/mono-core/mono-core.spec 2007-11-09
19:57:58 UTC (rev 89339)
@@ -115,6 +115,7 @@
%_bindir/chktrust
%_bindir/gacutil
%_bindir/gmcs
+%_bindir/mono-test-install
%_bindir/mcs
%_bindir/smcs
%_bindir/mozroots
@@ -163,16 +164,16 @@
%_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
+%dir %_sysconfdir/mono
+%dir %_sysconfdir/mono/1.0
+%dir %_sysconfdir/mono/2.0
%dir %_prefix/lib/mono
%dir %_prefix/lib/mono/1.0
%dir %_prefix/lib/mono/2.0
%dir %_prefix/lib/mono/gac
-%config /etc/mono/config
-%config /etc/mono/1.0/machine.config
-%config /etc/mono/2.0/machine.config
+%config %_sysconfdir/mono/config
+%config %_sysconfdir/mono/1.0/machine.config
+%config %_sysconfdir/mono/2.0/machine.config
%_prefix/lib/mono/gac/Mono.C5
%_prefix/lib/mono/2.0/Mono.C5.dll
# ikvm helper
@@ -569,14 +570,20 @@
%_prefix/lib/mono/gac/System.Web.Services
%_prefix/lib/mono/1.0/System.Web.Services.dll
%_prefix/lib/mono/2.0/System.Web.Services.dll
+%_prefix/lib/mono/gac/System.Web.Extensions
+%_prefix/lib/mono/2.0/System.Web.Extensions.dll
+%_prefix/lib/mono/gac/System.Web.Extensions.Design
+%_prefix/lib/mono/2.0/System.Web.Extensions.Design.dll
# exes
%_prefix/lib/mono/1.0/disco.exe*
%_prefix/lib/mono/1.0/soapsuds.exe*
%_prefix/lib/mono/1.0/wsdl.exe*
%_prefix/lib/mono/2.0/wsdl.exe*
%_prefix/lib/mono/1.0/xsd.exe*
+%_prefix/lib/mono/2.0/mconfig.exe*
# shell wrappers
%_bindir/disco
+%_bindir/mconfig
%_bindir/soapsuds
%_bindir/wsdl
%_bindir/wsdl2
@@ -586,11 +593,12 @@
%_mandir/man1/soapsuds.1.gz
%_mandir/man1/wsdl.1.gz
%_mandir/man1/xsd.1.gz
-%config /etc/mono/browscap.ini
-%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
+%_mandir/man1/mconfig.1.gz
+%config %_sysconfdir/mono/browscap.ini
+%config %_sysconfdir/mono/mconfig/config.xml
+%config %_sysconfdir/mono/1.0/DefaultWsdlHelpGenerator.aspx
+%config %_sysconfdir/mono/2.0/DefaultWsdlHelpGenerator.aspx
+%config %_sysconfdir/mono/2.0/web.config
%package -n mono-data-oracle
Summary: Database connectivity for Mono
Group: Development/Languages/Mono
@@ -706,7 +714,6 @@
%defattr(-, root, root)
%_prefix/lib/mono/gac/FirebirdSql.Data.Firebird
%_prefix/lib/mono/1.0/FirebirdSql.Data.Firebird.dll
-#%_prefix/lib/mono/2.0/FirebirdSql.Data.Firebird.dll
%description -n mono-nunit
NUnit is a unit-testing framework for all .Net languages. Initially
@@ -732,14 +739,14 @@
%_prefix/bin/nunit-console2
%_prefix/lib/mono/1.0/nunit-console.exe*
%_prefix/lib/mono/2.0/nunit-console.exe*
-%_prefix/lib/mono/1.0/nunit.core.dll
-%_prefix/lib/mono/1.0/nunit.framework.dll
+%_prefix/lib/mono/gac/nunit.util
%_prefix/lib/mono/1.0/nunit.util.dll
-%_prefix/lib/mono/1.0/nunit.mocks.dll
%_prefix/lib/mono/gac/nunit.core
+%_prefix/lib/mono/1.0/nunit.core.dll
%_prefix/lib/mono/gac/nunit.framework
-%_prefix/lib/mono/gac/nunit.util
+%_prefix/lib/mono/1.0/nunit.framework.dll
%_prefix/lib/mono/gac/nunit.mocks
+%_prefix/lib/mono/1.0/nunit.mocks.dll
%_libdir/pkgconfig/mono-nunit.pc
%package -n mono-devel
Summary: Mono development tools
Modified: trunk/release/packaging/rpm_defs/xsp/xsp.spec
===================================================================
--- trunk/release/packaging/rpm_defs/xsp/xsp.spec 2007-11-09 19:56:56 UTC
(rev 89338)
+++ trunk/release/packaging/rpm_defs/xsp/xsp.spec 2007-11-09 19:57:58 UTC
(rev 89339)
@@ -84,6 +84,10 @@
%{_prefix}/lib/mono/1.0/mod-mono-server.exe
%{_prefix}/lib/mono/gac/mod-mono-server2
%{_prefix}/lib/mono/2.0/mod-mono-server2.exe
+%{_prefix}/lib/mono/gac/fastcgi-mono-server
+%{_prefix}/lib/mono/1.0/fastcgi-mono-server.exe
+%{_prefix}/lib/mono/gac/fastcgi-mono-server2
+%{_prefix}/lib/mono/2.0/fastcgi-mono-server2.exe
%doc NEWS README
# auto dep/req generation for older distros (it will take a while for the
.config scanning to get upstream)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
