SPECS: kde4-kdesupport.spec - merge java-relax fix from soprano.spec.
pluto
pluto at pld-linux.org
Thu Jun 5 22:40:56 CEST 2008
Author: pluto Date: Thu Jun 5 20:40:56 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- merge java-relax fix from soprano.spec.
---- Files affected:
SPECS:
kde4-kdesupport.spec (1.23 -> 1.24)
---- Diffs:
================================================================
Index: SPECS/kde4-kdesupport.spec
diff -u SPECS/kde4-kdesupport.spec:1.23 SPECS/kde4-kdesupport.spec:1.24
--- SPECS/kde4-kdesupport.spec:1.23 Thu Jun 5 22:08:50 2008
+++ SPECS/kde4-kdesupport.spec Thu Jun 5 22:40:51 2008
@@ -187,6 +187,11 @@
%setup -q -n %{orgname}-%{snap}
%patch0 -p0
+# 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' soprano/CMakeLists.txt
+# cleanup.
+sed -i 's:${JAVA_INCLUDE_PATH2}::' soprano/backends/sesame2/CMakeLists.txt
+
%build
install -d build
cd build
@@ -195,7 +200,10 @@
%if "%{_lib}" == "lib64"
-DLIB_SUFFIX=64 \
%endif
- ../
+ -DJAVA_INCLUDE_PATH=%{_libdir}/gcc/%{_target_platform}/%(%{__cc} -dumpversion)/include \
+ -DJAVA_JVM_LIBRARY=%{_libdir}/gcj-%(%{__cc} -dumpversion)/libjvm.so \
+ ..
+
%{__make}
%install
@@ -389,6 +397,9 @@
* %{date} PLD Team <feedback at pld-linux.org>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.24 2008-06-05 20:40:51 pluto
+- merge java-relax fix from soprano.spec.
+
Revision 1.23 2008-06-05 20:08:50 shadzik
- BR: libgcj-devel
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kde4-kdesupport.spec?r1=1.23&r2=1.24&f=u
More information about the pld-cvs-commit
mailing list