- unconditionally enable java; fix glob pattern
This commit is contained in:
parent
99ee2cbc82
commit
0f2863f8f6
@ -1,14 +1,7 @@
|
|||||||
# set to zero to avoid running test suite
|
# set to zero to avoid running test suite
|
||||||
%define make_check 1
|
%define make_check 1
|
||||||
|
# Java is supported on all platforms now
|
||||||
%ifarch %{ix86} x86_64 ppc
|
|
||||||
%define with_java 1
|
%define with_java 1
|
||||||
%else
|
|
||||||
# ecj platform bugs:
|
|
||||||
# ia64: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=154700
|
|
||||||
# ppc64: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=158719
|
|
||||||
%define with_java 1
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# set JDK path to build javahl; default for JPackage
|
# set JDK path to build javahl; default for JPackage
|
||||||
%define jdk_path /usr/lib/jvm/java-1.4.2-gcj
|
%define jdk_path /usr/lib/jvm/java-1.4.2-gcj
|
||||||
@ -222,7 +215,9 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||||||
%{_libdir}/libsvn*.*a
|
%{_libdir}/libsvn*.*a
|
||||||
%{_libdir}/libsvn*.so
|
%{_libdir}/libsvn*.so
|
||||||
%exclude %{_libdir}/libsvn_swig_perl*
|
%exclude %{_libdir}/libsvn_swig_perl*
|
||||||
%exclude %{_libdir}/libsvnjavahl.*
|
%if %{with_java}
|
||||||
|
%exclude %{_libdir}/libsvnjavahl-1.*
|
||||||
|
%endif
|
||||||
|
|
||||||
%files -n mod_dav_svn
|
%files -n mod_dav_svn
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
|
Loading…
Reference in New Issue
Block a user