system/rubygems: Updated for version 1.3.4

6 files changed, 31 insertions, 25 deletions

diff --git a/system/rubygems/README b/system/rubygems/README
index f0ccc343baf5..b19dc61ea3ae 100644
--- a/system/rubygems/README
+++ b/system/rubygems/README
@@ -7,8 +7,3 @@ NOTICE:
  in '/usr/lib/ruby/gems/1.8/gems/' 
  You can 'uninstall' them with `gem`, but otherwise they will remain
  if the rubygems package is removed.
-
-
-DEPENDENCIES:
-
-* ruby (its comes in a typical slackware installation)
diff --git a/system/rubygems/profile.d/gem.csh b/system/rubygems/profile.d/gem.csh
deleted file mode 100644
index 2700ad230452..000000000000
--- a/system/rubygems/profile.d/gem.csh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/csh
-
-setenv GEM_PATH /usr/lib/ruby/gems/1.8
diff --git a/system/rubygems/profile.d/gem.sh b/system/rubygems/profile.d/gem.sh
deleted file mode 100644
index 826ea1a4343a..000000000000
--- a/system/rubygems/profile.d/gem.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-export GEM_PATH=/usr/lib/ruby/gems/1.8
diff --git a/system/rubygems/rubygems.SlackBuild b/system/rubygems/rubygems.SlackBuild
index 5ebc534c395f..f35cd54fc62d 100644
--- a/system/rubygems/rubygems.SlackBuild
+++ b/system/rubygems/rubygems.SlackBuild
@@ -4,7 +4,7 @@
 # Written by Vincent Batts, vbatts@batts.mine.nu
 
 PRGNAM=rubygems
-VERSION=1.3.1
+VERSION=1.3.4
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -16,10 +16,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -37,17 +40,23 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-GEM_HOME=$PKG/usr/lib/ruby/gems/1.8 \
-  ruby setup.rb --destdir=$PKG/usr  
+GEM_HOME=$PKG/usr/lib${LIBDIRSUFFIX}/ruby/gems/1.8 \
+  ruby setup.rb --destdir=$PKG/
 
 # Setting global GEM_PATH to get rdoc correct for gems installed
 mkdir -p $PKG/etc/profile.d/
-cat $CWD/profile.d/gem.sh > $PKG/etc/profile.d/gem.sh
-cat $CWD/profile.d/gem.csh > $PKG/etc/profile.d/gem.csh
-chmod 755 $PKG/etc/profile.d/gem.sh $PKG/etc/profile.d/gem.csh
+cat << EOF > $PKG/etc/profile.d/gem.sh
+#!/bin/sh
+export GEM_PATH=/usr/lib${LIBDIRSUFFIX}/ruby/gems/1.8
+EOF
+cat << EOF > $PKG/etc/profile.d/gem.csh
+#!/bin/csh
+setenv GEM_PATH /usr/lib${LIBDIRSUFFIX}/ruby/gems/1.8
+EOF
+chmod 0755 $PKG/etc/profile.d/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README ChangeLog LICENSE.txt TODO GPL.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README ChangeLog LICENSE.txt GPL.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/rubygems/rubygems.info b/system/rubygems/rubygems.info
index 8f7b73bcba36..84afdab4ecda 100644
--- a/system/rubygems/rubygems.info
+++ b/system/rubygems/rubygems.info
@@ -1,8 +1,8 @@
 PRGNAM="rubygems"
-VERSION="1.3.1"
+VERSION="1.3.4"
 HOMEPAGE="http://rubyforge.org/projects/rubygems/"
-DOWNLOAD="http://rubyforge.org/frs/download.php/45905/rubygems-1.3.1.tgz"
-MD5SUM="a04ee6f6897077c5b75f5fd1e134c5a9"
+DOWNLOAD="http://rubyforge.org/frs/download.php/57643/rubygems-1.3.4.tgz"
+MD5SUM="b17b398503253bf36a101c58f02a226f"
 MAINTAINER="Vincent Batts"
 EMAIL="vbatts@hashbangbash.com"
-APPROVED="dsomero"
+APPROVED="rworkman"
diff --git a/system/rubygems/slack-desc b/system/rubygems/slack-desc
index 58048380da27..915a85162fb6 100644
--- a/system/rubygems/slack-desc
+++ b/system/rubygems/slack-desc
@@ -1,9 +1,17 @@
-rubygems: rubygems ( ruby library manager )
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+        |-----handy-ruler-------------------------------------------------------|
+rubygems: rubygems (ruby library manager)
 rubygems:
-rubygems: the Ruby standard for publishing and managing third party libraries.
+rubygems: The Ruby standard for publishing and managing third party libraries.
 rubygems:
+rubygems: Homepage: http://rubyforge.org/projects/rubygems/
 rubygems:
-rubygems: homepage http://rubyforge.org/projects/rubygems/
 rubygems:
 rubygems:
 rubygems: