Merge branch 'master' into el6

libsvm-3.0-1.packageMain.patch

@@ -1,6 +1,6 @@
 diff -up ./Makefile.packageMain ./Makefile
 --- ./Makefile.packageMain	2010-09-12 22:11:10.000000000 +1000
-+++ ./Makefile	2010-11-08 11:04:38.423570586 +1000
++++ ./Makefile	2010-12-14 16:00:15.269681221 +1000
 @@ -1,11 +1,40 @@
  CXX ?= g++
 -CFLAGS = -Wall -Wconversion -O3 -fPIC

libsvm.spec

@@ -1,6 +1,7 @@
+%define shver 2
 Name:           libsvm
 Version:        3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -13,12 +14,13 @@ Source2:        http://www.csie.ntu.edu.tw/~cjlin/papers/guide/guide.pdf
 Source3:        libsvm-svm-toy-gtk.desktop
 Source4:        libsvm-svm-toy-qt.desktop
 Source5:        LibSVM-svm-toy-48.png
-Patch0:         %{name}-%{version}.packageMain.patch
+Patch0:         %{name}-%{version}-1.packageMain.patch
 Patch1:         %{name}-%{version}.pythonDir.patch
 Patch2:         %{name}-%{version}.javaDir.patch
 Patch3:         %{name}-%{version}.svm-toy.patch
 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)")}
@@ -127,7 +129,6 @@ 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
@@ -142,7 +143,6 @@ 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}"
-ln -sf %{name}.so.1 ${RPM_BUILD_ROOT}%{_libdir}/%{name}.so
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/src
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
 cp %{name}-svm-toy-gtk-48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
@@ -151,6 +151,9 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
 cp %{name}-svm-toy-gtk.desktop $RPM_BUILD_ROOT/%{_datadir}/applications
 cp %{name}-svm-toy-qt.desktop $RPM_BUILD_ROOT/%{_datadir}/applications
 
+%__ln_s %{name}.so.%{shver} $RPM_BUILD_ROOT/%{_libdir}/%{name}.so
+
+
 # [Bug 521194] Python: 'import libsvm' doesn't work
 echo -e "# This file is not in the original libsvm tarball, but added for convenience of import libsvm.\n\
 # This file is released under BSD license, just like the rest of the package.\n"\
@@ -193,7 +196,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/svm-train
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/examples
-%{_libdir}/%{name}.so.2
+%{_libdir}/%{name}.so.%{shver}
 
 
 %files devel
@@ -231,6 +234,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 14 2010 Ding-Yi Chen <dchen@redhat.com> - 3.0-2
+- Fixed [Bug 661404] New: Wrong symbolic link libsvm.so
+
 * Mon Nov 08 2010 Ding-Yi Chen <dchen@redhat.com> - 3.0-1
 - Fixed the spelling errors of svm-toy-gtk and svm-toy-qt
 - Upstream update: