From b7053a494b9f11514c660df405a7dcf2b8d8fa5e Mon Sep 17 00:00:00 2001 From: Damien Goutte-Gattat Date: Fri, 8 Feb 2013 11:10:00 +0100 Subject: [PATCH] xap/libreoffice: Upgraded to libreoffice-4.0.0. --- ...Linux_x86-64_install-rpm_en-US.tar.gz.sha1 | 1 - ...eOffice_4.0.0_Linux_x86-64_rpm.tar.gz.sha1 | 1 + ...inux_x86-64_rpm_helppack_en-US.tar.gz.sha1 | 1 + xap/libreoffice/libreoffice.SlackBuild | 24 +++++++++++++------ 4 files changed, 19 insertions(+), 8 deletions(-) delete mode 100644 xap/libreoffice/LibO_3.6.5_Linux_x86-64_install-rpm_en-US.tar.gz.sha1 create mode 100644 xap/libreoffice/LibreOffice_4.0.0_Linux_x86-64_rpm.tar.gz.sha1 create mode 100644 xap/libreoffice/LibreOffice_4.0.0_Linux_x86-64_rpm_helppack_en-US.tar.gz.sha1 diff --git a/xap/libreoffice/LibO_3.6.5_Linux_x86-64_install-rpm_en-US.tar.gz.sha1 b/xap/libreoffice/LibO_3.6.5_Linux_x86-64_install-rpm_en-US.tar.gz.sha1 deleted file mode 100644 index eb3efb93..00000000 --- a/xap/libreoffice/LibO_3.6.5_Linux_x86-64_install-rpm_en-US.tar.gz.sha1 +++ /dev/null @@ -1 +0,0 @@ -8cc970947bc3a1b53c3b6435ccf8ef1ccd6a44dc LibO_3.6.5_Linux_x86-64_install-rpm_en-US.tar.gz diff --git a/xap/libreoffice/LibreOffice_4.0.0_Linux_x86-64_rpm.tar.gz.sha1 b/xap/libreoffice/LibreOffice_4.0.0_Linux_x86-64_rpm.tar.gz.sha1 new file mode 100644 index 00000000..884c7411 --- /dev/null +++ b/xap/libreoffice/LibreOffice_4.0.0_Linux_x86-64_rpm.tar.gz.sha1 @@ -0,0 +1 @@ +3945d0fcbf65368d05bc12363dd3bb764918e889 LibreOffice_4.0.0_Linux_x86-64_rpm.tar.gz diff --git a/xap/libreoffice/LibreOffice_4.0.0_Linux_x86-64_rpm_helppack_en-US.tar.gz.sha1 b/xap/libreoffice/LibreOffice_4.0.0_Linux_x86-64_rpm_helppack_en-US.tar.gz.sha1 new file mode 100644 index 00000000..e3057e20 --- /dev/null +++ b/xap/libreoffice/LibreOffice_4.0.0_Linux_x86-64_rpm_helppack_en-US.tar.gz.sha1 @@ -0,0 +1 @@ +6554b5a284b51453ea6e750c8409f5190f4505ac LibreOffice_4.0.0_Linux_x86-64_rpm_helppack_en-US.tar.gz diff --git a/xap/libreoffice/libreoffice.SlackBuild b/xap/libreoffice/libreoffice.SlackBuild index d0dd782c..92187f76 100755 --- a/xap/libreoffice/libreoffice.SlackBuild +++ b/xap/libreoffice/libreoffice.SlackBuild @@ -34,10 +34,14 @@ else fi # Source package infos -VERSION=${VERSION:-3.6.5} -ARCHIVE=${ARCHIVE:-LibO_${VERSION}_Linux_${SRCARCH}_install-rpm_en-US.tar.gz} +VERSION=${VERSION:-4.0.0} +ARCHIVE=${ARCHIVE:-LibreOffice_${VERSION}_Linux_${SRCARCH}_rpm.tar.gz} WGET=${WGET:-http://download.documentfoundation.org/libreoffice/stable/$VERSION/rpm/$ARCH/$ARCHIVE} +# Help pack +HELPARC=LibreOffice_${VERSION}_Linux_${SRCARCH}_rpm_helppack_en-US.tar.gz +HELPGET=http://download.documentfoundation.org/libreoffice/stable/$VERSION/rpm/$ARCH/$HELPARC + # Built package infos NAMEPKG=${NAMEPKG:-libreoffice} BUILD=${BUILD:-1GGD} @@ -61,12 +65,17 @@ if [ ! -d $TMP ]; then exit 1 fi -# Get and verify the source archive +# Get and verify the source archives if [ ! -r $ARCHIVE ]; then wget -c -O $ARCHIVE.part "$WGET" mv $ARCHIVE.part $ARCHIVE fi +if [ ! -r $HELPARC ]; then + wget -c -O $HELPARC.part "$HELPGET" + mv $HELPARC.part $HELPARC +fi sha1sum -c $ARCHIVE.sha1 +sha1sum -c $HELPARC.sha1 NAME=$(tar ft $ARCHIVE | head -n 1 | cut -d / -f 1) # Extract the archive @@ -77,7 +86,8 @@ cd $NAME # Extract the RPMs cd RPMS -mv desktop-integration/libreoffice3.6-freedesktop-menus-3.6.5-2.noarch.rpm . +tar xf $CWD/$HELPARC --strip=2 LibreOffice_4.0.0.3_Linux_${SRCARCH}_rpm_helppack_en-US/RPMS/libobasis4.0-en-US-help-4.0.0.3-103.$ARCH.rpm +mv desktop-integration/libreoffice4.0-freedesktop-menus-4.0.0-103.noarch.rpm . for FILE in *.rpm ; do rpm2cpio < $FILE | cpio -imdv ; done mkdir -p $PKG mv opt usr $PKG @@ -88,16 +98,16 @@ cd $PKG/usr/bin for FILE in \ sbase scalc sdraw simpress smath soffice spadmin swriter unopkg ; do rm -f $FILE - ln -sf /opt/libreoffice3.6/program/$FILE . ; + ln -sf /opt/libreoffice4.0/program/$FILE . ; done cd - # Remove libstdc++ (force use of system libstdc++) -rm $PKG/opt/libreoffice3.6/ure/lib/libstdc++.so.6 +rm $PKG/opt/libreoffice4.0/ure/lib/libstdc++.so.6 # Place docs at the expected locations mkdir -p $PKG/usr/doc/$NAMEPKG-$VERSION -cd $PKG/opt/libreoffice3.6 +cd $PKG/opt/libreoffice4.0 mv CREDITS.odt *LICENSE* NOTICE readmes $PKG/usr/doc/$NAMEPKG-$VERSION find $PKG/usr/doc/$NAMEPKG-$VERSION -type f -exec chmod 644 {} \; cd -