--- a/Solaris/ChangeLog Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/ChangeLog Tue Jun 22 12:29:51 2004 +0000
@@ -1,4 +1,13 @@
-2004-06-22 Niall Power <niall,[email protected]>
+2004-06-22 Laszlo Peter <[email protected]>
+
+ * install-jds: i18n (merge from metro branch)
+
+ * Solaris.inc: decrease C++ optimisation level to xO3 and
+ define %_pkg_config_path
+
+ * *.spec: use %_pkg_config_path
+
+2004-06-22 Niall Power <[email protected]>
* SUNWgnome-pdf-viewer.spec: add xpdf language support packs
BugId #4921809
--- a/Solaris/SUNWapoc-adapter-gconf.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWapoc-adapter-gconf.spec Tue Jun 22 12:29:51 2004 +0000
@@ -36,7 +36,7 @@
%apoc_gconf.prep -d %name-%version
%build
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
%apoc_gconf.build -d %name-%version
%install
--- a/Solaris/SUNWevolution-libs.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWevolution-libs.spec Tue Jun 22 12:29:51 2004 +0000
@@ -64,7 +64,7 @@
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
-export PKG_CONFIG_PATH=../libgal-%{libgal.version}:%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=../libgal-%{libgal.version}:%{_pkg_config_path}
%libsoup.build -d %name-%version
%libgal.build -d %name-%version
%gtkhtml.build -d %name-%version
--- a/Solaris/SUNWevolution-socs-connect.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWevolution-socs-connect.spec Tue Jun 22 12:29:51 2004 +0000
@@ -43,7 +43,7 @@
export LDFLAGS="-L%{_libdir} -R%{_libdir}"
export CFLAGS="%optflags"
export MSGFMT="/usr/bin/msgfmt"
-export PKG_CONFIG_PATH="%{_libdir}/pkgconfig:/usr/lib/pkgconfig:%{_builddir}/%name-%version/hydrogen-%{hydrogen.version}"
+export PKG_CONFIG_PATH="%{_pkg_config_path}:%{_builddir}/%name-%version/hydrogen-%{hydrogen.version}"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
%hydrogen.build -d %name-%version
--- a/Solaris/SUNWevolution.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWevolution.spec Tue Jun 22 12:29:51 2004 +0000
@@ -71,7 +71,7 @@
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig:%{_builddir}/%name-%version/evolution-%{evolution.version}
+export PKG_CONFIG_PATH=%{_pkg_config_path}:%{_builddir}/%name-%version/evolution-%{evolution.version}
%evolution.build -d %name-%version
%install
--- a/Solaris/SUNWgnome-a11y-gok.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-a11y-gok.spec Tue Jun 22 12:29:51 2004 +0000
@@ -43,7 +43,7 @@
%gok.prep -d %name-%version
%build
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
--- a/Solaris/SUNWgnome-a11y-libs.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-a11y-libs.spec Tue Jun 22 12:29:51 2004 +0000
@@ -58,7 +58,7 @@
%build
PKG_CONFIG_DISABLE_UNINSTALLED=
unset PKG_CONFIG_DISABLE_UNINSTALLED
-export PKG_CONFIG_PATH=../at-spi-%{at_spi.version}:%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=../at-spi-%{at_spi.version}:%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
--- a/Solaris/SUNWgnome-a11y-reader.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-a11y-reader.spec Tue Jun 22 12:29:51 2004 +0000
@@ -48,7 +48,7 @@
%build
PKG_CONFIG_DISABLE_UNINSTALLED=
unset PKG_CONFIG_DISABLE_UNINSTALLED
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig:../gnome-mag-%{gnome_mag.version}
+export PKG_CONFIG_PATH=../gnome-mag-%{gnome_mag.version}:%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
--- a/Solaris/SUNWgnome-a11y-speech.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-a11y-speech.spec Tue Jun 22 12:29:51 2004 +0000
@@ -41,7 +41,7 @@
%gnome_speech.prep -d %name-%version
%build
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
if [ `uname -r` = 5.9 ]; then
--- a/Solaris/SUNWgnome-archive-mgr.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-archive-mgr.spec Tue Jun 22 12:29:51 2004 +0000
@@ -55,7 +55,7 @@
#export CFLAGS="%optflags -I/usr/sfw/include -I/usr/sfw/include/freetype2 -DANSICPP"
export RPM_OPT_FLAGS="$CFLAGS"
export LDFLAGS="-L%{_libdir} -R%{_libdir}"
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
--- a/Solaris/SUNWgnome-audio.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-audio.spec Tue Jun 22 12:29:51 2004 +0000
@@ -69,7 +69,7 @@
%patch1 -p1
%build
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig:../audiofile-%audiofile_version
+export PKG_CONFIG_PATH=../audiofile-%audiofile_version:%{_pkg_config_path}
export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP"
export RPM_OPT_FLAGS="$CFLAGS"
export CPPFLAGS="-I/usr/sfw/include"
--- a/Solaris/SUNWgnome-base-libs.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-base-libs.spec Tue Jun 22 12:29:51 2004 +0000
@@ -119,7 +119,7 @@
%build
PKG_CONFIG_DISABLE_UNINSTALLED=
unset PKG_CONFIG_DISABLE_UNINSTALLED
-export PKG_CONFIG_PATH=../libart_lgpl-%{libart_lgpl.version}:../glib-%{glib.version}:../atk-%{atk.version}:../pango-%{pango.version}:../gtk+-%{gtk.version}:../libglade-%{libglade.version}:%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=../libart_lgpl-%{libart_lgpl.version}:../glib-%{glib.version}:../atk-%{atk.version}:../pango-%{pango.version}:../gtk+-%{gtk.version}:../libglade-%{libglade.version}:%{_pkg_config_path}
export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP -D__STDC_VERSION__=199409L"
export RPM_OPT_FLAGS="$CFLAGS"
export CPPFLAGS="-I/usr/sfw/include"
--- a/Solaris/SUNWgnome-calculator.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-calculator.spec Tue Jun 22 12:29:51 2004 +0000
@@ -51,7 +51,7 @@
%gcalctool.prep -d %name-%version
%build
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
--- a/Solaris/SUNWgnome-camera.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-camera.spec Tue Jun 22 12:29:51 2004 +0000
@@ -65,7 +65,7 @@
ln -s `pwd`/libgphoto2-%{libgphoto2.version}/libgphoto2_port/libgphoto2_port `pwd`/libgphoto2-%{libgphoto2.version}/libgphoto2_port/libgphoto2_port/gphoto2
%build
-export PKG_CONFIG_PATH=../libgphoto2-%{libgphoto2.version}/libgphoto2:%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=../libgphoto2-%{libgphoto2.version}/libgphoto2:%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
--- a/Solaris/SUNWgnome-cd-burner.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-cd-burner.spec Tue Jun 22 12:29:51 2004 +0000
@@ -53,7 +53,7 @@
%cd_burner.prep -d %name-%version
%build
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
--- a/Solaris/SUNWgnome-component.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-component.spec Tue Jun 22 12:29:51 2004 +0000
@@ -70,7 +70,7 @@
%build
PKG_CONFIG_DISABLE_UNINSTALLED=
unset PKG_CONFIG_DISABLE_UNINSTALLED
-export PKG_CONFIG_PATH=../ORBit2-%{orbit.version}:../libIDL-%{idl.version}:../libbonobo-%{bonobo.version}:%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=../ORBit2-%{orbit.version}:../libIDL-%{idl.version}:../libbonobo-%{bonobo.version}:%{_pkg_config_path}
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
export CPP=/usr/lib/cpp
export LDFLAGS="-L%{_libdir} -R%{_libdir}"
--- a/Solaris/SUNWgnome-config-editor.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-config-editor.spec Tue Jun 22 12:29:51 2004 +0000
@@ -45,7 +45,7 @@
%build
export LDFLAGS="-L%{_libdir} -R%{_libdir}"
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
--- a/Solaris/SUNWgnome-config.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-config.spec Tue Jun 22 12:29:51 2004 +0000
@@ -60,7 +60,7 @@
export CFLAGS="%optflags -I%{_includedir}"
export RPM_OPT_FLAGS="$CFLAGS"
export LDFLAGS="-L%{_libdir} -R%{_libdir}"
-export PKG_CONFIG_PATH=%{_libdir}/lib/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
%gconf.build -d %name-%version
--- a/Solaris/SUNWgnome-desktop-prefs.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-desktop-prefs.spec Tue Jun 22 12:29:51 2004 +0000
@@ -72,7 +72,7 @@
%build
export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP"
export RPM_OPT_FLAGS="$CFLAGS"
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
#FIXME: This stuff should be fixed in the component or the configure script
export LDFLAGS="-L/usr/sfw/lib -R/usr/sfw/lib -L%{_libdir} -R%{_libdir} -lfreetype"
export MSGFMT="/usr/bin/msgfmt"
--- a/Solaris/SUNWgnome-dialog.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-dialog.spec Tue Jun 22 12:29:51 2004 +0000
@@ -41,7 +41,7 @@
%zenity.prep -d %name-%version
%build
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
--- a/Solaris/SUNWgnome-display-mgr.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-display-mgr.spec Tue Jun 22 12:29:51 2004 +0000
@@ -49,7 +49,7 @@
%build
export LDFLAGS="-L/usr/openwin/lib -lXau -R/usr/openwin/lib -L%{_libdir} -R%{_libdir}"
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
--- a/Solaris/SUNWgnome-file-mgr.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-file-mgr.spec Tue Jun 22 12:29:51 2004 +0000
@@ -63,7 +63,7 @@
%nautilus.prep -d %name-%version
%build
-export PKG_CONFIG_PATH=../eel-%{eel.version}:%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=../eel-%{eel.version}:%{_pkg_config_path}
export CFLAGS="%optflags -I%{_includedir}"
export RPM_OPT_FLAGS="$CFLAGS"
export LDFLAGS="-L%{_libdir} -R%{_libdir}"
--- a/Solaris/SUNWgnome-fonts.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-fonts.spec Tue Jun 22 12:29:51 2004 +0000
@@ -32,7 +32,7 @@
%ttf_freefont.prep -d %name-%version
%build
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
%ttf_baekmuk.build -d %name-%version
--- a/Solaris/SUNWgnome-games.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-games.spec Tue Jun 22 12:29:51 2004 +0000
@@ -56,7 +56,7 @@
%gnome_games.prep -d %name-%version
%build
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
--- a/Solaris/SUNWgnome-help-viewer.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-help-viewer.spec Tue Jun 22 12:29:51 2004 +0000
@@ -45,7 +45,7 @@
%build
export CFLAGS="%optflags -Xa -I/usr/sfw/include -I/usr/sfw/include/freetype2 -DANSICPP"
export RPM_OPT_FLAGS="$CFLAGS"
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export LDFLAGS="-L%{_libdir} -R%{_libdir}"
--- a/Solaris/SUNWgnome-im-client.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-im-client.spec Tue Jun 22 12:29:51 2004 +0000
@@ -40,7 +40,7 @@
%gaim.prep -d %name-%version
%build
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export LDFLAGS="-L%{_libdir} -R%{_libdir}"
--- a/Solaris/SUNWgnome-im-switcher.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-im-switcher.spec Tue Jun 22 12:29:51 2004 +0000
@@ -50,7 +50,7 @@
%gimlet.prep -d %name-%version
%build
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP"
export RPM_OPT_FLAGS="$CFLAGS"
export LDFLAGS="-L%{_libdir} -R%{_libdir}"
--- a/Solaris/SUNWgnome-img-editor.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-img-editor.spec Tue Jun 22 12:29:51 2004 +0000
@@ -57,7 +57,7 @@
%gimp.prep -d %name-%version
%build
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
--- a/Solaris/SUNWgnome-img-viewer.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-img-viewer.spec Tue Jun 22 12:29:51 2004 +0000
@@ -54,7 +54,7 @@
%gthumb.prep -d %name-%version
%build
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
--- a/Solaris/SUNWgnome-libs.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-libs.spec Tue Jun 22 12:29:51 2004 +0000
@@ -115,7 +115,7 @@
%build
PKG_CONFIG_DISABLE_UNINSTALLED=
unset PKG_CONFIG_DISABLE_UNINSTALLED
-export PKG_CONFIG_PATH=../libgnome-%{libgnome.version}/libgnome:../gnome-keyring-%{gnomekeyring.version}:../libbonoboui-%{libbonoboui.version}/bonobo:%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=../libgnome-%{libgnome.version}/libgnome:../gnome-keyring-%{gnomekeyring.version}:../libbonoboui-%{libbonoboui.version}/bonobo:%{_pkg_config_path}
export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP"
export RPM_OPT_FLAGS="$CFLAGS"
export CPPFLAGS="-I/usr/sfw/include"
--- a/Solaris/SUNWgnome-media.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-media.spec Tue Jun 22 12:29:51 2004 +0000
@@ -71,7 +71,7 @@
%nautilus_media.prep -d %name-%version
%build
-export PKG_CONFIG_PATH="%{_libdir}/pkgconfig:../gstreamer-%{gst.version}/pkgconfig:../gst-plugins-%{gst.version}/pkgconfig:/usr/lib/pkgconfig"
+export PKG_CONFIG_PATH=../gstreamer-%{gst.version}/pkgconfig:../gst-plugins-%{gst.version}/pkgconfig:%{_pkg_config_path}
# Note that setting __STDC_VERSION for gnome-media breaks the S9 build for gstreamer,
# gst-plugins, and gnome-media, so turning it off for these.
--- a/Solaris/SUNWgnome-panel.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-panel.spec Tue Jun 22 12:29:51 2004 +0000
@@ -224,7 +224,7 @@
unset PKG_CONFIG_DISABLE_UNINSTALLED
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-export PKG_CONFIG_PATH="../gnome-desktop-%{gdesktop.version}/libgnome-desktop:../libwnck-%{lwnck.version}:../gnome-panel-%{gpanel.version}/libpanel-applet:../libxklavier-%{libxkl.version}:%{_libdir}/pkgconfig:/usr/lib/pkgconfig"
+export PKG_CONFIG_PATH="../gnome-desktop-%{gdesktop.version}/libgnome-desktop:../libwnck-%{lwnck.version}:../gnome-panel-%{gpanel.version}/libpanel-applet:../libxklavier-%{libxkl.version}:%{_pkg_config_path}"
if [ `uname -r` = 5.9 ]; then
STDC_VERSION=
else
--- a/Solaris/SUNWgnome-pdf-viewer.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-pdf-viewer.spec Tue Jun 22 12:29:51 2004 +0000
@@ -49,7 +49,7 @@
%gpdf.prep -d %name-%version
%build
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
--- a/Solaris/SUNWgnome-pilot-link.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-pilot-link.spec Tue Jun 22 12:29:51 2004 +0000
@@ -65,7 +65,7 @@
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export MSGFMT="/usr/bin/msgfmt"
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
%plink.build -d %name-%version
export CFLAGS="%optflags -I%{_builddir}/%name-%version/pilot-link-%{plink.version}/include"
export RPM_OPT_FLAGS="$CFLAGS"
--- a/Solaris/SUNWgnome-print.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-print.spec Tue Jun 22 12:29:51 2004 +0000
@@ -66,7 +66,7 @@
%build
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
-export PKG_CONFIG_PATH=../libgnomeprint-%{gprint.version}/libgnomeprint:%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=../libgnomeprint-%{gprint.version}/libgnomeprint:%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export LDFLAGS="-L%{_libdir} -R%{_libdir} -L/usr/sfw/lib -R/usr/sfw/lib"
--- a/Solaris/SUNWgnome-project.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-project.spec Tue Jun 22 12:29:51 2004 +0000
@@ -54,7 +54,7 @@
%planner.prep -d %name-%version
%build
-export PKG_CONFIG_PATH=../libgsf-%{libgsf.version}:%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=../libgsf-%{libgsf.version}:%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
--- a/Solaris/SUNWgnome-ps-viewer.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-ps-viewer.spec Tue Jun 22 12:29:51 2004 +0000
@@ -47,7 +47,7 @@
%ggv.prep -d %name-%version
%build
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
--- a/Solaris/SUNWgnome-remote-desktop.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-remote-desktop.spec Tue Jun 22 12:29:51 2004 +0000
@@ -47,7 +47,7 @@
%vino.prep -d %name-%version
%build
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
--- a/Solaris/SUNWgnome-rmm-utils.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-rmm-utils.spec Tue Jun 22 12:29:51 2004 +0000
@@ -46,7 +46,7 @@
%build
cd gnome-rmm-utils-%{tarball_version}
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
export CFLAGS="%optflags"
export RPM_OPT_FLAGS="$CFLAGS"
export LDFLAGS="-L%{_libdir} -R%{_libdir}"
--- a/Solaris/SUNWgnome-session.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-session.spec Tue Jun 22 12:29:51 2004 +0000
@@ -59,7 +59,7 @@
%build
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export LDFLAGS="-L%{_libdir} -R%{_libdir}"
--- a/Solaris/SUNWgnome-spell.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-spell.spec Tue Jun 22 12:29:51 2004 +0000
@@ -45,7 +45,7 @@
export LDFLAGS="-L%{_libdir} -R%{_libdir}"
export CFLAGS="%optflags"
export CXXFLAGS="%cxx_optflags"
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
%gspell.build -d %name-%version
--- a/Solaris/SUNWgnome-terminal.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-terminal.spec Tue Jun 22 12:29:51 2004 +0000
@@ -73,7 +73,7 @@
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
export CFLAGS="%optflags -I/usr/sfw/include -I/usr/sfw/include/freetype2 -DANSICPP -D__STDC_VERSION__=199409L"
export RPM_OPT_FLAGS="$CFLAGS"
-export PKG_CONFIG_PATH=../vte-%{vte.version}:%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=../vte-%{vte.version}:%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export LDFLAGS="-L%{_libdir} -R%{_libdir}"
--- a/Solaris/SUNWgnome-text-editor.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-text-editor.spec Tue Jun 22 12:29:51 2004 +0000
@@ -58,7 +58,7 @@
%build
PKG_CONFIG_DISABLE_UNINSTALLED=
unset PKG_CONFIG_DISABLE_UNINSTALLED
-export PKG_CONFIG_PATH=../gtksourceview-%{gtksourceview.version}:%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=../gtksourceview-%{gtksourceview.version}:%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
--- a/Solaris/SUNWgnome-themes.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-themes.spec Tue Jun 22 12:29:51 2004 +0000
@@ -62,7 +62,7 @@
%build
PKG_CONFIG_DISABLE_UNINSTALLED=
unset PKG_CONFIG_DISABLE_UNINSTALLED
-export PKG_CONFIG_PATH=../gtk-engines-%{engines.version}:%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=../gtk-engines-%{engines.version}:%{_pkg_config_path}
export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP"
export RPM_OPT_FLAGS="$CFLAGS"
export CPPFLAGS="-I/usr/sfw/include"
--- a/Solaris/SUNWgnome-ui-designer.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-ui-designer.spec Tue Jun 22 12:29:51 2004 +0000
@@ -43,7 +43,7 @@
%glade.prep -d %name-%version
%build
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
--- a/Solaris/SUNWgnome-user-docs.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-user-docs.spec Tue Jun 22 12:29:51 2004 +0000
@@ -28,7 +28,7 @@
%gud.prep -d %name-%version
%build
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
%gud.build -d %name-%version
--- a/Solaris/SUNWgnome-utils.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-utils.spec Tue Jun 22 12:29:51 2004 +0000
@@ -81,7 +81,7 @@
%gucharmap.prep -d %name-%version
%build
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
--- a/Solaris/SUNWgnome-vfs.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-vfs.spec Tue Jun 22 12:29:51 2004 +0000
@@ -73,7 +73,7 @@
%gvfsx.prep -d %name-%version
%build
-export PKG_CONFIG_PATH=../gnome-mime-data-%{gmdata.version}:../gnome-vfs-%{gvfs.version}:%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=../gnome-mime-data-%{gmdata.version}:../gnome-vfs-%{gvfs.version}:%{_pkg_config_path}
export CFLAGS="%optflags -I%{_includedir}"
export RPM_OPT_FLAGS="$CFLAGS"
export LDFLAGS="-L%{_libdir} -R%{_libdir}"
--- a/Solaris/SUNWgnome-wm.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWgnome-wm.spec Tue Jun 22 12:29:51 2004 +0000
@@ -60,7 +60,7 @@
export CFLAGS="%optflags -I/usr/sfw/include -I/usr/sfw/include/freetype2 -DANSICPP"
export LDFLAGS="-L%{_libdir} -R%{_libdir}"
export RPM_OPT_FLAGS="$CFLAGS"
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
--- a/Solaris/SUNWlibexif.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWlibexif.spec Tue Jun 22 12:29:51 2004 +0000
@@ -31,7 +31,7 @@
%libexif.prep -d %name-%version
%build
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
--- a/Solaris/SUNWmozilla.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWmozilla.spec Tue Jun 22 12:29:51 2004 +0000
@@ -110,7 +110,7 @@
#####################################
%build
-export PKG_CONFIG_PATH="/usr/lib/pkgconfig:%{_libdir}/pkgconfig"
+export PKG_CONFIG_PATH=%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export LDFLAGS="-norunpath -L%{_libdir} -R'\$\$ORIGIN:\$\$ORIGIN/plugins:\$\$ORIGIN/..:%{_libdir}' -L/usr/sfw/lib -R/usr/sfw/lib"
%ifarch sparc
--- a/Solaris/SUNWogg-vorbis.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWogg-vorbis.spec Tue Jun 22 12:29:51 2004 +0000
@@ -43,7 +43,7 @@
%build
export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP"
-export PKG_CONFIG_PATH="%{_libdir}/pkgconfig:../libogg-%{libogg.version}:/usr/lib/pkgconfig"
+export PKG_CONFIG_PATH=../libogg-%{libogg.version}:%{_pkg_config_path}
export RPM_OPT_FLAGS="$CFLAGS"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
--- a/Solaris/SUNWopenh323.spec Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/SUNWopenh323.spec Tue Jun 22 12:29:51 2004 +0000
@@ -41,7 +41,7 @@
%openh323.prep -d %name-%version
%build
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:/usr/lib/pkgconfig
+export PKG_CONFIG_PATH=%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
--- a/Solaris/Solaris.inc Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/Solaris.inc Tue Jun 22 12:29:51 2004 +0000
@@ -14,10 +14,10 @@
%define _mandir %{_datadir}/man
%ifarch sparc
%define optflags -i -xO4 -xspace -xstrconst -xarch=v8a -mr
-%define cxx_optflags -i -xO4 -xspace -xarch=v8a -mr -norunpath
+%define cxx_optflags -i -xO3 -xspace -xarch=v8a -mr -norunpath
%else
%define optflags -i -xO4 -xspace -xstrconst -xpentium -mr
-%define cxx_optflags -i -xO4 -xspace -pentium -mr -norunpath
+%define cxx_optflags -i -xO3 -xspace -pentium -mr -norunpath
%endif
%define sparcv9_optflags -i -xO4 -xspace -xstrconst -xarch=v9 -mr
@@ -27,9 +27,13 @@
%define _prefix %{_basedir}/%{_subdir}
%define _sysconfdir %{_prefix}/etc
%define _localedir %{_libdir}/locale
+%define _pkg_config_path %{_libdir}/pkgconfig
# ChangeLog:
#
+# 2004-06-21 Laszlo Peter <[email protected]>
+# - descrease C++ optimisation level to xO3
+# - define _pkg_config_path
# 2004-05-03 Laszlo Peter <[email protected]>
# - define _basedir
# 2004-04-14 Laszlo Peter <[email protected]>
--- a/Solaris/install-jds Tue Jun 22 10:54:19 2004 +0000
+++ b/Solaris/install-jds Tue Jun 22 12:29:51 2004 +0000
@@ -1,12 +1,14 @@
#!/bin/bash
-ALL_PRODUCTS="gnome=GNOME 2.6 Desktop
+ALL_PRODUCTS="apoc-daemon=APOC Configuration Manager
+gnome=GNOME 2.6 Desktop
gnome-src=GNOME 2.6 Source
-apoc-daemon=Configuration Manager
+mozilla=Mozilla 1.7 Web Browser
+mozilla-src=Mozilla Source
+idn
+idn-src
evolution=Evolution Email and Calendar
evolution-src=Evolution Source
-idn
-idn-src
glow=Integrated Collaboration Environment
jai=Java Advanced Imaging
jai-iio=Java Advanced Imaging
@@ -24,8 +26,6 @@
l10n-src=Localization Sources
iiim
iiim-src
-mozilla=Mozilla 1.7 Web Browser
-mozilla-src=Mozilla Source
muscle
plugins=Third Party Browser Plugins
plugins-src
@@ -34,6 +34,8 @@
starsuite=StarSuite office suite
so-sdk=StarOffice Software Development Kit
updater
+netbeans
+javahelp
xserver=X.org server
nodist=Extra packages for JDS developers"
@@ -84,17 +86,18 @@
yes_no_repeat=no
ask "${@}"
eval "the_ans=\"\$$2\""
- case "$the_ans" in
- [yY]|[yY][eE][sS] )
- eval "$2=yes"
- ;;
- [nN]|[nN][oO] )
- eval "$2=no"
- ;;
- * )
- echo "Please answer yes or no"
- yes_no_repeat=yes
- esac
+ echo "$the_ans" | grep -i "^`l10n_print yes`$" > /dev/null
+ if [ $? = 0 ]; then
+ eval "$2=yes"
+ return
+ fi
+ echo "$the_ans" | grep -i "^`l10n_print no`$" > /dev/null
+ if [ $? = 0 ]; then
+ eval "$2=no"
+ return
+ fi
+ l10n_print "Please answer yes or no"
+ yes_no_repeat=yes
done
}
@@ -120,7 +123,7 @@
version2=(${version2[*]} $n)
done
- n=0
+ typeset -i n=0
while /bin/true; do
if [ -n "${version1[$n]}" ]; then
if [ -n "${version2[$n]}" ]; then
@@ -140,24 +143,24 @@
fi
return 1
fi
- n=`expr $n + 1`
+ typeset n=$n+1
done
}
if [ -n "$REQ_SYSTEM" -a "$REQ_SYSTEM" != "$SYSTEM" ]; then
- echo "This product requires a $REQ_SYSTEM system"
+ l10n_print "This product requires a %s system" "$REQ_SYSTEM"
exit 1
fi
if [ -n "$REQ_ARCH" -a "$REQ_ARCH" != "$ARCH" ]; then
- echo "This product requires a $REQ_ARCH architecture system"
+ l10n_print "This product requires a %s architecture system" "$REQ_ARCH"
exit 1
fi
if [ -n "$REQ_RELEASE" ]; then
version_lower $RELEASE $REQ_RELEASE
if [ $? = 0 ]; then
- echo "This product requires OS release $REQ_RELEASE or later"
+ l10n_print "This product requires OS release %s or later" "$REQ_RELEASE"
exit 1
fi
fi
@@ -165,25 +168,26 @@
if [ -n "$REQ_KERNELID" ]; then
version_lower $KERNELID $REQ_KERNELID
if [ $? = 0 ]; then
- echo "This product requires OS build $REQ_KERNELID or later"
+ l10n_print "This product requires OS build %s or later" "$REQ_KERNELID"
exit 1
fi
fi
usage () {
- echo "$0 [options]"
- echo "Install the Java Desktop System Rel 3 for the Solaris Operating Environment"
- echo " -h, --help display this help"
- echo " --quiet, -q less verbose operation."
- echo " --force, -f ignore any errors and continue."
- echo " --ignore, -i ignore file conflicts and continue."
- echo " -n non-interactive installation."
- echo " -R rootdir install into an alternative root directory."
- echo " -p prod1,prod2,..."
- echo " select products for installation"
- echo " -a install all products"
- echo " --nopatch don't install OS patches"
- echo " --tmpdir dir create temporary files in dir instead of /tmp"
+ echo "%s [options]" "$0"
+ l10n_print "Install the Java Desktop System, Release 2, Solaris x86 Edition"
+ l10n_print " -h, --help display this help"
+ l10n_print " --quiet, -q less verbose operation."
+ l10n_print " --force, -f ignore any errors and continue."
+ l10n_print " --ignore, -i ignore file conflicts and continue."
+ l10n_print " -n non-interactive installation."
+ l10n_print " -R rootdir install into an alternative root directory."
+ l10n_print " -p prod1,prod2,..."
+ l10n_print " select products for installation"
+ l10n_print " -a install all products"
+ l10n_print " --nopatch don't install OS patches"
+ l10n_print " --accept accept the license terms"
+ l10n_print " --tmpdir dir create temporary files in dir instead of /tmp"
exit 1
}
@@ -195,6 +199,7 @@
PRODUCTS=
NO_PATCHES=no
BASE_TEMPDIR=/tmp
+LICENSE_ACCEPTED=no
process_options () {
while [ $# != 0 ]; do
@@ -215,7 +220,7 @@
shift
ROOTDIR=$1
if [ "x$ROOTDIR" = x ]; then
- echo "Option -R requires an argument"
+ l10n_print "Option %s requires an argument" "-R"
usage
fi
;;
@@ -226,11 +231,14 @@
select_all_products
unselect_product nodist
;;
+ --accept )
+ LICENSE_ACCEPTED=yes
+ ;;
-p )
shift
PRODUCTS="$1"
if [ "x$PRODUCTS" = x ]; then
- echo "Option -p requires an argument"
+ l10n_print "Option %s requires an argument" "-R"
usage
fi
;;
@@ -238,7 +246,7 @@
shift
BASE_TEMPDIR="$1"
if [ "x$BASE_TEMPDIR" = x ]; then
- echo "Option --tmpdir requires an argument"
+ l10n_print "Option %s requires an argument" "--tmpdir"
usage
fi
;;
@@ -246,7 +254,7 @@
NO_PATCHES=yes
;;
* )
- echo "Error: $1: invalid argument"
+ l10n_print "Error: %s: invalid argument" "$1"
usage
;;
esac
@@ -273,8 +281,8 @@
backup () {
if [ -e "$1" ]; then
backup "$1~"
- echo "Saving file $1 as $1~"
- mv "$1" "$1~" || msg_fatal "Failed to back up file $1"
+ l10n_print "Saving file %s as %s~" "$1" "$1"
+ mv "$1" "$1~" || msg_fatal "Failed to back up file %s" "$1"
fi
}
@@ -288,27 +296,31 @@
clean_up_and_abort () {
clean_up
- echo "Interrupted."
+ l10n_print "Interrupted."
exit 1
}
+TEXTDOMAIN=install-jds
+l10n_print () {
+ l10n_msg=`TEXTDOMAINDIR="$MYDIR"/.install gettext -d "$TEXTDOMAIN" "$1"`
+ shift
+ printf "$l10n_msg\n" "${@}"
+}
+
msg_fatal () {
msg_log "${@}"
- for line in "${@}"; do
- echo $line
- done
+ l10n_print "${@}" 1>&2
clean_up
exit 1
}
msg_error () {
msg_log "${@}"
- for line in "${@}"; do
- echo $line
- done
+ l10n_print "${@}" 1>&2
if [ $FORCE = no ]; then
if [ "x$INTERACTIVE" = xyes ]; then
- ask_yes_no 'Would you like to continue?' ans "no"
+ ask_yes_no "`l10n_print 'Would you like to continue?'`" ans \
+ `l10n_print "no"`
if [ "x$ans" = xno ]; then
clean_up
exit 1
@@ -325,16 +337,14 @@
msg_log () {
test -f $LOGFILE || return
- for line in "${@}"; do
- echo $line >> $LOGFILE
- done
+ log_arg1="$1"
+ shift
+ printf "$log_arg1\n" "${@}" >> $LOGFILE
}
WARNINGS=no
msg_warning () {
- for line in "${@}"; do
- echo $line
- done
+ l10n_print "${@}"
WARNINGS=yes
}
@@ -356,8 +366,7 @@
so_disk_space_check () {
# Need large tmp area (>=1GB) for StarOffice/StarSuite installation.
check_disk_space $TEMPDIR 1048576 || \
- msg_error "Your $BASE_TEMPDIR directory has less than 1GB free." \
- "You need to specify an alternative temp dir with the --tmpdir switch."
+ msg_error "Your %s directory has less than 1GB free.\nYou need to specify an alternative temp dir with the --tmpdir switch." "$BASE_TEMPDIR"
}
init () {
@@ -403,48 +412,49 @@
fi
}
+declare -a MOUNT_POINTS
+declare -a MP_SUMS
disk_usage_init () {
mps=`df -kl | grep '^/' | awk '{print $6}' | sort -r`
IFS="
"
- i=0
+ typeset -i i=0
for mp in $mps; do
- eval "MOUNT_POINT_$i=\"$mp\""
- eval "SUM_$i=0"
- i=`expr $i + 1`
+ MOUNT_POINTS[$i]="$mp"
+ MP_SUMS[$i]=0
+ typeset i=$i+1
done
MOUNT_POINT_COUNT=$i
}
# disk_usage_add <dir> <size>
disk_usage_add () {
- i=0
+ typeset -i i=0
while [ $i -lt $MOUNT_POINT_COUNT ]; do
- eval "mpname=\"\$MOUNT_POINT_$i\""
+ mpname=${MOUNT_POINTS[$i]}
case $1 in
${mpname}* )
- eval "mpsize=\"\$SUM_$i\""
+ mpsize=${MP_SUMS[$i]}
mpsize=`expr $mpsize + $2`
- eval "SUM_$i=\"$mpsize\""
+ MP_SUMS[$i]=$mpsize
break
;;
esac
- i=`expr $i + 1`
+ typeset i=$i+1
done
}
disk_usage_check () {
- i=0
+ typeset -i i=0
while [ $i -lt $MOUNT_POINT_COUNT ]; do
- eval "mpname=\"\$MOUNT_POINT_$i\""
- eval "mpsize=\"\$SUM_$i\""
+ mpname=${MOUNT_POINTS[$i]}
+ mpsize=${MP_SUMS[$i]}
mpsize=`expr $mpsize + $mpsize`
if [ $mpsize -gt 0 ]; then
check_disk_space $mpname $mpsize || \
- msg_error "Your $mpname filesystem has less than $mpsize kB free" \
- "You will not be able to install all selected products."
+ msg_error "Your %s filesystem has less than %s kB free\nYou will not be able to install JDS." "$ROOTDIR$mpname" "$mpsize"
fi
- i=`expr $i + 1`
+ typeset i=$i+1
done
}
@@ -463,34 +473,34 @@
return
fi
- msg_log "Starting installation of $1 at `date`"
+ msg_log "Starting installation of %s at %s" "$1" "`LANG=C LC_ALL=C date`"
IFS='
'
logrun mkdir -p $TEMPDIR || \
- msg_fatal "ERROR: Failed to create temporary directory $TEMPDIR"
+ msg_fatal "ERROR: Failed to create temporary directory %s" "$TEMPDIR"
cd $TEMPDIR
for pkg in $ALL_PKGS; do
if [ ! -r $MYDIR/$1/$pkg ]; then
- msg_error "ERROR: cannot read $pkg"
+ msg_error "ERROR: cannot read file %s" "$pkg"
continue
fi
logrun sh -c "gunzip -c $MYDIR/$1/$pkg | /bin/tar xf -"
- if [ $? != 0 ]; then
- msg_error "ERROR: Failed to unpack $pkg"
+ if [ $? != 0 -o ! -d $pkg ]; then
+ msg_error "ERROR: Failed to unpack %s" "$pkg"
continue
fi
pkg0=$(basename $pkg)
pkg0=$(echo "$pkg0" | sed -e 's/\.tar.gz$//' -e 's/\.tgz$//')
if [ "x$QUIET" = xno ]; then
- echo "Installing package $pkg0"
+ l10n_print "Installing package %s" "$pkg0"
fi
msg_log "Installing package $pkg0"
if [ "x$ROOTDIR" != "x" ]; then
logrun $PKGADD -R "$ROOTDIR" -a $ADMIN -n -d $TEMPDIR $pkg0 || \
- msg_error "ERROR: Failed to install package $pkg0"
+ msg_error "ERROR: Failed to install package %s" "$pkg0"
else
logrun $PKGADD -a $ADMIN -n -d $TEMPDIR $pkg0 || \
- msg_error "ERROR: Failed to install package $pkg0"
+ msg_error "ERROR: Failed to install package %s" "$pkg0"
fi
logrun rm -rf $TEMPDIR/$pkg0
done
@@ -504,15 +514,15 @@
remove_pkg () {
if [ "x$QUIET" = xno ]; then
- echo "Uninstalling $1"
+ l10n_print "Uninstalling %s" "$1"
fi
- msg_log "Uninstalling $1"
+ msg_log "Uninstalling %s" "$1"
if [ "x$ROOTDIR" != x ]; then
logrun $PKGRM -R "$ROOTDIR" -a $ADMIN -n "$1"'.*' || \
- msg_error "ERROR: Failed to remove package $1"
+ msg_error "ERROR: Failed to remove package %s" "$1"
else
logrun $PKGRM -a $ADMIN -n "$1"'.*' || \
- msg_error "ERROR: Failed to remove package $1"
+ msg_error "ERROR: Failed to remove package %s" "$1"
fi
}
@@ -554,13 +564,13 @@
main_menu () {
while /bin/true; do
clear
- echo ",-----------------------------------------main-menu--o"
- echo "| 1) Default Installation"
- echo "| 2) Custom Installation"
+ echo ",--------------------------------------------------------------------------"
+ echo "| 1) " `l10n_print "Default Installation"`
+ echo "| 2) " `l10n_print "Custom Installation"`
echo "|"
- echo "| X) Exit"
+ echo "| X) " `l10n_print "Exit"`
echo "|"
- ask '`---> Please select:' "menu_sel" "1"
+ ask '`---> '`l10n_print 'Please select:'` "menu_sel" "1"
case $menu_sel in
1)
if [ "x$PRODUCTS" = x ]; then
@@ -577,7 +587,8 @@
return 2
;;
*)
- echo "Invalid selection"
+ l10n_print "Invalid selection"
+ sleep 1
esac
done
return 0
@@ -586,17 +597,17 @@
custom_menu () {
while /bin/true; do
clear
- echo ",-------------------------------custom-install-menu--o"
- echo "| 1) Install All Products"
- echo "| 2) Select Products to Install"
+ echo ",--------------------------------------------------------------------------"
+ echo "| 1) " `l10n_print "Install All Products"`
+ echo "| 2) " `l10n_print "Select Products to Install"`
if [ ! -z "$PATCHDIRS" ]; then
- echo "| 3) Select Patches to Install"
+ echo "| 3) " `l10n_print "Select Patches to Install"`
fi
echo "|"
- echo "| I) Start Installation"
- echo "| X) Exit"
+ echo "| I) " `l10n_print "Start Installation"`
+ echo "| X) " `l10n_print "Exit"`
echo "|"
- ask '`---> Please select:' "menu_sel" "I"
+ ask '`---> '`l10n_print 'Please select:'` "menu_sel" "I"
case $menu_sel in
1)
select_all_products
@@ -612,7 +623,8 @@
if [ ! -z "$PATCHDIRS" ]; then
select_patchdir_menu || return $?
else
- echo "Invalid selection"
+ l10n_print "Invalid selection"
+ sleep 1
fi
;;
i|I)
@@ -623,7 +635,8 @@
return 2
;;
*)
- echo "Invalid selection"
+ l10n_print "Invalid selection"
+ sleep 1
esac
done
return 0
@@ -632,13 +645,13 @@
so_menu () {
while /bin/true; do
clear
- echo ",-----------------------------office-selection-menu--o"
+ echo ",--------------------------------------------------------------------------"
echo "| 1) StarOffice"
echo "| 2) StarSuite"
echo "|"
- echo "| X) Exit"
+ echo "| X) " `l10n_print "Exit"`
echo "|"
- ask '`---> Please select:' "menu_sel" "1"
+ ask '`---> '`l10n_print 'Please select:'` "menu_sel" "1"
case $menu_sel in
1)
unselect_product starsuite
@@ -652,7 +665,8 @@
return 2
;;
*)
- echo "Invalid selection"
+ l10n_print "Invalid selection"
+ sleep 1
esac
done
return 0
@@ -662,8 +676,8 @@
IFS=,
while /bin/true; do
clear
- echo ",------------------------------patch-selection-menu--o"
- N=1
+ echo ",--------------------------------------------------------------------------"
+ typeset -i N=1
for pdir in $PATCHDIRS; do
pname=`echo "$ALL_PATCHDIRS" | grep "^$pdir=" | cut -f2- -d= | cut -c-60`
@@ -683,18 +697,18 @@
echo "| $n) [ ] $pname"
eval "patch_${N}_selected=0"
fi
- N=`expr $N + 1`
+ typeset N=$N+1
done
echo "|"
- echo "| A) Select All"
- echo "| U) Unselect All"
+ echo "| A) " `l10n_print "Select All"`
+ echo "| U) " `l10n_print "Unselect All"`
echo "|"
- echo "| S) Select individual patches"
- echo "| I) Start Installation"
- echo "| R) Return to previous menu"
- echo "| X) Exit"
+ echo "| S) " `l10n_print "Select individual patches"`
+ echo "| I) " `l10n_print "Start Installation"`
+ echo "| R) " `l10n_print "Return to previous menu"`
+ echo "| X) " `l10n_print "Exit"`
echo "|"
- ask '`---> Enter item to select/unselect:' "menu_sel" "R"
+ ask '`---> '`l10n_print 'Enter item to select/unselect:'` "menu_sel" "R"
case $menu_sel in
i|I)
do_install || return $?
@@ -718,7 +732,7 @@
*)
eval "the_patches=\$patch_${menu_sel}_list"
if [ -z "$the_patches" ]; then
- echo "Invalid selection"
+ l10n_print "Invalid selection"
sleep 1
else
eval "is_sel=\$patch_${menu_sel}_selected"
@@ -749,6 +763,7 @@
fi
dummy=`echo $dummy | cut -f1 -d-`
eval "PATCH_DESC_${dummy}=\"$pdesc\""
+ cd /
rm -rf $TEMPDIR/patchdesc
cd $TEMPDIR
done
@@ -760,8 +775,8 @@
IFS=,
while /bin/true; do
clear
- echo ",------------------------------patch-selection-menu--o"
- N=1
+ echo ",--------------------------------------------------------------------------"
+ typeset -i N=1
for ps in $ALL_PATCHES; do
test -z "$ps" && continue
@@ -782,17 +797,17 @@
echo "| $n) [ ] ($pcat) $pnum: $pname"
eval "patch_${N}_selected=0"
fi
- N=`expr $N + 1`
+ typeset N=$N+1
done
echo "|"
- echo "| A) Select All"
- echo "| U) Unselect All"
+ echo "| A) " `l10n_print "Select All"`
+ echo "| U) " `l10n_print "Unselect All"`
echo "|"
- echo "| I) Start Installation"
- echo "| R) Return to previous menu"
- echo "| X) Exit"
+ echo "| I) " `l10n_print "Start Installation"`
+ echo "| R) " `l10n_print "Return to previous menu"`
+ echo "| X) " `l10n_print "Exit"`
echo "|"
- ask '`---> Enter item to select/unselect:' "menu_sel" "R"
+ ask '`---> '`l10n_print 'Enter item to select/unselect:'` "menu_sel" "R"
case $menu_sel in
i|I)
do_install || return $?
@@ -816,7 +831,7 @@
*)
eval "the_patch=\$patch_${menu_sel}_name"
if [ -z "$the_patch" ]; then
- echo "Invalid selection"
+ l10n_print "Invalid selection"
sleep 1
else
eval "is_sel=\$patch_${menu_sel}_selected"
@@ -839,8 +854,8 @@
PRODUCTS="$save_PR"
while /bin/true; do
clear
- echo ",----------------------------product-selection-menu--o"
- N=1
+ echo ",--------------------------------------------------------------------------"
+ typeset -i N=1
for prod in $AP; do
prodname=`echo "$ALL_PRODUCTS" | grep "^$prod=" | cut -f2- -d= | cut -c-60`
@@ -851,23 +866,23 @@
eval "prod_${N}_name=\"$prod\""
product_is_selected $prod
if [ $? = 0 ]; then
- echo "| $n) [x] $prodname"
+ echo "| $n) [x] "`l10n_print "$prodname"`
eval "prod_${N}_selected=1"
else
- echo "| $n) [ ] $prodname"
+ echo "| $n) [ ] "`l10n_print "$prodname"`
eval "prod_${N}_selected=0"
fi
- N=`expr $N + 1`
+ typeset N=$N+1
done
echo "|"
- echo "| A) Select All"
- echo "| U) Unselect All"
+ echo "| A) " `l10n_print "Select All"`
+ echo "| U) " `l10n_print "Unselect All"`
echo "|"
- echo "| I) Start Installation"
- echo "| R) Return to previous menu"
- echo "| X) Exit"
+ echo "| I) " `l10n_print "Start Installation"`
+ echo "| R) " `l10n_print "Return to previous menu"`
+ echo "| X) " `l10n_print "Exit"`
echo "|"
- ask '`---> Enter item to select/unselect:' "menu_sel" "R"
+ ask '`---> '`l10n_print 'Enter item to select/unselect:'` "menu_sel" "R"
case $menu_sel in
i|I)
do_install || return $?
@@ -888,7 +903,7 @@
*)
eval "the_name=\$prod_${menu_sel}_name"
if [ -z "$the_name" ]; then
- echo "Invalid selection"
+ l10n_print "Invalid selection"
sleep 1
else
eval "is_sel=\$prod_${menu_sel}_selected"
@@ -908,7 +923,7 @@
cd $TEMPDIR/patchinst || return 1
unzip $MYDIR/$1 > /dev/null 2>&1 || return 1
if [ "x$QUIET" = xno ]; then
- echo "Installing patch $1"
+ l10n_print "Installing patch %s" "$1"
fi
IFS=" "
if [ "x$ROOTDIR" = x ]; then
@@ -922,6 +937,9 @@
do_install_patches () {
IFS=,
+ if [ ! -z "$PATCHES" ]; then
+ l10n_print "Installing required patches..."
+ fi
for p in $PATCHES; do
test -z "$p" && continue
# Skip if patch already applied.
@@ -930,7 +948,7 @@
patchnum=`echo $patchnum | sed 's/^T//'`
if [ -z "`showrev -p | awk '{print $2}' | /usr/bin/grep -s $patchnum`" ]; then
install_patch $p || \
- msg_error "Failed to install patch $p"
+ msg_error "Failed to install patch %s" "$p"
fi
done
}
@@ -950,19 +968,22 @@
fi
fi
+ l10n_print "Checking for sufficient disk space..."
disk_usage_init
IFS=,
for prod in $PRODUCTS; do
test -z "$prod" && continue
if [ ! -r "$prod/.pkgsize" ]; then
- msg_warning "WARNING: disk space usage information missing from directory $prod"
+ msg_warning "WARNING: disk space usage information missing from directory %s" "$prod"
continue
fi
- cat "$prod/.pkgsize" | while read line; do
+ exec < "$prod/.pkgsize"
+ while read line; do
the_dir=`echo "$line" | cut -f3- -d' '`
the_size=`echo "$line" | cut -f2 -d' '`
disk_usage_add "$ROOTDIR$the_dir" "$the_size"
done
+ exec <& 1
done
clear
@@ -971,8 +992,12 @@
disk_usage_check
+ l10n_print "Removing older versions of JDS packages..."
+
+ l10n_print "Determining package installation order..."
+
backup $LOGFILE
- echo "JDS Installation Log opened at `date`" > $LOGFILE
+ echo "JDS Installation Log opened at `LANG=C LC_ALL=C date`" > $LOGFILE
do_install_patches
@@ -980,7 +1005,7 @@
for prod in $PRODUCTS; do
test -z "$prod" && continue
if [ ! -d "$MYDIR/$prod" ]; then
- msg_warning "Product $prod not found in the install image"
+ msg_warning "Product %s not found in the install image" "$prod"
continue
fi
prodname=`echo "$ALL_PRODUCTS" | grep "^$prod=" | cut -f2- -d=`
@@ -991,7 +1016,8 @@
echo
echo -------------------------------------------------
fi
- echo "Installing Product \"$prodname\""
+ lprodname=$(l10n_print "$prodname")
+ l10n_print "Installing Product \"%s\"" "$lprodname"
if [ -r "$MYDIR/$prod/.remove-always" ]; then
remove_always $prod
fi
@@ -1140,9 +1166,48 @@
return 2
}
+disclaimer_screen () {
+ if [ "x$INTERACTIVE" = xyes ]; then
+ l10n_print "You are about to install Sun Java Desktop System, Release 2.\nThis install will replace any old versions of the following\nproducts you may have installed on your system with the newer\nversion included in JDS: GNOME, Mozilla and Java\nMedia Framework. It may also replace the installed version\nof Java 1.4.2 if it is older than the version included in JDS."
+ fi
+}
+
+license_screen () {
+ lic_file="$MYDIR/license.txt"
+ if [ -f "$MYDIR/.install/$LANG/license.txt" ]; then
+ lic_file="$MYDIR/.install/$LANG/license.txt"
+ elif [ -f "$MYDIR/.install/$LC_ALL/license.txt" ]; then
+ lic_file="$MYDIR/.install/$LC_ALL/license.txt"
+ elif [ -f "$MYDIR/.install/$LC_MESSAGES/license.txt" ]; then
+ lic_file="$MYDIR/.install/$LC_MESSAGES/license.txt"
+ fi
+ if [ "x$LICENSE_ACCEPTED" = "xyes" ]; then
+ cat "$lic_file"
+ return
+ fi
+ if [ "x$INTERACTIVE" = xyes ]; then
+ l10n_print "Before installing you must first accept the following license"
+ echo
+ l10n_print "Press [ENTER] to view the license"
+ read dummy
+ more "$lic_file"
+ ask "`l10n_print 'Type \"Accept\" to accept the license\nand install Sun Java Desktop System Release 2'`" ans_accept
+ echo "$ans_accept" | grep -i "^`l10n_print 'Accept'`$" > /dev/null
+ if [ $? != 0 ]; then
+ l10n_print "Installation aborted"
+ exit 1
+ fi
+ else
+ l10n_print "In non-interactive mode, you must use the --accept option\nto accept the license terms"
+ exit 1
+ fi
+}
+
main () {
init
process_options "${@}"
+ disclaimer_screen
+ license_screen
TEMPDIR=${BASE_TEMPDIR}/install_jds_$$.dir
write_admin
if [ "x$NO_PATCHES" != "xyes" ]; then
@@ -1170,9 +1235,12 @@
fi
if [ "x$WARNINGS" = xyes ]; then
- echo "Completed with warnings. Some packages could not be installed."
+ l10n_print "Completed with warnings. Some packages may not be installed."
else
- echo "Successfully installed all packages."
+ l10n_print "Successfully installed all packages."
fi
-echo "Installation log saved in $LOGFILE"
+l10n_print "Installation log saved in %s" "$LOGFILE"
+
+echo
+l10n_print "You must now reboot your computer before using the Java Desktop System"