Author: pluto Date: Tue May 20 08:39:02 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - relax java deps, release 2.
---- Files affected: SPECS: soprano.spec (1.26 -> 1.27) ---- Diffs: ================================================================ Index: SPECS/soprano.spec diff -u SPECS/soprano.spec:1.26 SPECS/soprano.spec:1.27 --- SPECS/soprano.spec:1.26 Fri May 9 05:30:41 2008 +++ SPECS/soprano.spec Tue May 20 10:38:56 2008 @@ -14,7 +14,7 @@ Summary(pl.UTF-8): Soprano - wrapper Qt do librdf Name: soprano Version: 2.0.98 -Release: 1 +Release: 2 License: GPL v2 Group: X11/Applications Source0: http://dl.sourceforge.net/soprano/%{name}-%{version}.tar.bz2 @@ -29,8 +29,7 @@ BuildRequires: clucene-core-devel >= 0.9.16a-2 BuildRequires: cmake %if %{with sesame2} -BuildRequires: java-sun >= 1.6 -BuildRequires: java-sun-jre >= 1.6 +BuildRequires: libgcj-devel %endif %{?with_serializer:BuildRequires: libraptor-devel} BuildRequires: qt4-build >= %{qtbrver} @@ -66,6 +65,10 @@ %prep %setup -q +# Sesame2 backend doesn't really use the new JNI-1.6 feature -> GetObjectRefType. +sed -i 's:JNI_VERSION_1_6:JNI_VERSION_1_4:g' CMakeLists.txt +# cleanup. +sed -i 's:${JAVA_INCLUDE_PATH2}::' backends/sesame2/CMakeLists.txt %build install -d build @@ -76,12 +79,9 @@ -DQT_QMAKE_EXECUTABLE=%{_bindir}/qmake-qt4 \ %if "%{_lib}" == "lib64" -DLIB_SUFFIX=64 \ - -DJAVA_JVM_LIBRARY=/usr/lib64/jvm/java/jre/lib/amd64/server/libjvm.so \ - -DJAVA_INCLUDE_PATH=/usr/lib64/jvm/java/include/ \ -%else - -DJAVA_JVM_LIBRARY=/usr/lib/jvm/java/jre/lib/i386/server/libjvm.so \ - -DJAVA_INCLUDE_PATH=/usr/lib/jvm/java/include/ \ %endif + -DJAVA_INCLUDE_PATH=%{_libdir}/gcc/%{_target_platform}/%(%{__cc} -dumpversion)/include \ + -DJAVA_JVM_LIBRARY=%{_libdir}/gcj-%(%{__cc} -dumpversion)/libjvm.so \ .. %{__make} @@ -143,6 +143,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.27 2008-05-20 08:38:56 pluto +- relax java deps, release 2. + Revision 1.26 2008-05-09 03:30:41 shadzik - remove snapshot bullshit ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/soprano.spec?r1=1.26&r2=1.27&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
