Commits

Uelsk8s committed 7fc1369 Merge

Merged in m0e_lnx/m0e-vabs (pull request #128)

LibreOffice, OpenOffice, and git updates

  • Participants
  • Parent commits 49fce5a, 08e36eb

Comments (0)

Files changed (4)

File var/vabs/git/src/git.SlackBuild

 # AUTHORS = 
 
 NAME="git"            #Enter package Name!
-VERSION=${VERSION:-"1.8.4.1"}      #Enter package Version!
+VERSION=${VERSION:-"1.8.4.2"}      #Enter package Version!
 VER=$(echo $VERSION|sed 's/-/_/') #this fixes - in version
 VL_PACKAGER=${VL_PACKAGER:-"M0E-lnx"}   #Enter your Name!
 LINK=${LINK:-"http://$NAME-core.googlecode.com/files/$NAME-$VERSION.tar.gz"}  #Enter URL for package here!

File var/vabs/libreoffice/src/libreoffice.SlackBuild

 # AUTHORS = 
 
 NAME="libreoffice"            #Enter package Name!
-VERSION=${VERSION:-"4.1.2"}      #Enter package Version!
+VERSION=${VERSION:-"4.1.3"}      #Enter package Version!
 VER=$(echo $VERSION|sed 's/-/_/') #this fixes - in version
 VL_PACKAGER=${VL_PACKAGER:-"hata_ph"}   #Enter your Name!
 
 LDFLAG_OPTIONS=${LDFLAG_OPTIONS:-""}
 ADDRB=${ADDRB:-""} #Add deps that need to be added to the slack-required file here
 EXRB=${EXRB:-""} #Add deps that need to be excluded from the slack-required file here
+LINK64="http://ftp.osuosl.org/pub/tdf/${NAME}/stable/${VERSION}/rpm/x86_64/LibreOffice_${VERSION}_Linux_x86-64_rpm.tar.gz"
+LINK32=$(echo $LINK64 | sed 's|x86_64|x86|g' | sed 's|x86-64|x86|g')
+LINK=${LINK:-"$LINK32 $LINK64"}
 MAKEDEPENDS=${MAKEDEPENDS:-"cpio rpm cups dbus-glib ORBit2 GConf glu qt3"} #Add make deps for packaging
 #----------------------------------------------------------------------------
 
-
 # These variables seem to change with (almost) every release...
 SRCVERSION=$VERSION
 SRCSHORT=$(echo $VERSION | cut -f1-2 -d.) # "3.4"
    exit 1
 fi
 
-# SEPARATE LINKS FOR EACH ARCHITECTURE
-LINK32=${LINK32:-"http://ftp.osuosl.org/pub/tdf/${NAME}/stable/${VERSION}/rpm/x86/LibreOffice_${VERSION}_Linux_x86_rpm.tar.gz"}
-LINK64=${LINK64:-"http://ftp.osuosl.org/pub/tdf/${NAME}/stable/${VERSION}/rpm/x86_64/LibreOffice_${VERSION}_Linux_x86-64_rpm.tar.gz"}
-
-LINK="${LINK32} ${LINK64}"
-
 if [ "$NORUN" != 1 ]; then
 #CFLAGS SETUP
 #--------------------------------------------

File var/vabs/openoffice/src/openoffice.SlackBuild

 
 
 NAME="openoffice"            #Enter package Name!
-VERSION=${VERSION:-"4.0.0"}      #Enter package Version!
+VERSION=${VERSION:-"4.0.1"}      #Enter package Version!
 VER=$(echo $VERSION|sed 's/-/_/') #this fixes - in version
 VL_PACKAGER=${VL_PACKAGER:-"M0E-lnx"}   #Enter your Name!
 LINK64="http://downloads.sourceforge.net/project/openofficeorg.mirror/${VERSION}/binaries/en-US/Apache_OpenOffice_${VERSION}_Linux_x86-64_install-rpm_en-US.tar.gz"
 LDFLAG_OPTIONS=${LDFLAG_OPTIONS:-""}
 ADDRB=${ADDRB:-""} #Add deps that need to be added to the slack-required file here
 EXRB=${EXRB:-""} #Add deps that need to be excluded from the slack-required file here
-MAKEDEPENDS=${MAKEDEPENDS:-"jdk cpio rpm cups dbus-glib ORBit2 GConf glu qt3"} #Add make deps for packaging
+MAKEDEPENDS=${MAKEDEPENDS:-"jdk cpio rpm cups dbus-glib ORBit2 GConf glu qt3 gnome-vfs pangox-compat"} #Add make deps for packaging
 PRGNAM=${NAME} # LEAVE THIS HERE FOR COMPATIBILITY
 
 if [ "$NORUN" != 1 ]; then
 # the "set -eu" below will cause us to bail out with an error
 #[ -z $SOURCEDIR ] && unset SOURCEDIR
 
-#set -eu
-
+export JAVA_HOME=/usr/lib${LIBDIRSUFFIX}/java/jre/lib/
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 rm -rf $TMP/$NAME-$VERSION

File var/vabs/openoffice/src/slack-desc

 # customary to leave one space after the ':'.
 
               |-----handy-ruler------------------------------------------------------|
-openoffice.org: OpenOffice.org (a full-featured open-source office suite)
-openoffice.org:
-openoffice.org: OpenOffice.org is a full-featured open-source office suite that is
-openoffice.org: compatible with all other major office software.
-openoffice.org:
-openoffice.org: This is a repackaging of the official OpenOffice.org binary RPM's
-openoffice.org: distributed by the upstream developers.
-openoffice.org:
-openoffice.org: Homepage: http://openoffice.org
-openoffice.org:
-openoffice.org:
+openoffice: OpenOffice.org (a full-featured open-source office suite)
+openoffice:
+openoffice: OpenOffice.org is a full-featured open-source office suite that is
+openoffice: compatible with all other major office software.
+openoffice:
+openoffice: This is a repackaging of the official OpenOffice.org binary RPM's
+openoffice: distributed by the upstream developers.
+openoffice:
+openoffice: Homepage: http://openoffice
+openoffice:
+openoffice: