Merge branch 'master' into el6

Conflicts:
	libsvm.spec

libsvm.spec

@@ -1,7 +1,7 @@
 %define shver 2
 Name:           libsvm
 Version:        3.11
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -168,7 +168,8 @@ desktop-file-install --delete-original --vendor=fedora \
   ${RPM_BUILD_ROOT}/%{_datadir}/applications/%{name}-svm-toy-gtk.desktop \
   ${RPM_BUILD_ROOT}/%{_datadir}/applications/%{name}-svm-toy-qt.desktop \
 
-
+# Fix Bug 646154 - libsvm-python's pth is not set correctly
+echo 'libsvm' > $RPM_BUILD_ROOT/%{python_sitearch}/libsvm.pth
 
 %post -p /sbin/ldconfig
 
@@ -214,6 +215,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc python/README-Python tools/README-Tools
 %{libsvm_python_dir}
 %{_bindir}/svm-*.py
+%{python_sitearch}/libsvm.pth
 
 %ifnarch ppc ppc64
 %files java
@@ -239,13 +241,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jan 12 2012 Ding-Yi Chen <dchen@redhat.com> - 3.11-3
+- Fixed Bug 646154 - libsvm-python's pth is not set correctly
+
 * Fri Jun 17 2011 Ding-Yi Chen <dchen@redhat.com> - 3.11-1
 - Upstream update:
-  + Set max number of iterations in the main loop of solvers
-  + matlab:
-    new make.m for unix/mac/windows and for matlab/octave
-  + matlab and python:
-    fix a problem that decision values returned by svmpredict is empty if number of classes = 1
+  + Set max number of iterations in the main loop of solvers
+  + matlab:
+    new make.m for unix/mac/windows and for matlab/octave
+  + matlab and python:
+    fix a problem that decision values returned by svmpredict is empty if number of classes = 1
 
 * Fri Jun 17 2011 Ding-Yi Chen <dchen@redhat.com> - 3.1-2
 - Fix the build error on EL-5