libsvm-3.18

11 years ago · 5e0873a54f
parent 556eaba32c
commit 5e0873a54f
1 changed files with 0 additions and 4 deletions
--- a/libsvm.spec
+++ b/libsvm.spec
@ -81,16 +81,12 @@ Group:      Development/Libraries
 BuildRequires:  java-devel >= 1.5.0
 BuildRequires:  jpackage-utils

-<<<<<<< HEAD
 %if 0%{?rhel} <= 6
 Requires:  java >= 1.5.0
 %else
 Requires:  java-headless >= 1.5.0
 %endif 

-=======
-Requires:  java-headless >= 1.5.0
->>>>>>> Use Requires: java-headless rebuild (#1067528)
 Requires:  jpackage-utils
 Requires:       %{name} = %{version}-%{release}