Merge branch 'el5'

Conflicts:
	libsvm.spec

.gitignore

@@ -1,6 +1,3 @@
-guide.pdf
-libsvm-2.91.tar.gz
-/guide.pdf
 /libsvm-3.0.tar.gz
 /libsvm-3.1.tar.gz
 /libsvm-3.11.tar.gz

libsvm.spec

@@ -1,7 +1,12 @@
 %define shver 2
+%{!?pyver: %define pyver %(python -c 'import sys; print(sys.version[0:3])')}
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%define libdir_libsvm %{_libdir}/libsvm
+%define libsvm_python_dir %{python_sitearch}/libsvm
+
 Name:           libsvm
 Version:        3.18
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -21,25 +26,20 @@ Patch4:         %{name}-%{version}.toolsDir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  grep
 
-%{!?pyver: %define pyver %(python -c 'import sys; print(sys.version[0:3])')}
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define libsvm_python_dir %{python_sitearch}/libsvm
-
-%define javac javac
-%define jar jar
-%define libdir_libsvm %{_libdir}/libsvm
-%if 0%{?fedora} >= 9
-%define moc_path %{_bindir}/moc-qt4
+%if 0%{?rhel} <= 5
+%define moc_path %{_libdir}/qt4/bin/moc
+%define with_vendor "fedora"
 %else
-%if 0%{?rhel} >= 6
 %define moc_path %{_bindir}/moc-qt4
-%else
-%define moc_path %{_libdir}/qt4/bin/moc
-%endif
 %endif
 
 %ifnarch ppc ppc64
 %define no_java FALSE
+%if 0%{?rhel} <= 6
+%define java_dependency java
+%else 
+%define java_dependency java-headless
+%endif
 %else
 %define no_java NO_JAVA
 Obsoletes: libsvm-java < 2.88-1
@@ -74,19 +74,14 @@ Python tools and interfaces for libsvm.
 Install this package if you want to develop
 programs with libsvm in Python.
 
-%ifnarch ppc ppc64
+%if "%{no_java}" == "FALSE"
 %package java
 Summary:    Java tools and interfaces for libsvm
 Group:      Development/Libraries
 BuildRequires:  java-devel >= 1.5.0
 BuildRequires:  jpackage-utils
 
-%if 0%{?rhel} <= 6
-Requires:  java >= 1.5.0
-%else
-Requires:  java-headless >= 1.5.0
-%endif 
-
+Requires:  %{java_dependency} >= 1.5.0
 Requires:  jpackage-utils
 Requires:       %{name} = %{version}-%{release}
 
@@ -136,18 +131,16 @@ cp %{SOURCE4} .
 cp %{SOURCE5} %{name}-svm-toy-gtk-48.png
 cp %{SOURCE5} %{name}-svm-toy-qt-48.png
 
-
 %build
 %{__sed} -i 's/\r//' FAQ.html
 %{__sed} -i 's/\r//' ChangeLog
-make all RPM_CFLAGS="$RPM_OPT_FLAGS" PYTHON_VERSION="%{pyver}" JAVAC="%{javac}" JAR="%{jar}" LIBDIR="%{_libdir}" MOC_PATH="%{moc_path}" NO_JAVA="%{no_java}"
+make all RPM_CFLAGS="$RPM_OPT_FLAGS" PYTHON_VERSION="%{pyver}" JAVAC="javac" JAR="jar" LIBDIR="%{_libdir}" MOC_PATH="%{moc_path}" NO_JAVA="%{no_java}"
 mv python/README python/README-Python
 mv tools/README tools/README-Tools
 cp README java/README-Java
 cp README svm-toy/gtk
 cp README svm-toy/qt
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} PYTHON_VERSION="%{pyver}" LIBSVM_VER="%{version}"  NO_JAVA="%{no_java}" JAVA_TARGET_DIR="${RPM_BUILD_ROOT}/%{_javadir}"
@@ -167,10 +160,17 @@ echo -e "# This file is not in the original libsvm tarball, but added for conven
 # This file is released under BSD license, just like the rest of the package.\n"\
  > $RPM_BUILD_ROOT/%{libsvm_python_dir}/__init__.py
 
+%if 0%{?with_vendor:1}
+desktop-file-install --delete-original --vendor=%{with_vendor} \
+  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+  ${RPM_BUILD_ROOT}/%{_datadir}/applications/%{name}-svm-toy-gtk.desktop \
+  ${RPM_BUILD_ROOT}/%{_datadir}/applications/%{name}-svm-toy-qt.desktop
+%else
 desktop-file-install --delete-original \
   --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
   ${RPM_BUILD_ROOT}/%{_datadir}/applications/%{name}-svm-toy-gtk.desktop \
-  ${RPM_BUILD_ROOT}/%{_datadir}/applications/%{name}-svm-toy-qt.desktop \
+  ${RPM_BUILD_ROOT}/%{_datadir}/applications/%{name}-svm-toy-qt.desktop
+%endif
 
 # Fix Bug 646154 - libsvm-python's pth is not set correctly
 echo 'libsvm' > $RPM_BUILD_ROOT/%{python_sitearch}/libsvm.pth
@@ -220,11 +220,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/svm-*.py
 %{python_sitearch}/libsvm.pth
 
-%ifnarch ppc ppc64
+%if "%{no_java}" == "FALSE"
 %files java
 %defattr(-,root,root,-)
 %doc java/README-Java java/test_applet.html
 %{_javadir}/%{name}.jar
+#%{_datadir}/javadoc/%{name}-%{version}
 %endif
 
 %files svm-toy-gtk
@@ -243,6 +244,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Apr 28 2014 Ding-Yi Chen <dchen@redhat.com> - 3.18-3
+- EPEL5 desktop files need vendor.
+
 * Mon Apr 28 2014 Ding-Yi Chen <dchen@redhat.com> - 3.18-2
 - Fixed Bug 1090844 - libsvm-java has unresolved dependencies on epel6 testing