[Lunar-commits] <moonbase> openoffice-bin: Version bump to stable 3.0.0.

[Dennis Veatch]

On Sunday 12 October 2008 08:41:50 Dennis Veatch wrote:
> On Sunday 12 October 2008 01:29:36 Terry Chan wrote:
> > commit f788272723131d4000e2e22942f0f407b77c1132
> > Author: Terry Chan <tchan at lunar-linux.org>
> > Date:   Sun Oct 12 00:29:36 2008 -0500
> >
> >     openoffice-bin: Version bump to stable 3.0.0.
> > ---
> >  x11-apps/openoffice-bin/BUILD                      |   15
> > ++++++++------- x11-apps/openoffice-bin/DETAILS                    |    8
> > ++++---- .../openoffice-bin/profile.d/openoffice-bin.rc     |    4 ++--
> >  3 files changed, 14 insertions(+), 13 deletions(-)
> >
> > diff --git a/x11-apps/openoffice-bin/BUILD
> > b/x11-apps/openoffice-bin/BUILD index 3945a56..09fb578 100644
> > --- a/x11-apps/openoffice-bin/BUILD
> > +++ b/x11-apps/openoffice-bin/BUILD
> > @@ -1,7 +1,7 @@
> >  (
> >    OO_INSTALL_DIR="${SOURCE_DIRECTORY}/RPMS"
> >    OO_DESK_DIR="${SOURCE_DIRECTORY}/desktop-integration/usr"
> > -  OO_DIR="/opt/lunar/openoffice/openoffice.org2.4"
> > +  OO_DIR="/opt/lunar/openoffice/openoffice.org3"
> >
> >    cd $OO_INSTALL_DIR  &&
> >
> > @@ -10,13 +10,13 @@
> >      mv ${OO_INSTALL_DIR}/desktop-integration ${SOURCE_DIRECTORY}/ &&
> >      cd ${SOURCE_DIRECTORY}/desktop-integration/ &&
> >
> > -    INT_FILE=openoffice.org-freedesktop-menus-2.4-9268.noarch &&
> > +    INT_FILE=openoffice.org-freedesktop-menus-3.0-9354.noarch &&
> >
> >      rpm2cpio $INT_FILE.rpm > $INT_FILE.cpio &&
> >      cpio -idm < $INT_FILE.cpio &&
> >
> > -    sedit "s|/etc/openoffice.org2.4|$OO_DIR|g"
> > ${OO_DESK_DIR}/bin/openoffice.org2.4 && -    sedit
> > "s|/etc/openoffice.org2.4|$OO_DIR|g"
> > ${OO_DESK_DIR}/bin/openoffice.org2.4-printeradmin || exit 1 +    sedit
> > "s|/etc/openoffice.org3|$OO_DIR|g" ${OO_DESK_DIR}/bin/openoffice.org3 &&
> > + sedit "s|/etc/openoffice.org3|$OO_DIR|g"
> > ${OO_DESK_DIR}/bin/openoffice.org3-printeradmin || exit 1 fi  &&
> >
> >
> > @@ -39,7 +39,8 @@
> >    prepare_install  &&
> >    message "${MESSAGE_COLOR}Installing OpenOffice
> > ${VERSION}...${DEFAULT_COLOR}"  && mkdir -p /opt/lunar/openoffice  &&
> > -  cp -a "${OO_INSTALL_DIR}/opt/openoffice.org2.4" /opt/lunar/openoffice/
> > && +  cp -a "${OO_INSTALL_DIR}/opt/openoffice.org3"
> > /opt/lunar/openoffice/ && +  cp -a "${OO_INSTALL_DIR}/opt/openoffice.org"
> > /opt/lunar/openoffice &&
> >
> >    #Added this force symlink creation at sofar's request
> >    cd /usr/bin &&
> > @@ -48,8 +49,8 @@
> >    ln -sf ${OO_DIR}/program/swriter swriter &&
> >
> >    if [ "$USE_DESKTOPINTEGRATION" = "y" ] ; then
> > -    install -m755 ${OO_DESK_DIR}/bin/openoffice.org2.4 \
> > -                  ${OO_DESK_DIR}/bin/openoffice.org2.4-printeradmin
> > /usr/bin/ && +    install -m755 ${OO_DESK_DIR}/bin/openoffice.org3 \
> > +                  ${OO_DESK_DIR}/bin/openoffice.org3-printeradmin
> > /usr/bin/ &&
> >
> >      # Install icons for the .desktop files
> >      mkdir -p -m0755 /usr/share/icons/{gnome,hicolor} &&
> > diff --git a/x11-apps/openoffice-bin/DETAILS
> > b/x11-apps/openoffice-bin/DETAILS index 73b1dd9..f244f98 100644
> > --- a/x11-apps/openoffice-bin/DETAILS
> > +++ b/x11-apps/openoffice-bin/DETAILS
> > @@ -1,15 +1,15 @@
> >            MODULE=openoffice-bin
> > -         VERSION=2.4.1
> > +         VERSION=3.0.0
> >            SOURCE=OOo_${VERSION}_LinuxIntel_install_en-US.tar.gz
> > -SOURCE_DIRECTORY=${BUILD_DIRECTORY}/OOH680_m17_native_packed-1_en-US.931
> >0
> > +SOURCE_DIRECTORY=${BUILD_DIRECTORY}/OOO300_m9_native_packed-1_en-US.9358
> > SOURCE_URL[0]=http://ftp.ussg.iu.edu/openoffice/stable/$VERSION/
> > SOURCE_URL[1]=http://mirrors.sunsite.dk/openoffice/stable/$VERSION/
> >
> > SOURCE_URL[2]=http://niihau.student.utwente.nl/openoffice/stable/$VERSION
> >/
> > SOURCE_URL[3]=ftp://ftp.funet.fi/pub/mirrors/openoffice.org/stable/$VERSI
> >ON / -      SOURCE_VFY=sha1:d12a4958e456230b3230471352e28727b4a52d87 +    
> >  SOURCE_VFY=sha1:e0c57bd78ed8f20e3d4ad5063168b22417c80579
> >          WEB_SITE=http://www.openoffice.org/
> >           ENTERED=20020704
> > -         UPDATED=20080705
> > +         UPDATED=20081011
> >             SHORT="The open office suite for unix"
> >         LDD_CHECK=off
> >           ARCHIVE=off
> > diff --git a/x11-apps/openoffice-bin/profile.d/openoffice-bin.rc
> > b/x11-apps/openoffice-bin/profile.d/openoffice-bin.rc index
> > afa7598..b6dd4e0 100644
> > --- a/x11-apps/openoffice-bin/profile.d/openoffice-bin.rc
> > +++ b/x11-apps/openoffice-bin/profile.d/openoffice-bin.rc
> > @@ -1,5 +1,5 @@
> >  # openoffice-bin specific stuff
> >
> > -[ -d /opt/lunar/openoffice/openoffice.org2.3/program ] &&
> > -    PATH="$PATH:/opt/lunar/openoffice/openoffice.org2.3/program"
> > +[ -d /opt/lunar/openoffice/openoffice.org3/program ] &&
> > +    PATH="$PATH:/opt/lunar/openoffice/openoffice.org3/program"
> >
> > _______________________________________________
>
> + CXX="g++"
> + CPP="cpp"
> + CFLAGS=" -O2 -march=athlon64 -pipe"
> + CXXFLAGS=" -O2 -march=athlon64 -pipe"
> + CPPFLAGS=""
> + LDFLAGS=" -s"
> + MAKES="3"
> + Enabled wrapper script usage
> Can't read file openoffice.org-freedesktop-menus-3.0-9354.noarch.rpm
> Creating /var/log/lunar/compile/openoffice-bin-3.0.0.bz2
> ! Problem detected during BUILD

Hmm, that's odd. Seem to be missing something here. Isn't it rpmunpack we use?
-- 
You can tuna piano but you can't tune a fish.

http://www.lunar-linux.org/
It's worth the spin.