From b04bddcbf768e7a0c4479cfacbcfc0d4d08dea83 Mon Sep 17 00:00:00 2001
From: Ding-Yi Chen <dingyichen@gmail.com>
Date: Tue, 20 Jan 2015 17:22:27 +1000
Subject: [PATCH] - Fix for RHEL6

---
 libsvm.spec | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/libsvm.spec b/libsvm.spec
index 54c67fd..1e21f15 100644
--- a/libsvm.spec
+++ b/libsvm.spec
@@ -5,11 +5,11 @@
 %define libsvm_python_dir %{python_sitearch}/libsvm
 %global maven_group_id tw.edu.ntu.csie
 %global pom_file_version 3.17
-%global pom_file_name "JPP.%{maven_group_id}-%{name}.pom"
+%global pom_file_name JPP.%{maven_group_id}-%{name}.pom
 
 Name:           libsvm
 Version:        3.20
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -37,11 +37,11 @@ BuildRequires:  grep
 %define moc_path %{_bindir}/moc-qt4
 %endif
 
-# RHEL6 does not have add_maven_depmap
-%if 0%{?rhel} != 0 && 0%{?rhel} <=6
-%define no_add_maven_depmap TRUE
+# RHEL6 does not have enable_add_maven_depmap
+%if 0%{?rhel} != 0 && 0%{?rhel} <= 6
+%define enable_add_maven_depmap FALSE
 %else
-%define no_add_maven_depmap FALSE
+%define enable_add_maven_depmap TRUE
 %endif
 
 
@@ -54,7 +54,7 @@ BuildRequires:  grep
 %endif
 %else
 %define no_java NO_JAVA
-%define no_add_maven_depmap no_add_maven_depmap
+%define enable_add_maven_depmap FALSE
 Obsoletes: libsvm-java < 2.88-1
 %endif
 
@@ -214,13 +214,15 @@ ln -s %{_javadir}/%{maven_group_id}/%{name}.jar %{buildroot}/%{_javadir}/%{name}
 ## Install the Java POM
 mkdir -p %{buildroot}%{_mavenpomdir}
 cp -p %{name}.pom %{buildroot}%{_mavenpomdir}/%{pom_file_name}
-%endif
 
-# RHEL6 does not support add_maven_depmap
-%if "%{no_add_maven_depmap}" == "FALSE"
+# RHEL6 does not support enable_add_maven_depmap
+%if "%{enable_add_maven_depmap}" == "TRUE"
 %add_maven_depmap %{pom_file_name} %{maven_group_id}/%{name}.jar
 %endif
 
+%endif
+
+
 
 %post -p /sbin/ldconfig
 
@@ -268,11 +270,19 @@ rm -rf %{buildroot}
 %{python_sitearch}/libsvm.pth
 
 %if "%{no_java}" == "FALSE"
+%if "%{enable_add_maven_depmap}" == "TRUE"
 %files java -f .mfiles
+%else
+%files java
+%endif
 %defattr(-,root,root,-)
 %doc java/README-Java java/test_applet.html
 %{_javadir}/%{name}.jar
 %{_javadir}/%{maven_group_id}/%{name}-%{version}.jar
+%if "%{enable_add_maven_depmap}" == "FALSE"
+%{_javadir}/%{maven_group_id}/%{name}.jar
+%{_mavenpomdir}/%{pom_file_name}
+%endif
 %endif
 
 %files svm-toy-gtk