From: gobo72 <gobo72@364a67c3-989e-7be9-548d-dae8560ea662>
Date: Tue, 23 Aug 2011 23:32:02 +0000 (+0000)
Subject: Déplacé Gnumeric et Abiword au stage5.
X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;ds=inline;h=80ded7d3025385c80af4e034a79cf23f5be04267;p=hvlinux.git

Déplacé Gnumeric et Abiword au stage5.
---

diff --git a/config/packages-list b/config/packages-list
index 3ba4ced..07f20f8 100644
--- a/config/packages-list
+++ b/config/packages-list
@@ -190,8 +190,8 @@ GMP="gmp-5.0.1"
 GNOME_MOUNT="gnome-mount-0.6"
 GNUTLS="gnutls-2.10.2"
 GOBJECT_INSTROSPECTION="gobject-introspection-0.10.2"
-GOFFICE="goffice-0.2.2"
-GNUMERIC="gnumeric-1.6.3"
+GOFFICE="goffice-0.8.17"
+GNUMERIC="gnumeric-1.10.17"
 GNUPG="gnupg-1.4.11"
 GREP="grep-2.6.3"
 GRIP="grip-3.3.1"
@@ -259,7 +259,7 @@ LIBGCRYPT="libgcrypt-1.4.6"
 LIBGEDA="libgeda-1.2.0"
 LIBGLADE="libglade-2.6.4"
 LIBGPG_ERROR="libgpg-error-1.10"
-LIBGSF="libgsf-1.14.7"
+LIBGSF="libgsf-1.14.19"
 LIBID3TAG="libid3tag-0.15.1b"
 LIBIDL="libIDL-0.8.14"
 LIBJPEG="libjpeg-7"
diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 2e646ff..c127016 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -160,6 +160,15 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg ${SUBVERSION}
 fi
 
+if [ "x${INST_TYPE}" = "xworkstation" -o \
+    "x${INST_TYPE}" = "xltsp-server" ]; then
+    ipkg ${LIBGSF}
+    ipkg -m acnb ${GOFFICE}
+    ipkg ${GNUMERIC} "--localstatedir=/var/lib --disable-pdfdocs"
+    ipkg ${WV}
+    ipkg ${ABIWORD} "--disable-spellcheck"
+fi
+
 ipkg ${INDENT}
 
 if [ "x${USE_SAMBA}" = "xyes" ]; then
diff --git a/stage5/packages-update b/stage5/packages-update
index 3ecfbcb..0aee6f3 100755
--- a/stage5/packages-update
+++ b/stage5/packages-update
@@ -157,10 +157,16 @@ fpkg -e "tar.gz" ${LIBGAMIN} "http://www.gnome.org/~veillard/gamin/sources"
 
 fpkg -m sf ${PCMANFM}
 
-#fpkg_mis   ${SPLINT} "${SPLINT}.src" "http://splint.org/downloads"
+fpkg -m gnome ${LIBGSF}
+fpkg -m gnome ${GOFFICE}
+fpkg -m gnome ${GNUMERIC}
+fpkg -e "tar.gz" ${WV} "${ABIWORD_URL}/wv/$(get_pkg_ver ${WV})"
+fpkg -e "tar.gz" ${ABIWORD} \
+    "${ABIWORD_URL}/abiword/$(get_pkg_ver ${ABIWORD})/source"
 
-GEDA_BASE_URL=http://geda.seul.org/release/v$(get_pkg_ver2 ${LIBGEDA})/$(get_pkg_ver ${LIBGEDA})
+#fpkg_mis   ${SPLINT} "${SPLINT}.src" "http://splint.org/downloads"
 
+#GEDA_BASE_URL=http://geda.seul.org/release/v$(get_pkg_ver2 ${LIBGEDA})/$(get_pkg_ver ${LIBGEDA})
 #fpkg ${LIBGEDA}       ${GEDA_BASE_URL}
 #fpkg ${GEDA_SYMBOLS}  ${GEDA_BASE_URL}
 #fpkg ${GEDA_GSCHEM}   ${GEDA_BASE_URL}
