Author: wade
Date: 2006-01-13 20:47:52 -0500 (Fri, 13 Jan 2006)
New Revision: 55565
Added:
trunk/release/packaging/conf/sles-9-s390
trunk/release/packaging/conf/sles-9-s390x
Modified:
trunk/release/conf/gtk-sharp-2.0/ximian-build.conf
trunk/release/conf/gtk-sharp/ximian-build.conf
trunk/release/packaging/conf/sunos-8-sparc
trunk/release/packaging/defs/gtk-sharp
trunk/release/packaging/defs/libgdiplus-1.1
trunk/release/packaging/defs/mod_mono
trunk/release/packaging/install-deps
trunk/release/packaging/jail-do
trunk/release/packaging/mktarball
trunk/release/packaging/status/
Log:
gtk-sharp[2] packaging restructures (Thanks ubuntu/debian!)
Add some jail info
Minor build script fixes
Add support for s390 (even though we don't have jails yet)
Modified: trunk/release/conf/gtk-sharp/ximian-build.conf
===================================================================
--- trunk/release/conf/gtk-sharp/ximian-build.conf 2006-01-14 01:06:48 UTC
(rev 55564)
+++ trunk/release/conf/gtk-sharp/ximian-build.conf 2006-01-14 01:47:52 UTC
(rev 55565)
@@ -12,6 +12,9 @@
<i>libgnomecanvas-devel</i>
<i>libgsf-devel</i>
<i>libgnomeui-devel</i>
+ <!-- Not all our distros support these
+ <i>libgda-devel</i>
+ <i>libgnomedb-devel</i> -->
<i>mono-core</i>
<i>mono-devel</i>
<i>pkgconfig</i>
@@ -54,22 +57,18 @@
</builddep>
<package id="default">
- <name>gtk-sharp</name>
+ <name>gtk-sharp-complete</name>
<psdata id="group">Development/Libraries</psdata>
- <files>
- <i>[[usrlibdir]]/*.so</i>
- <i>[[usrprefix]]/bin/gconfsharp-schemagen.exe</i>
- <i>[[usrprefix]]/bin/gconfsharp-schemagen</i>
- <i>[[usrprefix]]/lib/mono/gac</i>
- <i>[[usrprefix]]/lib/mono/gtk-sharp</i>
- <i>[[usrlibdir]]/pkgconfig/*-sharp.pc</i>
- </files>
-
- <dep id="requires">
- <i>librsvg-2.so.2[[libmark]]</i>
- <i>libgtkhtml-[[gtkhtmlver]][[libmark]]</i>
+ <dep id="requires">
+ <i>gconf-sharp = [[fullversion]]</i>
+ <i>glade-sharp = [[fullversion]]</i>
+ <i>glib-sharp = [[fullversion]]</i>
+ <i>gnome-sharp = [[fullversion]]</i>
+ <i>gtk-sharp = [[fullversion]]</i>
+ <i>gtk-sharp-gapi = [[fullversion]]</i>
+ <i>vte-sharp = [[fullversion]]</i>
</dep>
<docs>
@@ -110,7 +109,7 @@
</script>
<description>
- <h>GTK+ and GNOME bindings for Mono</h>
+ <h>GTK+ and GNOME bindings for Mono (virtual package)</h>
<p>
This package provides a library that allows you to build
fully native graphical GNOME applications using Mono. Gtk#
@@ -118,6 +117,7 @@
toolkit used in GNOME. It includes bindings for Gtk, Atk,
Pango, Gdk, libgnome, libgnomeui and libgnomecanvas. Gtk#
1.x binds GTK+ 2.2.
+ (Virtual package which depends on all gtk-sharp subpackages)
</p>
</description>
</package>
@@ -147,7 +147,9 @@
<i>perl-XML-LibXML</i>
<i>perl-XML-NamespaceSupport</i>
<i>perl-XML-SAX</i>
- <i>gtk-sharp = [[fullversion]]</i>
+ <!-- don't think this is needed
+ <i>gtk-sharp = [[fullversion]]</i>
+ -->
</dep>
<description>
@@ -161,6 +163,184 @@
</p>
</description>
</package>
+
+ <package id="glade-sharp">
+ <name>glade-sharp</name>
+
+ <psdata id="group">Development/Libraries</psdata>
+
+ <files>
+ <i>[[usrprefix]]/lib/mono/gac/glade-sharp</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp/glade-sharp.dll</i>
+
+ <i>[[usrlibdir]]/libgladesharpglue.so</i>
+
+ <i>[[usrlibdir]]/pkgconfig/glade-sharp.pc</i>
+ </files>
+
+ <description>
+ <h>Mono bindings for glade</h>
+ <p>
+ This package contains Mono bindings for glade.
+ </p>
+ </description>
+ </package>
+
+ <package id="vte-sharp">
+ <name>vte-sharp</name>
+
+ <psdata id="group">Development/Libraries</psdata>
+
+ <files>
+ <i>[[usrprefix]]/lib/mono/gac/vte-sharp</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp/vte-sharp.dll</i>
+
+ <i>[[usrlibdir]]/pkgconfig/vte-sharp.pc</i>
+ </files>
+
+ <description>
+ <h>Mono bindings for vte</h>
+ <p>
+ This package contains Mono bindings for vte.
+ </p>
+ </description>
+ </package>
+
+ <package id="glib-sharp">
+ <name>glib-sharp</name>
+
+ <psdata id="group">Development/Libraries</psdata>
+
+ <files>
+ <i>[[usrprefix]]/lib/mono/gac/glib-sharp</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp/glib-sharp.dll</i>
+
+ <i>[[usrlibdir]]/libglibsharpglue.so</i>
+
+ <!-- <i>[[usrlibdir]]/pkgconfig/glib-sharp.pc</i> -->
+ </files>
+
+ <description>
+ <h>Mono bindings for glib</h>
+ <p>
+ This package contains Mono bindings for glib.
+ </p>
+ </description>
+ </package>
+
+ <package id="gnome-sharp">
+ <name>gnome-sharp</name>
+
+ <psdata id="group">Development/Libraries</psdata>
+
+ <files>
+ <i>[[usrprefix]]/lib/mono/gac/art-sharp</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp/art-sharp.dll</i>
+
+ <!-- Not all our distros support these
+ <i>[[usrprefix]]/lib/mono/gac/gda-sharp</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp/gda-sharp.dll</i>
+ <i>[[usrprefix]]/lib/mono/gac/gnomedb-sharp</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp/gnomedb-sharp.dll</i>
+ <i>[[usrlibdir]]/pkgconfig/gda-sharp.pc</i>
+ <i>[[usrlibdir]]/pkgconfig/gnomedb-sharp.pc</i> -->
+
+ <i>[[usrprefix]]/lib/mono/gac/gnome-sharp</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp/gnome-sharp.dll</i>
+
+ <i>[[usrprefix]]/lib/mono/gac/gtkhtml-sharp</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp/gtkhtml-sharp.dll</i>
+
+ <i>[[usrprefix]]/lib/mono/gac/rsvg-sharp</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp/rsvg-sharp.dll</i>
+
+ <i>[[usrlibdir]]/libgnomesharpglue.so</i>
+
+ <i>[[usrlibdir]]/pkgconfig/art-sharp.pc</i>
+ <i>[[usrlibdir]]/pkgconfig/gnome-sharp.pc</i>
+ <i>[[usrlibdir]]/pkgconfig/gtkhtml-sharp.pc</i>
+ <i>[[usrlibdir]]/pkgconfig/rsvg-sharp.pc</i>
+ </files>
+
+ <dep id="requires">
+ <i>libgtkhtml-[[gtkhtmlver]][[libmark]]</i>
+ <i>librsvg-2.so.2[[libmark]]</i>
+ </dep>
+
+ <description>
+ <h>Mono bindings for various Gnome libraries</h>
+ <p>
+ This package contains Mono bindings for several Gnome libraries.
+ Included are art, gda, gnomdb, gnome, gtkthml, and rsvg.
+ </p>
+ </description>
+ </package>
+
+ <package id="gtk-sharp">
+ <name>gtk-sharp</name>
+
+ <psdata id="group">Development/Libraries</psdata>
+
+ <files>
+ <i>[[usrprefix]]/lib/mono/gac/atk-sharp</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp/atk-sharp.dll</i>
+
+ <i>[[usrprefix]]/lib/mono/gac/gdk-sharp</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp/gdk-sharp.dll</i>
+
+ <i>[[usrprefix]]/lib/mono/gac/gtk-sharp</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp/gtk-sharp.dll</i>
+
+ <i>[[usrprefix]]/lib/mono/gac/pango-sharp</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp/pango-sharp.dll</i>
+
+ <i>[[usrlibdir]]/libgdksharpglue.so</i>
+ <i>[[usrlibdir]]/libgtksharpglue.so</i>
+ <i>[[usrlibdir]]/libpangosharpglue.so</i>
+
+ <i>[[usrlibdir]]/pkgconfig/gtk-sharp.pc</i>
+ </files>
+
+ <description>
+ <h>Mono bindings for gtk+</h>
+ <p>
+ This package contains Mono bindings for gtk+, gdk, atk, and pango.
+ </p>
+ </description>
+ </package>
+
+ <package id="gconf-sharp">
+ <name>gconf-sharp</name>
+
+ <psdata id="group">Development/Libraries</psdata>
+
+ <files>
+ <i>[[usrprefix]]/bin/gconfsharp-schemagen</i>
+ <i>[[usrprefix]]/bin/gconfsharp-schemagen.exe</i>
+
+ <i>[[usrprefix]]/lib/mono/gac/gconf-sharp</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp/gconf-sharp.dll</i>
+
+ <i>[[usrprefix]]/lib/mono/gac/gconf-sharp-peditors</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp/gconf-sharp-peditors.dll</i>
+
+ <i>[[usrlibdir]]/pkgconfig/gconf-sharp.pc</i>
+ </files>
+
+ <description>
+ <h>Mono bindings for gconf</h>
+ <p>
+ This package contains Mono bindings for gconf and gconf peditors.
+ </p>
+ </description>
+ </package>
+
+
+
+
+
+
+
</build>
</targetset>
Modified: trunk/release/conf/gtk-sharp-2.0/ximian-build.conf
===================================================================
--- trunk/release/conf/gtk-sharp-2.0/ximian-build.conf 2006-01-14 01:06:48 UTC
(rev 55564)
+++ trunk/release/conf/gtk-sharp-2.0/ximian-build.conf 2006-01-14 01:47:52 UTC
(rev 55565)
@@ -63,33 +63,23 @@
</builddep>
<package id="default">
- <name>gtk-sharp2</name>
+ <name>gtk-sharp2-complete</name>
<psdata id="group">Development/Libraries</psdata>
- <files>
- <i>[[usrlibdir]]/*.so</i>
- <i>%dir [[usrprefix]]/lib/gtk-sharp-2.0</i>
- <i>[[usrprefix]]/lib/gtk-sharp-2.0/gconfsharp-schemagen.exe</i>
- <i>[[usrprefix]]/bin/gconfsharp2-schemagen</i>
- <i>[[usrprefix]]/lib/mono/gac</i>
- <i>[[usrprefix]]/lib/mono/gtk-sharp-2.0</i>
- <i>[[usrlibdir]]/pkgconfig/*-sharp-2.0.pc</i>
- <i>[[usrlibdir]]/pkgconfig/gtk-dotnet-2.0.pc</i>
- <i>[[usrprefix]]/lib/monodoc</i>
- </files>
-
+ <files />
+
<dep id="requires">
- <i>librsvg-2.so.2[[libmark]]</i>
- <i>libgtkhtml-[[gtkhtmlver]][[libmark]]</i>
+ <i>gconf-sharp2 = [[fullversion]]</i>
+ <i>glade-sharp2 = [[fullversion]]</i>
+ <i>glib-sharp2 = [[fullversion]]</i>
+ <i>gnome-sharp2 = [[fullversion]]</i>
+ <i>gtk-sharp2 = [[fullversion]]</i>
+ <i>gtk-sharp2-doc = [[fullversion]]</i>
+ <i>gtk-sharp2-gapi = [[fullversion]]</i>
+ <i>vte-sharp2 = [[fullversion]]</i>
</dep>
- <docs>
- <i>COPYING</i>
- <i>ChangeLog</i>
- <i>README</i>
- </docs>
-
<script id="find_provides">
<i>
<![CDATA[
@@ -122,14 +112,14 @@
</script>
<description>
- <h>GTK+ and GNOME bindings for Mono</h>
+ <h>GTK+ and GNOME bindings for Mono (virtual package)</h>
<p>
- This package provides a library that allows you to build
+ Gtk# is a library that allows you to build
fully native graphical GNOME applications using Mono. Gtk#
is a binding to GTK+, the cross platform user interface
toolkit used in GNOME. It includes bindings for Gtk, Atk,
- Pango, Gdk, libgnome, libgnomeui and libgnomecanvas. Gtk#
- 2.3.x binds GTK+ 2.4.
+ Pango, Gdk, libgnome, libgnomeui and libgnomecanvas.
+ (Virtual package which depends on all gtk-sharp2 subpackages)
</p>
</description>
</package>
@@ -157,7 +147,8 @@
<i>perl-XML-LibXML</i>
<i>perl-XML-NamespaceSupport</i>
<i>perl-XML-SAX</i>
- <i>gtk-sharp2 = [[fullversion]]</i>
+ <!-- don't think this is needed
+ <i>gtk-sharp2 = [[fullversion]]</i> -->
</dep>
<description>
@@ -171,6 +162,208 @@
</p>
</description>
</package>
+
+ <package id="glade-sharp2">
+ <name>glade-sharp2</name>
+
+ <psdata id="group">Development/Libraries</psdata>
+
+ <files>
+ <i>[[usrprefix]]/lib/mono/gac/glade-sharp</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp-2.0/glade-sharp.dll</i>
+
+ <i>[[usrlibdir]]/libgladesharpglue-2.so</i>
+
+ <i>[[usrlibdir]]/pkgconfig/glade-sharp-2.0.pc</i>
+ </files>
+
+ <description>
+ <h>Mono bindings for glade</h>
+ <p>
+ This package contains Mono bindings for glade.
+ </p>
+ </description>
+ </package>
+ <package id="vte-sharp2">
+ <name>vte-sharp2</name>
+
+ <psdata id="group">Development/Libraries</psdata>
+
+ <files>
+ <i>[[usrprefix]]/lib/mono/gac/vte-sharp</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp-2.0/vte-sharp.dll</i>
+
+ <i>[[usrlibdir]]/libvtesharpglue-2.so</i>
+
+ <i>[[usrlibdir]]/pkgconfig/vte-sharp-2.0.pc</i>
+ </files>
+
+ <description>
+ <h>Mono bindings for vte</h>
+ <p>
+ This package contains Mono bindings for vte.
+ </p>
+ </description>
+ </package>
+
+ <package id="glib-sharp2">
+ <name>glib-sharp2</name>
+
+ <psdata id="group">Development/Libraries</psdata>
+
+ <files>
+ <i>[[usrprefix]]/lib/mono/gac/glib-sharp</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp-2.0/glib-sharp.dll</i>
+
+ <i>[[usrlibdir]]/libglibsharpglue-2.so</i>
+
+ <i>[[usrlibdir]]/pkgconfig/glib-sharp-2.0.pc</i>
+ </files>
+
+ <description>
+ <h>Mono bindings for glib</h>
+ <p>
+ This package contains Mono bindings for glib.
+ </p>
+ </description>
+ </package>
+
+ <package id="gnome-sharp2">
+ <name>gnome-sharp2</name>
+
+ <psdata id="group">Development/Libraries</psdata>
+
+ <files>
+ <i>[[usrprefix]]/lib/mono/gac/art-sharp</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp-2.0/art-sharp.dll</i>
+
+
+ <i>[[usrprefix]]/lib/mono/gac/gnome-sharp</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp-2.0/gnome-sharp.dll</i>
+
+ <i>[[usrprefix]]/lib/mono/gac/gnome-vfs-sharp</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp-2.0/gnome-vfs-sharp.dll</i>
+
+ <i>[[usrprefix]]/lib/mono/gac/gtkhtml-sharp</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp-2.0/gtkhtml-sharp.dll</i>
+
+ <i>[[usrprefix]]/lib/mono/gac/rsvg-sharp</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp-2.0/rsvg-sharp.dll</i>
+
+ <i>[[usrlibdir]]/libgnomesharpglue-2.so</i>
+
+ <i>[[usrlibdir]]/pkgconfig/art-sharp-2.0.pc</i>
+ <i>[[usrlibdir]]/pkgconfig/gnome-sharp-2.0.pc</i>
+ <i>[[usrlibdir]]/pkgconfig/gnome-vfs-sharp-2.0.pc</i>
+ <i>[[usrlibdir]]/pkgconfig/gtkhtml-sharp-2.0.pc</i>
+ <i>[[usrlibdir]]/pkgconfig/rsvg-sharp-2.0.pc</i>
+ </files>
+
+ <dep id="requires">
+ <i>libgtkhtml-[[gtkhtmlver]][[libmark]]</i>
+ <i>librsvg-2.so.2[[libmark]]</i>
+ </dep>
+
+ <description>
+ <h>Mono bindings for various Gnome libraries</h>
+ <p>
+ This package contains Mono bindings for several Gnome libraries.
+ Included are art, gnome, gnome-vfs, gtkthml, and rsvg.
+ </p>
+ </description>
+ </package>
+
+ <package id="gtk-sharp2">
+ <name>gtk-sharp2</name>
+
+ <psdata id="group">Development/Libraries</psdata>
+
+ <files>
+ <i>[[usrprefix]]/lib/mono/gac/atk-sharp</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp-2.0/atk-sharp.dll</i>
+
+ <i>[[usrprefix]]/lib/mono/gac/gdk-sharp</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp-2.0/gdk-sharp.dll</i>
+
+ <i>[[usrprefix]]/lib/mono/gac/gtk-dotnet</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp-2.0/gtk-dotnet.dll</i>
+
+ <i>[[usrprefix]]/lib/mono/gac/gtk-sharp</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp-2.0/gtk-sharp.dll</i>
+
+ <i>[[usrprefix]]/lib/mono/gac/pango-sharp</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp-2.0/pango-sharp.dll</i>
+
+ <i>[[usrlibdir]]/libgdksharpglue-2.so</i>
+ <i>[[usrlibdir]]/libgtksharpglue-2.so</i>
+ <i>[[usrlibdir]]/libpangosharpglue-2.so</i>
+
+ <i>[[usrlibdir]]/pkgconfig/gtk-sharp-2.0.pc</i>
+ <i>[[usrlibdir]]/pkgconfig/gtk-dotnet-2.0.pc</i>
+ </files>
+
+ <description>
+ <h>Mono bindings for gtk+</h>
+ <p>
+ This package contains Mono bindings for gtk+, gdk, atk, and pango.
+ </p>
+ </description>
+ </package>
+
+ <package id="gconf-sharp2">
+ <name>gconf-sharp2</name>
+
+ <psdata id="group">Development/Libraries</psdata>
+
+ <files>
+ <i>[[usrprefix]]/bin/gconfsharp2-schemagen</i>
+ <i>[[usrprefix]]/lib/gtk-sharp-2.0/gconfsharp-schemagen.exe</i>
+
+ <i>[[usrprefix]]/lib/mono/gac/gconf-sharp</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp-2.0/gconf-sharp.dll</i>
+
+ <i>[[usrprefix]]/lib/mono/gac/gconf-sharp-peditors</i>
+ <i>[[usrprefix]]/lib/mono/gtk-sharp-2.0/gconf-sharp-peditors.dll</i>
+
+ <i>[[usrlibdir]]/pkgconfig/gconf-sharp-2.0.pc</i>
+ </files>
+
+ <description>
+ <h>Mono bindings for gconf</h>
+ <p>
+ This package contains Mono bindings for gconf and gconf peditors.
+ </p>
+ </description>
+ </package>
+
+ <package id="gtk-sharp2-doc">
+ <name>gtk-sharp2-doc</name>
+
+ <psdata id="group">Development/Libraries</psdata>
+
+ <dep id="requires">
+ <i>mono-tools</i>
+ </dep>
+
+ <files>
+ <i>[[usrprefix]]/lib/monodoc</i>
+ </files>
+
+ <docs>
+ <i>COPYING</i>
+ <i>ChangeLog</i>
+ <i>README</i>
+ </docs>
+
+ <description>
+ <h>Monodoc documentation for gtk-sharp2</h>
+ <p>
+ This package contains the gtk-sharp2 documentation
+ for monodoc.
+ </p>
+ </description>
+ </package>
+
</build>
</targetset>
Added: trunk/release/packaging/conf/sles-9-s390
===================================================================
--- trunk/release/packaging/conf/sles-9-s390 2006-01-14 01:06:48 UTC (rev
55564)
+++ trunk/release/packaging/conf/sles-9-s390 2006-01-14 01:47:52 UTC (rev
55565)
@@ -0,0 +1,2 @@
[EMAIL PROTECTED]
+jaildir=/jails/sles-9-s390
Added: trunk/release/packaging/conf/sles-9-s390x
===================================================================
--- trunk/release/packaging/conf/sles-9-s390x 2006-01-14 01:06:48 UTC (rev
55564)
+++ trunk/release/packaging/conf/sles-9-s390x 2006-01-14 01:47:52 UTC (rev
55565)
@@ -0,0 +1,2 @@
[EMAIL PROTECTED]
+jaildir=/jails/sles-9-s390x
Modified: trunk/release/packaging/conf/sunos-8-sparc
===================================================================
--- trunk/release/packaging/conf/sunos-8-sparc 2006-01-14 01:06:48 UTC (rev
55564)
+++ trunk/release/packaging/conf/sunos-8-sparc 2006-01-14 01:47:52 UTC (rev
55565)
@@ -1,4 +1,6 @@
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
#jaildir=/jails/sunos-8-sparc-root-0
+#jaildir=/home/builder/sol8_jail
USE_ZIP_PKG=1
Modified: trunk/release/packaging/defs/gtk-sharp
===================================================================
--- trunk/release/packaging/defs/gtk-sharp 2006-01-14 01:06:48 UTC (rev
55564)
+++ trunk/release/packaging/defs/gtk-sharp 2006-01-14 01:47:52 UTC (rev
55565)
@@ -7,8 +7,9 @@
rhel-3-i386
rhel-4-i386
sles-9-i586
- sles-9-ia64
- sles-9-x86_64
+ # These don't have all necessary deps
+ #sles-9-ia64
+ #sles-9-x86_64
suse-92-i586
suse-93-i586
suse-93-x86_64
Modified: trunk/release/packaging/defs/libgdiplus-1.1
===================================================================
--- trunk/release/packaging/defs/libgdiplus-1.1 2006-01-14 01:06:48 UTC (rev
55564)
+++ trunk/release/packaging/defs/libgdiplus-1.1 2006-01-14 01:47:52 UTC (rev
55565)
@@ -9,6 +9,7 @@
rhel-4-i386
sles-9-i586
sles-9-ia64
+ sles-9-s390x
sles-9-x86_64
suse-92-i586
suse-93-i586
Modified: trunk/release/packaging/defs/mod_mono
===================================================================
--- trunk/release/packaging/defs/mod_mono 2006-01-14 01:06:48 UTC (rev
55564)
+++ trunk/release/packaging/defs/mod_mono 2006-01-14 01:47:52 UTC (rev
55565)
@@ -8,6 +8,7 @@
rhel-4-i386
sles-9-i586
sles-9-ia64
+ sles-9-s390x
sles-9-x86_64
suse-92-i586
suse-93-i586
Modified: trunk/release/packaging/install-deps
===================================================================
--- trunk/release/packaging/install-deps 2006-01-14 01:06:48 UTC (rev
55564)
+++ trunk/release/packaging/install-deps 2006-01-14 01:47:52 UTC (rev
55565)
@@ -16,6 +16,16 @@
DEPS=$*
+if [ x$PACKAGE == x ] ; then
+ echo ""
+ echo "Usage: ./install-deps TARGET <package> <local packages>"
+ echo " where:"
+ echo " package is package to build to install deps for (can also be
'none')"
+ echo " local packages is packages in the defs dir and/or urls if
distro is zip based"
+ echo ""
+ exit 1
+fi
+
. conf/$TARGET
DISTRO_UNDERSCORES=${TARGET//-/_}
Modified: trunk/release/packaging/jail-do
===================================================================
--- trunk/release/packaging/jail-do 2006-01-14 01:06:48 UTC (rev 55564)
+++ trunk/release/packaging/jail-do 2006-01-14 01:47:52 UTC (rev 55565)
@@ -21,18 +21,18 @@
SSH_FLAGS="-q"
if [ "x$*" == x ] ; then
- CMD="bash -l"
+ CMD="$SHELL --login"
# allocate a tty
SSH_FLAGS="$SSH_FLAGS -t"
else
- CMD="bash -lc '$*'"
+ CMD="$SHELL --login -c '$*'"
fi
#
# redhat systems have chroot in sbin, so we need to add that to
-# the path while we ssh in.
+# the path while we ssh in. (Add /usr/local/bin)
#
-ADD_SBIN='PATH=/sbin:/usr/sbin:$PATH'
+ADD_SBIN='PATH=/sbin:/usr/sbin:/usr/local/bin:$PATH'
# Don't chroot if none defined (Used initially for windows)
if [ -z $jaildir ] ; then
Modified: trunk/release/packaging/mktarball
===================================================================
--- trunk/release/packaging/mktarball 2006-01-14 01:06:48 UTC (rev 55564)
+++ trunk/release/packaging/mktarball 2006-01-14 01:47:52 UTC (rev 55565)
@@ -110,7 +110,7 @@
echo > status/$distro;
if [ ! [EMAIL PROTECTED] -eq 0 ]; then
- if ! ./install-deps $distro $package ; then
+ if ! ./install-deps $distro $real_package ; then
rm status/$distro
echo Dependency installation failed, see log in $LOGFILE for
details
exit 1
Property changes on: trunk/release/packaging/status
___________________________________________________________________
Name: svn:ignore
+ *
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
