From 7e8037979f6a5db16724e2e89e2d3e8536f55fe5 Mon Sep 17 00:00:00 2001
From: sponge <sponge@mail.i2p>
Date: Mon, 21 Sep 2009 08:54:41 +0000
Subject: [PATCH]     * fixups to SlackBuilds. requiredbuilder does the wrong
 thing, and       thinks that java is perl! This isn't really a big deal,     
  the file format is simple enough and the requirements are known.

---
 Slackware/i2p-base/i2p-base.SlackBuild            |  8 ++++++--
 Slackware/i2p/i2p.SlackBuild                      | 10 ++++++++--
 Slackware/i2p/slack-required                      |  6 ++++--
 history.txt                                       |  5 +++++
 router/java/src/net/i2p/router/RouterVersion.java |  2 +-
 5 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/Slackware/i2p-base/i2p-base.SlackBuild b/Slackware/i2p-base/i2p-base.SlackBuild
index d91d872637..7101fb950a 100644
--- a/Slackware/i2p-base/i2p-base.SlackBuild
+++ b/Slackware/i2p-base/i2p-base.SlackBuild
@@ -24,7 +24,7 @@ mkdir -p $PKG
 # es: usr/local
 NAME=i2p-base
 VERSION=0.0.1
-BUILD=1sim
+BUILD=1sponge
 ARCH=noarch
 INSTALL_DIR=opt
 cd $PKG
@@ -38,5 +38,9 @@ sed "s|directory|/$INSTALL_DIR/i2p/|g" $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-requiredbuilder -v -y -s $CWD $PKG
+#
+# Not really that important to exec this.
+#requiredbuilder -v -y -s $CWD $PKG
+#
+cat $CWD/slack-required > $PKG/install/slack-required
 makepkg -l y -c n $CWD/${NAME}-$VERSION-$ARCH-$BUILD.tgz
diff --git a/Slackware/i2p/i2p.SlackBuild b/Slackware/i2p/i2p.SlackBuild
index f7ced54bfb..a8ecf3be21 100755
--- a/Slackware/i2p/i2p.SlackBuild
+++ b/Slackware/i2p/i2p.SlackBuild
@@ -15,7 +15,7 @@
 # It's suggested to subscribe to various dns host, like i2host.i2p
 # For any additional information, visit i2host.i2p and forum.i2p
 
-BUILD=1sim
+BUILD=1sponge
 
 # put here installation dir, without first and last /
 # eg: usr/local
@@ -113,5 +113,11 @@ sed "s|directory|/$INSTALL_DIR/i2p/|g" $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-requiredbuilder -v -y -s $CWD $PKG
+#
+# requiredbuilder fucks up REALLY bad, and thinks java is perl?!
+# It also did not catch the shell requirements! BOOOOOOOOOOO! HISSSSSSSS!
+#
+#requiredbuilder -v -y -s $CWD $PKG
+#
+cat $CWD/slack-required > $PKG/install/slack-required
 makepkg -l y -c n $CWD/${NAME}-$VERSION-$ARCH-$BUILD.tgz
diff --git a/Slackware/i2p/slack-required b/Slackware/i2p/slack-required
index 3dcf362213..d83d818e6f 100644
--- a/Slackware/i2p/slack-required
+++ b/Slackware/i2p/slack-required
@@ -1,2 +1,4 @@
-glibc >= 2.7-i486-17 | glibc-solibs >= 2.7-i486-17
-perl >= 5.10.0-i486-1
+jre >= 5
+i2p-base >= 0.0.1
+bash >= 3.1.017
+
diff --git a/history.txt b/history.txt
index 7731041e55..724b25709b 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,8 @@
+2009-09-21 sponge
+    * fixups to SlackBuilds. requiredbuilder does the wrong thing, and
+      thinks that java is perl! This isn't really a big deal, 
+      the file format is simple enough and the requirements are known.
+
 2009-09-07 mkvore
     * removes a SAM v1&2 bug
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 40028c0e07..67b9de3fe2 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 19;
+    public final static long BUILD = 20;
     /** for example "-test" */
     public final static String EXTRA = "";
     public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;