Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (54dfccf960244b0ddec6dbf61d0247cc9126c92f)

Chronological Thread  
    < 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 (54dfccf960244b0ddec6dbf61d0247cc9126c92f)
  • Date: Sat, 1 May 2010 12:30:38 -0500
GIT changes to master z-rejected grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

z-net/ts2_client/BUILD | 5 ++++-
z-net/ts2_client/CONFIGURE | 3 +--
z-net/ts2_client/DETAILS | 15 +++++++++------
z-net/ts2_client/HISTORY | 14 ++++++++++++++
z-net/ts2_client/INSTALL | 30 +++++++++++++++++++++++-------
z-net/ts2_client/PRE_BUILD | 3 +++
z-net/ts2_client/jpegsrc.v6b.tar.gz.sig |binary
z-net/ts2_client/teamspeak | 3 +--
z-net/ts2_server/CONFIGURE | 3 +--
z-net/ts2_server/DETAILS | 10 +++++-----
z-net/ts2_server/HISTORY | 4 ++++
11 files changed, 65 insertions(+), 25 deletions(-)

New commits:
commit 54dfccf960244b0ddec6dbf61d0247cc9126c92f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ts2_client: Increment PATCHLEVEL for jpeg6b and install location

commit 1157901fce75e4271873b10899c57a6904de4ded
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ts2_client: No nead for the return
/home/sandalle/scm/git/smgl/z-rejected/z-net/ts2_server

commit d7a27dafb197c407cbbb68b32f288f9ac1cddee3
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ts2_client: Install to /usr/libexec instead of architecture-independent
/usr/share

commit 3870928ade4abed1b0fd0d297d518c18b0594694
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ts2_client: This is safe for unattended updates

commit 6c082a82c72988fb01c6074faf8fe1195f8df5f3
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ts2_client: Download and build local copy of jpeg6b

commit 33bbcb61063305a129d976c144e519b7a0c3eb78
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ts2_client: Add Desktop file

commit 0a308f297d92e0cbd72023bf7249ff49d4cee0f4
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ts2_server: Cleanup whitespace

commit ed4c387b7e4a2004660981581a68f4aa38f0533f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ts2_client: Cleanup whitespace

commit 41ab0a3c5648bf87dab774b7959c7fe47db22662
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ts2_server: Fix WEB_SITE

commit cf7e2ce7b76ac7c52bad8336fdc7745ac059c04d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ts2_client: Fix WEB_SITE

diff --git a/z-net/ts2_client/BUILD b/z-net/ts2_client/BUILD
index 27ba77d..b4bf555 100755
--- a/z-net/ts2_client/BUILD
+++ b/z-net/ts2_client/BUILD
@@ -1 +1,4 @@
-true
+cd $SOURCE_DIRECTORY/jpeg-6b &&
+OPTS="--enable-shared $OPTS" &&
+./ltconfig --no-verify ./ltmain.sh $HOST &&
+default_build
diff --git a/z-net/ts2_client/CONFIGURE b/z-net/ts2_client/CONFIGURE
index 6b3e0c3..49b9e31 100755
--- a/z-net/ts2_client/CONFIGURE
+++ b/z-net/ts2_client/CONFIGURE
@@ -1,4 +1,3 @@
# Standard rejected warnings.
#
-source $GRIMOIRE/REJECTED_MSG
-
+source $GRIMOIRE/REJECTED_MSG
diff --git a/z-net/ts2_client/DETAILS b/z-net/ts2_client/DETAILS
index 5d7b983..af5b616 100755
--- a/z-net/ts2_client/DETAILS
+++ b/z-net/ts2_client/DETAILS
@@ -1,18 +1,21 @@
- SPELL=ts2_client
+ SPELL=ts2_client
VERSION=rc2_2032
- SOURCE="${SPELL}_${VERSION}.tar.bz2"
+ SOURCE="${SPELL}_${VERSION}.tar.bz2"
+ SOURCE2=jpegsrc.v6b.tar.gz
+ SOURCE2_GPG="gurus.gpg:$SOURCE2.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}_${VERSION}

