From 0f2863f8f69379473f602391b5e13f7118582761 Mon Sep 17 00:00:00 2001 From: jorton Date: Mon, 12 Dec 2005 21:25:53 +0000 Subject: [PATCH] - unconditionally enable java; fix glob pattern --- subversion.spec | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/subversion.spec b/subversion.spec index 9a0e6e5..a548784 100644 --- a/subversion.spec +++ b/subversion.spec @@ -1,14 +1,7 @@ # set to zero to avoid running test suite %define make_check 1 - -%ifarch %{ix86} x86_64 ppc +# Java is supported on all platforms now %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 %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*.so %exclude %{_libdir}/libsvn_swig_perl* -%exclude %{_libdir}/libsvnjavahl.* +%if %{with_java} +%exclude %{_libdir}/libsvnjavahl-1.* +%endif %files -n mod_dav_svn %defattr(-,root,root)