[packages/libsvm] - updated to 3.32

qboosh qboosh at pld-linux.org
Sat Feb 24 19:18:07 CET 2024


commit 099d0dbaad45516459d12d92edfc867e2cef04ef
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Feb 24 18:56:48 2024 +0100

    - updated to 3.32

 libsvm-make.patch   | 26 +++++++++++++++-----------
 libsvm-python.patch | 14 +++++++-------
 libsvm.spec         | 16 ++++++++--------
 3 files changed, 30 insertions(+), 26 deletions(-)
---
diff --git a/libsvm.spec b/libsvm.spec
index 3b24fb9..e634ad8 100644
--- a/libsvm.spec
+++ b/libsvm.spec
@@ -13,14 +13,12 @@
 Summary:	LIBSVM - simple, easy-to-use and efficient software for SVM classification and regression
 Summary(pl.UTF-8):	LIBSVM - proste, łatwe w użyciu i wydajne oprogramowanie do klasyfikacji i regresji SVM
 Name:		libsvm
-# 3.3 is newer than 3.25, so call it 3.30
-%define	fver	3.3
-Version:	%{fver}0
+Version:	3.32
 Release:	1
 License:	BSD
 Group:		Libraries
-Source0:	https://www.csie.ntu.edu.tw/~cjlin/libsvm/%{name}-%{fver}.tar.gz
-# Source0-md5:	0803c429d061be3c6445d5a79b9ee7c7
+Source0:	https://www.csie.ntu.edu.tw/~cjlin/libsvm/%{name}-%{version}.tar.gz
+# Source0-md5:	4692644b32317a97c566f9e26de460d1
 Patch0:		%{name}-python.patch
 Patch1:		%{name}-make.patch
 URL:		https://www.csie.ntu.edu.tw/~cjlin/libsvm/
@@ -115,7 +113,7 @@ Python 3 interface for LIBSVM library.
 Interfejs Pythona 3 do biblioteki LIBSVM.
 
 %prep
-%setup -q -n %{name}-%{fver}
+%setup -q
 %patch0 -p1
 %patch1 -p1
 
@@ -172,6 +170,8 @@ install matlab/*.mex $RPM_BUILD_ROOT%{octave_oct_dir}/libsvm
 %if %{with python2}
 cd python
 %py_install
+
+%py_postclean
 cd ..
 %endif
 
@@ -221,7 +221,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc python/README
 %{py_sitescriptdir}/libsvm
-%{py_sitescriptdir}/libsvm_official-3.30.0-py*.egg-info
+%{py_sitescriptdir}/libsvm_official-%{version}.0-py*.egg-info
 %endif
 
 %if %{with python3}
@@ -229,5 +229,5 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc python/README
 %{py3_sitescriptdir}/libsvm
-%{py3_sitescriptdir}/libsvm_official-3.30.0-py*.egg-info
+%{py3_sitescriptdir}/libsvm_official-%{version}.0-py*.egg-info
 %endif
diff --git a/libsvm-make.patch b/libsvm-make.patch
index 8c88c57..12d44d4 100644
--- a/libsvm-make.patch
+++ b/libsvm-make.patch
@@ -1,20 +1,24 @@
---- libsvm-3.22/Makefile.orig	2016-12-21 19:58:48.000000000 +0100
-+++ libsvm-3.22/Makefile	2017-01-30 17:23:09.309548196 +0100
-@@ -11,12 +11,13 @@
- 	else \
- 		SHARED_LIB_FLAG="-shared -Wl,-soname,libsvm.so.$(SHVER)"; \
- 	fi; \
--	$(CXX) $${SHARED_LIB_FLAG} svm.o -o libsvm.so.$(SHVER)
-+	$(CXX) $${SHARED_LIB_FLAG} svm.o -o libsvm.so.$(SHVER) ; \
-+	ln -s libsvm.so.$(SHVER) libsvm.so
+--- libsvm-3.32/Makefile.orig	2024-02-24 18:41:45.128174246 +0100
++++ libsvm-3.32/Makefile	2024-02-24 18:44:49.467175596 +0100
+@@ -14,12 +14,16 @@ endif
+ 
+ all: svm-train svm-predict svm-scale
  
+-lib: svm.o
+-	$(CXX) $(SHARED_LIB_FLAG) svm.o -o libsvm.so.$(SHVER)
 -svm-predict: svm-predict.c svm.o
 -	$(CXX) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm
 -svm-train: svm-train.c svm.o
 -	$(CXX) $(CFLAGS) svm-train.c svm.o -o svm-train -lm
-+svm-predict: lib svm-predict.c
++lib: libsvm.so
++
++libsvm.so: svm.o
++	$(CXX) $(SHARED_LIB_FLAG) svm.o -o libsvm.so.$(SHVER) ; \
++	ln -s libsvm.so.$(SHVER) libsvm.so
++
++svm-predict: svm-predict.c libsvm.so
 +	$(CXX) $(CFLAGS) svm-predict.c -o svm-predict -L. -lsvm -lm
-+svm-train: lib svm-train.c
++svm-train: svm-train.c libsvm.so
 +	$(CXX) $(CFLAGS) svm-train.c -o svm-train -L. -lsvm -lm
  svm-scale: svm-scale.c
  	$(CXX) $(CFLAGS) svm-scale.c -o svm-scale
diff --git a/libsvm-python.patch b/libsvm-python.patch
index 72df08f..b70cd0b 100644
--- a/libsvm-python.patch
+++ b/libsvm-python.patch
@@ -22,21 +22,21 @@
  import os, sys
  from .svm import *
  from .svm import __all__ as svm_all
---- libsvm-3.3/python/setup.py.orig	2022-08-10 16:06:27.000000000 +0200
-+++ libsvm-3.3/python/setup.py	2023-01-18 06:33:05.588764243 +0100
-@@ -76,9 +76,6 @@ class CleanCommand(clean_cmd):
+--- libsvm-3.32/python/setup.py.orig	2024-02-24 18:40:05.425381049 +0100
++++ libsvm-3.32/python/setup.py	2024-02-24 18:41:02.285073013 +0100
+@@ -89,9 +89,6 @@ class CleanCommand(clean_cmd):
                  rmtree(f)
  
  def main():
 -    if not path.exists(cpp_dir):
 -        create_cpp_source()
 -
-     with open("README") as f:
-         long_description = f.read()
+     if not path.exists(license_file):
+         copyfile(license_source, license_file)
  
-@@ -93,11 +90,6 @@ def main():
-         author_email="cjlin at csie.ntu.edu.tw",
+@@ -110,11 +107,6 @@ def main():
          url="https://www.csie.ntu.edu.tw/~cjlin/libsvm",
+         license=license_name,
          install_requires=["scipy"],
 -        ext_modules=[
 -            Extension(
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libsvm.git/commitdiff/099d0dbaad45516459d12d92edfc867e2cef04ef



More information about the pld-cvs-commit mailing list