SOURCE_URL[0]=ftp://ftp.freenet.de/pub/4players/teamspeak.org/releases/$SOURCE
-
SOURCE_HASH=sha512:14b8b91ab6e18c7cb874aee55374b139926d21f3f9eb6a075b5ea884b5dd88a3f3c98e6a3df58516c417046dc6bca0827dd9fb30eee68658c2f3e22e5952e058

- WEB_SITE=http://www.goteamspeak.org/
+ SOURCE2_URL[0]=http://www.ijg.org/files/$SOURCE2
+
SOURCE_HASH=sha512:14b8b91ab6e18c7cb874aee55374b139926d21f3f9eb6a075b5ea884b5dd88a3f3c98e6a3df58516c417046dc6bca0827dd9fb30eee68658c2f3e22e5952e058
+ WEB_SITE=http://www.goteamspeak.com/
ENTERED=20040920
LICENCE[0]='http://www.goteamspeak.com/faq.php?faq=1'
+ PATCHLEVEL=1
REJECT="has licensing issues"
SHORT="P2P talking over the net (client side)"
cat << EOF
-This is a very popular p2p talking client and server set up that
+This is a very popular p2p talking client and server set up that
is used with many fps games.

Teamspeak is free of charge to non-commercial users.
EOF
-
diff --git a/z-net/ts2_client/HISTORY b/z-net/ts2_client/HISTORY
index 849fa2e..9e7ecb2 100644
--- a/z-net/ts2_client/HISTORY
+++ b/z-net/ts2_client/HISTORY
@@ -1,3 +1,16 @@
+2010-05-01 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Fix WEB_SITE
+ Download jpeg6b
+ PATCHLEVEL++
+ * PRE_BUILD: Extract jpeg6b
+ * BUILD: Build jpeg6b
+ * INSTALL: Create Desktop file
+ Install libjpeg.so.62
+ Install to /usr/libexec instead of architecture-independent
/usr/share
+ * teamspeak: Installed to /usr/libexec instead of /usr/share
+ No nead for the return `cd -`
+ * UNATTEND_SAFE: This is safe for unattended updates
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

@@ -13,3 +26,4 @@

2004-09-20 David Brown <dmlb2000 AT excite.com>
* ALL: created spell
+
diff --git a/z-net/ts2_client/INSTALL b/z-net/ts2_client/INSTALL
index 071c351..c10f131 100755
--- a/z-net/ts2_client/INSTALL
+++ b/z-net/ts2_client/INSTALL
@@ -1,16 +1,32 @@
-INSTALLDIR=/usr/share/TeamSpeak
-DOCDIR=/usr/share/doc/${SPELL}
-SHAREDIR=/usr/share/${SPELL}
+INSTALLDIR=/usr/libexec/$SPELL &&
+DOCDIR=/usr/share/doc/${SPELL} &&

cd $SOURCE_DIRECTORY/setup.data/image &&

# edit configuration.
-sedit 's:\%installdir\%:\/usr\/share\/ts2_client:' TeamSpeak &&
+sedit 's:\%installdir\%:\/usr\/libexec\/ts2_client:' TeamSpeak &&

