From 637d548baa5b4870952fc84b152f47b5866620eb Mon Sep 17 00:00:00 2001
From: Ding-Yi Chen <dchen@redhat.com>
Date: Thu, 26 Jul 2018 14:38:35 +1000
Subject: [PATCH] Add javadoc subpackage Address bodhi comments

---
 libsvm-svm-toy-qt.desktop |  2 +-
 libsvm.spec               | 38 ++++++++++++++++++++++++++++----------
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/libsvm-svm-toy-qt.desktop b/libsvm-svm-toy-qt.desktop
index 5c7fd2f..1835271 100644
--- a/libsvm-svm-toy-qt.desktop
+++ b/libsvm-svm-toy-qt.desktop
@@ -7,4 +7,4 @@ Icon=libsvm-svm-toy-qt-48
 StartupNotify=true
 Terminal=false
 Type=Application
-Categories=KDE;Education;Science;Math;DataVisualization
+Categories=Education;Science;Math;DataVisualization;Qt
diff --git a/libsvm.spec b/libsvm.spec
index 5b9f40c..53d4fc5 100644
--- a/libsvm.spec
+++ b/libsvm.spec
@@ -9,11 +9,9 @@
 %global maven_group_id tw.edu.ntu.csie
 %global pom_file_version 3.17
 %global pom_file_name JPP.%{maven_group_id}-%{name}.pom
-# el_version is RHEL major version, but empty in Fedora
-%global el_version %(/usr/lib/rpm/redhat/dist.sh --el)
 
 # EL <= 6 does not have enable_maven
-%if 0%{?el_version} != 0 && 0%{?el_version} <= 6
+%if 0%{?rhel} != 0 && 0%{?rhel} <= 6
 %global java_dependency java
 %ifarch ppc64
 %bcond_with java
@@ -29,7 +27,7 @@
 %endif
 
 # EL <= 7 python 3 is not available by default
-%if 0%{?el_version} != 0 && 0%{?el_version} <= 7
+%if 0%{?rhel} != 0 && 0%{?rhel} <= 7
 %global python2_package_name libsvm-python
 %bcond_with python3
 %else
@@ -40,7 +38,7 @@
 
 Name:           libsvm
 Version:        3.23
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -124,6 +122,16 @@ Requires:  %{name} = %{version}-%{release}
 Java tools and interfaces for libsvm.
 Install this package if you want to develop
 programs with libsvm in Java.
+
+%package javadoc
+Summary:    Javadoc  for libsvm
+BuildRequires:  java-devel >= 1.7.0
+BuildRequires:  jpackage-utils
+BuildArch:      noarch
+Requires:  %{name}-java = %{version}-%{release}
+
+%description javadoc
+Javadoc for libsvm
 %endif
 
 %package svm-toy-qt
@@ -133,7 +141,7 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  pkgconfig
 
 BuildRequires:  qt5-qtbase-devel
-Requires:       qt5
+Requires:       qt5-qtbase
 Requires:       %{name} = %{version}-%{release}
 
 %description svm-toy-qt
@@ -178,7 +186,7 @@ sed -i -e "s|(double)event->y()/YLEN, current_value|(double)event->y()/YLEN,(sig
 %{__sed} -i 's/\r//' ChangeLog
 make all RPM_CFLAGS="$RPM_OPT_FLAGS" LIBDIR="%{_libdir}" CPP_STD="%{cpp_std}"
 %if %{with java}
-make -C java
+make -C java all javadoc
 %endif
 mv python/README python/README-Python
 mv tools/README tools/README-Tools
@@ -192,9 +200,6 @@ cp README svm-toy/qt
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} LIBDIR=%{_libdir} LIBSVM_VER="%{version}"  CPP_STD="%{cpp_std}"
-%if %{with java}
-make -C java install JAVA_TARGET_DIR="%{buildroot}/%{_javadir}"
-%endif
 mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/
 cp %{name}-svm-toy-qt-48.png %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/
 mkdir -p %{buildroot}/%{_datadir}/applications
@@ -245,6 +250,12 @@ cd -
 %endif
 
 # Java
+%if %{with java}
+make -C java install JAVA_TARGET_DIR="%{buildroot}/%{_javadir}"
+mkdir -p  %{buildroot}/%{_javadocdir}/%{name}
+cp -p -R java/docs/* %{buildroot}/%{_javadocdir}/%{name}
+%endif
+
 %if %{with maven}
 %mvn_install
 %endif
@@ -301,6 +312,8 @@ desktop-file-install --delete-original \
 %if %{with maven}
 %{_javadir}/%{maven_group_id}/%{name}.jar
 %endif
+%files javadoc
+%{_javadocdir}/%{name}
 %endif
 
 %files svm-toy-qt
@@ -310,6 +323,11 @@ desktop-file-install --delete-original \
 %{_datadir}/applications/*%{name}-svm-toy-qt.desktop
 
 %changelog
+* Thu Jul 26 2018 Ding-Yi Chen <dchen@redhat.com> - 3.23-2
+- Add -javadoc subpackage
+- Use macro rhel instead of el_version
+- qt5 in EL should be qt5-qtbase
+
 * Thu Jul 19 2018 Ding-Yi Chen <dchen@redhat.com> - 3.23-1
 - Upstream update to 3.23
   + add more digits of predicted file, model file, scaled data and data