jre6-compat renamed to jre6; location of jdkhome changed

3 files changed, 6 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f1b5af8cb9a6..8e86b1a26249 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
 pkgbase = thinkingrock
 	pkgdesc = Java-based GTD application
 	pkgver = 2.2.1
-	pkgrel = 6
+	pkgrel = 7
 	url = http://www.thinkingrock.com.au
 	install = thinkingrock.install
 	arch = any
 	license = CDDL
-	depends = jre6-compat
+	depends = jre6
 	depends = xdg-utils
 	depends = hicolor-icon-theme
 	depends = gendesk
diff --git a/PKGBUILD b/PKGBUILD
index 546a34b312c8..be8f6b3afa0b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,19 +4,19 @@
 
 pkgname=thinkingrock
 pkgver=2.2.1
-pkgrel=6
+pkgrel=7
 pkgdesc="Java-based GTD application"
 arch=('any')
 url="http://www.thinkingrock.com.au"
 license=('CDDL')
-depends=('jre6-compat' 'xdg-utils' 'hicolor-icon-theme' 'gendesk')
+depends=('jre6' 'xdg-utils' 'hicolor-icon-theme' 'gendesk')
 install="$pkgname.install"
 source=("http://downloads.sourceforge.net/thinkingrock/tr-$pkgver.tar.gz"
         'dirstructure.patch'
         "$pkgname.png"
         "$pkgname.install")
 sha256sums=('f54d3206fed91aacef776f3d66979bc0bb97893e3e922738fa3156c4fcdedc42'
-            '9d2f499543fb5062d38aedd17b480e46ad3c44e4c6e00e583e651d90eaaf3c1e'
+            'e5bd24fafa08bdc2655447c82f0ad1cb282f16d36098f2cac6084205f3c605cb'
             '921b96171fa464fada4362e8bc14e217f23e15aa4745d297b44ec504ce98db06'
             'f8f6bdbcd42d322f7325beaf927b3ef7b5a769070e91d2b89f1a6815f1fa68f7')
 
diff --git a/dirstructure.patch b/dirstructure.patch
index 3f21c2763769..af9d93e5b845 100644
--- a/dirstructure.patch
+++ b/dirstructure.patch
@@ -13,7 +13,7 @@ diff -Naur tr-2.0.1.original/bin/tr tr-2.0.1/bin/tr
 -if [ -f "$progdir/../etc/$APPNAME".conf ] ; then
 -    . "$progdir/../etc/$APPNAME".conf
 +
-+jdkhome=/opt/java6/jre
++jdkhome=/usr/lib/jvm/java-6-jre/jre
 +
 +
 +if [ -f "$progdir/etc/$APPNAME".conf ] ; then