Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (0bff8ef3937d344f076b1abd135445aafe104fd9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (0bff8ef3937d344f076b1abd135445aafe104fd9)
  • Date: Wed, 13 Jun 2007 14:17:42 -0500

GIT changes to master z-rejected grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

z-editors/openoffice2-bin/HISTORY | 4 ++++
z-editors/openoffice2-bin/INSTALL | 2 +-
z-editors/openoffice2-bin/PRE_BUILD | 6 +++---
3 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 0bff8ef3937d344f076b1abd135445aafe104fd9
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

openoffice2-bin: Make the branch directories dynamic

diff --git a/z-editors/openoffice2-bin/HISTORY
b/z-editors/openoffice2-bin/HISTORY
index f570bed..8528644 100644
--- a/z-editors/openoffice2-bin/HISTORY
+++ b/z-editors/openoffice2-bin/HISTORY
@@ -1,3 +1,7 @@
+2007-06-13 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD, INSTALL: Use ${VERSION%.*} instead of ${VERSION/.0/} to
+ always remove the last digit for "branch" (e.g. 2.2)
+
2007-03-30 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 2.2.0
* CONFIGURE: Renamed to PREPARE so we have OO2_LOCALES set in DETAILS
diff --git a/z-editors/openoffice2-bin/INSTALL
b/z-editors/openoffice2-bin/INSTALL
index ef7e740..e386068 100755
--- a/z-editors/openoffice2-bin/INSTALL
+++ b/z-editors/openoffice2-bin/INSTALL
@@ -19,7 +19,7 @@ else
cd $SOURCE_DIRECTORY/OO*/RPMS
fi &&

-cp -Rv opt/openoffice.org${VERSION/.0}/* $INSTALLDIR &&
+cp -Rv opt/openoffice.org${VERSION%.*}/* $INSTALLDIR &&
cp -Rv usr/share/icons/* $INSTALL_ROOT/usr/share/icons &&

# create bin links for executables.
diff --git a/z-editors/openoffice2-bin/PRE_BUILD
b/z-editors/openoffice2-bin/PRE_BUILD
index 584e412..88b68e3 100755
--- a/z-editors/openoffice2-bin/PRE_BUILD
+++ b/z-editors/openoffice2-bin/PRE_BUILD
@@ -31,6 +31,6 @@ do
done &&

message "${MESSAGE_COLOR}Extracting icons ${DEFAULT_COLOR}" &&
-rpmunpack
desktop-integration/openoffice.org-redhat-menus-${VERSION/.0/}*.noarch.rpm &&
-gzip -d openoffice.org-redhat-menus-${VERSION/.0/}*.cpio.gz &&
-cpio -idm < openoffice.org-redhat-menus-${VERSION/.0/}*.cpio
+rpmunpack
desktop-integration/openoffice.org-redhat-menus-${VERSION%.*}*.noarch.rpm &&
+gzip -d openoffice.org-redhat-menus-${VERSION%.*}*.cpio.gz &&
+cpio -idm < openoffice.org-redhat-menus-${VERSION%.*}*.cpio



  • [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (0bff8ef3937d344f076b1abd135445aafe104fd9), Eric Sandall, 06/13/2007

Archive powered by MHonArc 2.6.24.

Top of Page