diff --git a/stage6/hv-install-1 b/stage6/hv-install-1
index e3a0085..3708f6d 100755
--- a/stage6/hv-install-1
+++ b/stage6/hv-install-1
@@ -1,26 +1,14 @@
 #!/bin/bash
 
-# Reading system configuration informations, functions and package versions.
-source ../config/sysinfos
-source ../functions
-hvtrap_setup
-source ../config/packages-list
+source ../functions/main
 source /etc/profile
 
-if [ "x${USER}" != "xroot" ]; then
-    echo "You must be the superuser to install hvlinux."
-    exit 1
-fi
-
+check_for_root_user
 init_log_file
 
 # Gnome core packages
-##ipkg_gnome ${ORBIT2}
 ipkg_gnome ${LIBBONOBO}
-###ipkg  ${GCONF} cis-gconf
 ipkg_gnome ${GNOME_MIME_DATA}
-####ipkg  ${GNOME_VFS} cis-gnome-nb
-####ipkg_gnome ${GNOME_VFS_MONIKERS}
 ipkg_gnome ${LIBGNOME}
 ipkg_gnome ${LIBGNOMECANVAS}
 ipkg_gnome ${LIBBONOBOUI}
@@ -34,12 +22,6 @@ ipkg_gnome ${GNOME_DESKTOP}
 ipkg_gnome ${GNOME_BACKGROUNDS}
 ipkg_gnome ${GNOME_MENUS}
 ipkg_gnome ${GNOME_PANEL}
-ipkg    ${GSTREAMER}
-ipkg    ${GST_PLUGINS_BASE}
-ipkg    ${GST_PLUGINS_GOOD}
-ipkg    ${GST_PLUGINS_BAD}
-ipkg    ${GST_PLUGINS_UGLY}
-ipkg    ${GST_FFMPEG}
 ipkg    ${VTE} "--libexecdir=/usr/sbin --disable-gtk-doc"
 ipkg_gnome ${GNOME_TERMINAL}
 ipkg_gnome ${LIBGTOP}
@@ -67,7 +49,6 @@ ipkg -m gnomenb ${SYSTEM_TOOLS_BACKENDS}
 ipkg ${GNOME_AUDIO}
 
 # Gnome 2 additional packages - Utilities
-ipkg_gnome ${GEDIT} "--disable-spell"
 ipkg_gnome ${EOG}
 
 ipkg ${LIBSPECTRE}
@@ -94,11 +75,6 @@ ipkg ${GDM}
 
 ipkg ${RHYTHMBOX} "--disable-python"
 
-ipkg ${LIBGSF}
-ipkg -m acnb ${GOFFICE}
-ipkg ${GNUMERIC}
-ipkg ${WV}
-ipkg ${ABIWORD}  "--disable-spellcheck"
 ipkg_gnome ${EVOLUTION} "--with-nss-includes=/usr/include/nss --with-nspr-includes=/usr/include/nspr --with-openldap=yes --with-krb5=/usr"
 ipkg_gnome ${EVOLUTION_EXCHANGE}
 
diff --git a/stage6/packages-update b/stage6/packages-update
index 0ae48ee..c50b9f4 100755
--- a/stage6/packages-update
+++ b/stage6/packages-update
@@ -9,9 +9,7 @@ source ../functions/main
 update_packages_init ${*}
 
 # Gnome 2 core packages
-fpkg -m gnome ${ORBIT2}
 fpkg -m gnome ${LIBBONOBO}
-fpkg -m gnome ${GCONF}
 fpkg -m gnome ${GNOME_MIME_DATA}
 fpkg -m gnome ${GNOME_VFS}
 fpkg -m gnome ${GNOME_VFS_MONIKERS}
@@ -19,7 +17,6 @@ fpkg -m gnome ${LIBGNOME}
 fpkg -m gnome ${LIBGNOMECANVAS}
 fpkg -m gnome ${LIBBONOBOUI}
 fpkg -m gnome ${GNOME_ICON_THEME}
