Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Jaka Kranjc (63ff443b65a1547f5846890fb044df2580ed64c4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Jaka Kranjc (63ff443b65a1547f5846890fb044df2580ed64c4)
  • Date: Sun, 22 Oct 2006 14:49:14 -0500

GIT changes to master z-rejected grimoire by Jaka Kranjc
<lynxlynxlynx AT sourcemage.org>:

ChangeLog | 3 +
dev/null |binary
gurus.gpg |binary
z-editors/openoffice2-bin/DETAILS | 6
+--
z-editors/openoffice2-bin/HISTORY | 4
++
z-editors/openoffice2-bin/OOo_2.0.3_LinuxIntel_install.tar.gz.sig | 0
z-editors/openoffice2-bin/OOo_2.0.3_LinuxIntel_install_de.tar.gz.sig | 0
z-editors/openoffice2-bin/OOo_2.0.3_LinuxIntel_install_fr.tar.gz.sig | 0
z-editors/openoffice2-bin/OOo_2.0.4_LinuxIntel_install.tar.gz.sig |binary
z-editors/openoffice2-bin/OOo_2.0.4_LinuxIntel_install_de.tar.gz.sig |binary
z-editors/openoffice2-bin/OOo_2.0.4_LinuxIntel_install_fr.tar.gz.sig |binary
z-editors/openoffice2-bin/PRE_BUILD | 16
+++++-----
12 files changed, 19 insertions(+), 10 deletions(-)

New commits:
commit 87617411172581563e9b707b618f2a04891ae780
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

added my sig

commit ae75bda7aef5c611394b234f47615f0ed2fc4272
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

openoffice2-bin: 2.0.4-5

diff --git a/ChangeLog b/ChangeLog
index 78345e9..63ecd58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2006-10-22 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * gurus.gpg: added my sig
+
2006-10-06 Juuso Alasuutari <iuso AT sourcemage.org>
* z-java/java.sh: Removed bashism.

diff --git a/gurus.gpg b/gurus.gpg
index fe60607..68627fa 100644
Binary files a/gurus.gpg and b/gurus.gpg differ
diff --git a/z-editors/openoffice2-bin/DETAILS
b/z-editors/openoffice2-bin/DETAILS
index 44da73d..b0a6f82 100755
--- a/z-editors/openoffice2-bin/DETAILS
+++ b/z-editors/openoffice2-bin/DETAILS
@@ -1,5 +1,5 @@
SPELL=openoffice2-bin
- VERSION=2.0.3-7
+ VERSION=2.0.4-5
if [ "${OO2_LOCALE:-en}" == "en" ]; then
SOURCE=OOo_${VERSION/-*/}_LinuxIntel_install.tar.gz
COMMON_PATH=openoffice/stable
@@ -9,8 +9,8 @@ else
COMMON_PATH=openoffice/localized/${OO2_LOCALE}
SOURCE_DIRECTORY=$BUILD_DIRECTORY/openoffice2
fi
-
SOURCE_URL[0]=ftp://ftp.ussg.iu.edu/pub/${COMMON_PATH}/${VERSION/-*/}/${SOURCE}
-
SOURCE_URL[1]=http://mirrors.isc.org/pub/${COMMON_PATH}/${VERSION/-*/}/${SOURCE}
+
SOURCE_URL[0]=http://mirrors.isc.org/pub/${COMMON_PATH}/${VERSION/-*/}/${SOURCE}
+
SOURCE_URL[1]=ftp://ftp.ussg.iu.edu/pub/${COMMON_PATH}/${VERSION/-*/}/${SOURCE}

SOURCE_URL[2]=http://mirror.pacific.net.au/${COMMON_PATH}/${VERSION/-*/}/${SOURCE}

SOURCE_URL[3]=http://downloads.planetmirror.com/pub/${COMMON_PATH}/${VERSION/-*/}/${SOURCE}

SOURCE_URL[4]=http://ftp.scarlet.be/pub/${COMMON_PATH}/${VERSION/-*/}/${SOURCE}
diff --git a/z-editors/openoffice2-bin/HISTORY
b/z-editors/openoffice2-bin/HISTORY
index 219e7ad..f15260d 100644
--- a/z-editors/openoffice2-bin/HISTORY
+++ b/z-editors/openoffice2-bin/HISTORY
@@ -1,3 +1,7 @@
+2006-10-22 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: 2.0.4-5; switched two urls around to try to improve speed
+ * PRE_BUILD: generalised; now installs all packages
+
2006-08-30 Flavien Bridault <vlaaad AT sourcemage.org>
* DETAILS: Updated all versions to 2.0.3-7
* PRE_BUILD: Updated to work with new version
diff --git
a/z-editors/openoffice2-bin/OOo_2.0.3_LinuxIntel_install.tar.gz.sig
b/z-editors/openoffice2-bin/OOo_2.0.3_LinuxIntel_install.tar.gz.sig
deleted file mode 100644
index 1ba497b..0000000
Binary files
a/z-editors/openoffice2-bin/OOo_2.0.3_LinuxIntel_install.tar.gz.sig and
/dev/null differ
diff --git
a/z-editors/openoffice2-bin/OOo_2.0.3_LinuxIntel_install_de.tar.gz.sig
b/z-editors/openoffice2-bin/OOo_2.0.3_LinuxIntel_install_de.tar.gz.sig
deleted file mode 100644
index 313a5f2..0000000
Binary files
a/z-editors/openoffice2-bin/OOo_2.0.3_LinuxIntel_install_de.tar.gz.sig and
/dev/null differ
diff --git
a/z-editors/openoffice2-bin/OOo_2.0.3_LinuxIntel_install_fr.tar.gz.sig
b/z-editors/openoffice2-bin/OOo_2.0.3_LinuxIntel_install_fr.tar.gz.sig
deleted file mode 100644
index 5341817..0000000
Binary files
a/z-editors/openoffice2-bin/OOo_2.0.3_LinuxIntel_install_fr.tar.gz.sig and
/dev/null differ
diff --git
a/z-editors/openoffice2-bin/OOo_2.0.4_LinuxIntel_install.tar.gz.sig
b/z-editors/openoffice2-bin/OOo_2.0.4_LinuxIntel_install.tar.gz.sig
new file mode 100644
index 0000000..86586ef
Binary files /dev/null and
b/z-editors/openoffice2-bin/OOo_2.0.4_LinuxIntel_install.tar.gz.sig differ
diff --git
a/z-editors/openoffice2-bin/OOo_2.0.4_LinuxIntel_install_de.tar.gz.sig
b/z-editors/openoffice2-bin/OOo_2.0.4_LinuxIntel_install_de.tar.gz.sig
new file mode 100644
index 0000000..0ab051a
Binary files /dev/null and
b/z-editors/openoffice2-bin/OOo_2.0.4_LinuxIntel_install_de.tar.gz.sig differ
diff --git
a/z-editors/openoffice2-bin/OOo_2.0.4_LinuxIntel_install_fr.tar.gz.sig
b/z-editors/openoffice2-bin/OOo_2.0.4_LinuxIntel_install_fr.tar.gz.sig
new file mode 100644
index 0000000..a064fc5
Binary files /dev/null and
b/z-editors/openoffice2-bin/OOo_2.0.4_LinuxIntel_install_fr.tar.gz.sig differ
diff --git a/z-editors/openoffice2-bin/PRE_BUILD
b/z-editors/openoffice2-bin/PRE_BUILD
index e2b9efb..9836eb5 100755
--- a/z-editors/openoffice2-bin/PRE_BUILD
+++ b/z-editors/openoffice2-bin/PRE_BUILD
@@ -7,15 +7,17 @@ # Extracted root directories don't have
# versions, so use * wildcard although I don't find that very elegant
cd OO*/RPMS &&

-for PART in base calc core01 core02 core03 core03u core04 core04u
core05 core05u core06 core07 core08 core09 core10 draw
gnome-integration graphicfilter impress javafilter math pyuno testtool
writer xsltfilter
+for FILE in *.rpm
do
+ FILE="${FILE%.i586.rpm}"
+ PART=$(sed 's/openoffice.org-\([^-]*\)-.*$/\1/;' <<< $FILE)
message "${MESSAGE_COLOR}Extracting $PART ${DEFAULT_COLOR}" &&
- rpmunpack openoffice.org-$PART-$VERSION.i586.rpm &&
- gzip -d openoffice.org-$PART-$VERSION.cpio.gz &&
- cpio -idm < openoffice.org-$PART-$VERSION.cpio
+ rpmunpack $FILE.i586.rpm &&
+ gzip -d $FILE.cpio.gz &&
+ cpio -idm < $FILE.cpio
done &&

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



  • [SM-Commit] GIT changes to master z-rejected grimoire by Jaka Kranjc (63ff443b65a1547f5846890fb044df2580ed64c4), Jaka Kranjc, 10/22/2006

Archive powered by MHonArc 2.6.24.

Top of Page