[arch-commits] Commit in soprano/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Pierre Schmitz]

    Date: Sunday, December 6, 2009 @ 22:49:10
  Author: pierre
Revision: 60790

Merged revisions 60788 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/soprano/trunk

........
  r60788 | pierre | 2009-12-07 04:41:39 +0100 (Mo, 07 Dez 2009) | 1 line
  
  Remove broken hack to support jre. Only openjdk6 is supported by now.
........

Modified:
  soprano/repos/extra-x86_64/	(properties)
  soprano/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)


Property changes on: soprano/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /soprano/trunk:1-53593
   + /soprano/trunk:1-60789

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-12-07 03:48:01 UTC (rev 60789)
+++ extra-x86_64/PKGBUILD	2009-12-07 03:49:10 UTC (rev 60790)
@@ -4,14 +4,14 @@
 
 pkgname=soprano
 pkgver=2.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data'
 arch=('i686' 'x86_64')
 url='http://soprano.sourceforge.net/'
 license=('GPL' 'LGPL')
 depends=('qt' 'clucene' 'redland')
 makedepends=('cmake' 'openjdk6')
-optdepends=('java-runtime=6: Sesame2 backend')
+optdepends=('openjdk6: Sesame2 backend')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('c9a2c008b80cd5d76599e9d48139dfe9')
 
@@ -30,10 +30,6 @@
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=OFF \
     -DCMAKE_INSTALL_PREFIX=/usr || return 1
-  #This is evil. We hack the library paths in the binary so that jre is also possible instead of just only openjdk.
-  sed -e "s#${JAVA_HOME}/jre/lib/${_jvmarch}/server/libjvm.so#-L ${JAVA_HOME}/jre/lib/${_jvmarch}/server -ljvm#" \
-      -e "s#:${JAVA_HOME}/jre/lib/${_jvmarch}/server#:${JAVA_HOME}/jre/lib/${_jvmarch}/server:/opt/java/jre/lib/${_jvmarch}/server#" \
-      -i backends/sesame2/CMakeFiles/soprano_sesame2backend.dir/link.txt || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
 }