-fpkg -m gnome ${GNOME_KEYRING}
 fpkg -m gnome ${LIBGNOMEUI}
 fpkg -m gnome ${GNOME_THEMES}
 fpkg -m gnome ${SCROLLKEEPER}
@@ -53,7 +50,6 @@ fpkg -m gnome ${SYSTEM_TOOLS_BACKENDS}
 fpkg -m gnome ${GNOME_AUDIO}
 
 # Gnome 2 additional packages - Utilities
-fpkg -m gnome ${GEDIT}
 fpkg -m gnome ${EOG}
 fpkg -m gnome ${EVINCE}
 fpkg -m gnome ${FILE_ROLLER}
@@ -77,13 +73,6 @@ fpkg -m gnome ${GDM}
 
 fpkg -m gnome ${RHYTHMBOX}
 
-fpkg -m gnome ${LIBGSF}
-fpkg -m gnome ${GOFFICE}
-fpkg -m gnome ${GNUMERIC}
-fpkg -e "tar.gz" ${WV} "${ABIWORD_URL}/wv/$(get_pkg_ver ${WV})"
-fpkg -e "tar.gz" ${ABIWORD} \
-    "${ABIWORD_URL}/abiword/$(get_pkg_ver ${ABIWORD})/source"
-
 fpkg -m gnome ${EVOLUTION_EXCHANGE}
 fpkg -m gnome ${EVOLUTION}
 
diff --git a/stage6/pkg/gal b/stage6/pkg/gal
deleted file mode 100644
index c9c0095..0000000
--- a/stage6/pkg/gal
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-# First argument of this script is the package name
-
-# Reading system configuration informations, functions and package versions.
-source ../sysinfos
-source ../functions
-source ../packages-list
-
-# Applying patches (if any)
-apply_patches ${1} &&
-
-# In order to build the documentation using GTK-Doc, to fix a build problem.
-cd ${LFS_TMP}/${1} &&
-mv docs/gal-decl.txt docs/gal-2.4-decl.txt &&
-mv docs/gal-sections.txt docs/gal-2.4-sections.txt &&
-sed -i -e "s/gal-decl/gal-2.4-decl/" \
-    -e "s/gal-sections/gal-2.4-sections/" docs/Makefile.in &&
-
-cd ${LFS_TMP}/${1}-build &&
-../${1}/configure \
-    --prefix=/usr \
-    --libexecdir=/usr/sbin \
-    --localstatedir=/var/lib \
-    --infodir=/usr/share/info \
-    --sysconfdir=/etc &&
-make &&
-make install &&
-ldconfig
-
-# Return last error
-exit $?
diff --git a/stage6/pkg/gnumeric b/stage6/pkg/gnumeric
deleted file mode 100644
index b7e98e7..0000000
--- a/stage6/pkg/gnumeric
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-# First argument of this script is the package name
-
-# Reading system configuration informations, functions and package versions.
-source ../sysinfos
-source ../functions
-source ../packages-list
-
-# Applying patches (if any)
-apply_patches ${1} &&
-
-cd ${LFS_TMP}/${1} &&
-./configure \
-    --prefix=/usr \
-    --localstatedir=/var/lib \
-    --sysconfdir=/etc &&
-make &&
-make install &&
-
-ln -svf /usr/share/gnome/help/gnumeric \
-    /usr/share/gnumeric/$(get_pkg_ver ${1})/doc &&
-
-if [ $(pkg-config --variable=prefix ORBit-2.0) != "/usr" ]; then
-    mv -v /usr/lib/bonobo/servers/GNOME_Gnumeric.server \
-        $(pkg-config --variable=prefix ORBit-2.0)/lib/bonobo/servers &&
-    rmdir -v /usr/lib/{bonobo/servers,bonobo}
-fi &&
-
-ldconfig
-
-# Return last error
-exit $?