# create dirs and install.
-mkdir -p $DOCDIR $SHAREDIR &&
+mkdir -p $DOCDIR $INSTALLDIR &&
cp -rv manual $DOCDIR/ &&
cp -rv *.txt $DOCDIR/ &&
-cp -rv ./* $SHAREDIR/ &&
+cp -rv ./* $INSTALLDIR/ &&
cp -rv $SCRIPT_DIRECTORY/teamspeak /usr/bin &&
-chmod 755 /usr/bin/teamspeak
+chmod 755 /usr/bin/teamspeak &&
+
+#
+# Copy custom-build libjpeg.so, stupid binaries
+#
+cp -v $SOURCE_DIRECTORY/jpeg-6b/.libs/libjpeg.so \
+ $INSTALL_ROOT/usr/libexec/$SPELL/libjpeg.so.62
+
+# Create Desktop file
+cat << EOF > $INSTALL_ROOT/usr/share/applications/$SPELL.desktop
+[Desktop Entry]
+Name=TeamSpeak
+Comment=Internet-based conferencing
+Exec=teamspeak
+Type=Application
+Icon=$INSTALL_ROOT/usr/share/ts2_client/icon.xpm
+Categories=Internet
+EOF
diff --git a/z-net/ts2_client/PRE_BUILD b/z-net/ts2_client/PRE_BUILD
new file mode 100755
index 0000000..cc2691f
--- /dev/null
+++ b/z-net/ts2_client/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+unpack_file '2'
diff --git a/z-net/ts2_client/UNATTEND_SAFE b/z-net/ts2_client/UNATTEND_SAFE
new file mode 100644
index 0000000..e69de29
diff --git a/z-net/ts2_client/jpegsrc.v6b.tar.gz.sig
b/z-net/ts2_client/jpegsrc.v6b.tar.gz.sig
new file mode 100644
index 0000000..73bb82e
Binary files /dev/null and b/z-net/ts2_client/jpegsrc.v6b.tar.gz.sig differ
diff --git a/z-net/ts2_client/teamspeak b/z-net/ts2_client/teamspeak
index f6f9586..e3edbc3 100755
--- a/z-net/ts2_client/teamspeak
+++ b/z-net/ts2_client/teamspeak
@@ -2,6 +2,5 @@
#
# TeamSpeak wrapper script.
#
-cd /usr/share/ts2_client
+cd /usr/libexec/ts2_client
./TeamSpeak $@
-cd -
diff --git a/z-net/ts2_server/CONFIGURE b/z-net/ts2_server/CONFIGURE
index 6b3e0c3..49b9e31 100755
--- a/z-net/ts2_server/CONFIGURE
+++ b/z-net/ts2_server/CONFIGURE
@@ -1,4 +1,3 @@
# Standard rejected warnings.
#
-source $GRIMOIRE/REJECTED_MSG
-
+source $GRIMOIRE/REJECTED_MSG
diff --git a/z-net/ts2_server/DETAILS b/z-net/ts2_server/DETAILS
index 5d558f5..6194fd0 100755
--- a/z-net/ts2_server/DETAILS
+++ b/z-net/ts2_server/DETAILS
@@ -1,16 +1,16 @@
- SPELL=ts2_server
+ SPELL=ts2_server
VERSION=rc2_20201
- SOURCE=${SPELL}_${VERSION}.tar.bz2
+ SOURCE=${SPELL}_${VERSION}.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/tss2_rc2

SOURCE_URL[0]=ftp://ftp.freenet.de/pub/4players/teamspeak.org/releases/$SOURCE
-
SOURCE_HASH=sha512:fde5fb4ee67021ff153e74b02136d149114d5ac1e50c371d0dd370eb7384611b89f11c9ffc700a8f569953d97e275eed7868437d7a0a4967cd234e0a1d5e8017

- WEB_SITE=http://www.goteamspeak.org/
+
SOURCE_HASH=sha512:fde5fb4ee67021ff153e74b02136d149114d5ac1e50c371d0dd370eb7384611b89f11c9ffc700a8f569953d97e275eed7868437d7a0a4967cd234e0a1d5e8017
+ WEB_SITE=http://www.goteamspeak.com/
ENTERED=20040920
LICENCE[0]='http://www.goteamspeak.com/faq.php?faq=1'
REJECT='has licensing issues'
SHORT="P2P talking over the net (server side)"
cat << EOF
-This is a very popular p2p talking client and server set up that
+This is a very popular p2p talking client and server set up that
is used with many fps games.

Teamspeak is free of charge to non-commercial users.
diff --git a/z-net/ts2_server/HISTORY b/z-net/ts2_server/HISTORY
index 6e9febb..e0d4245 100644
--- a/z-net/ts2_server/HISTORY
+++ b/z-net/ts2_server/HISTORY
@@ -1,3 +1,6 @@
+2010-05-01 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Fix WEB_SITE
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

@@ -13,3 +16,4 @@

2004-09-20 David Brown <dmlb2000 AT excite.com>
* ALL: created spell.
+


  • [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (54dfccf960244b0ddec6dbf61d0247cc9126c92f), Eric Sandall, 05/01/2010

Archive powered by MHonArc 2.6.24.

Top of Page