- updated to 2.47

diff --git a/liblinear-make.patch b/liblinear-make.patch
index 6b1f5a973f8cc1cc38165069a279f9a6390650f0..2268a98bb34816569a0b063daf7c2ce63958cfe7 100644 (file)
--- a/liblinear-make.patch
+++ b/liblinear-make.patch
@@ -1,29 +1,26 @@
---- liblinear-2.45/Makefile.orig       2023-01-17 21:01:39.637840513 +0100
-+++ liblinear-2.45/Makefile    2023-01-17 21:05:06.673385572 +0100
-@@ -8,18 +8,21 @@ OS = $(shell uname)
+--- liblinear-2.47/Makefile.orig       2024-02-24 08:46:26.145013905 +0100
++++ liblinear-2.47/Makefile    2024-02-24 09:27:57.268185000 +0100
+@@ -13,14 +13,17 @@ endif
  
  all: train predict
  
 -lib: linear.o newton.o blas/blas.a
+-      $(CXX) $(SHARED_LIB_FLAG) linear.o newton.o blas/blas.a -o liblinear.so.$(SHVER)
 +lib: liblinear.so
-+
-+liblinear.so: linear.o newton.o
-       if [ "$(OS)" = "Darwin" ]; then \
-               SHARED_LIB_FLAG="-dynamiclib -Wl,-install_name,liblinear.so.$(SHVER)"; \
-       else \
-               SHARED_LIB_FLAG="-shared -Wl,-soname,liblinear.so.$(SHVER)"; \
-       fi; \
--      $(CXX) $${SHARED_LIB_FLAG} linear.o newton.o blas/blas.a -o liblinear.so.$(SHVER)
-+      $(CXX) $${SHARED_LIB_FLAG} linear.o newton.o -o liblinear.so.$(SHVER) $(LIBS) ; \
-+      ln -sf liblinear.so.$(SHVER) liblinear.so
  
 -train: newton.o linear.o train.c blas/blas.a
 -      $(CXX) $(CFLAGS) -o train train.c newton.o linear.o $(LIBS)
-+train: liblinear.so train.c
-+      $(CXX) $(CFLAGS) -o train train.c -L. -llinear $(LIBS)
++liblinear.so: linear.o newton.o
++      $(CXX) $(SHARED_LIB_FLAG) linear.o newton.o -o liblinear.so.$(SHVER) $(LIBS) ; \
++      ln -sf liblinear.so.$(SHVER) liblinear.so
  
 -predict: newton.o linear.o predict.c blas/blas.a
+-      $(CXX) $(CFLAGS) -o predict predict.c newton.o linear.o $(LIBS)
++train: liblinear.so train.c
++      $(CXX) $(CFLAGS) -o train train.c -L. -llinear $(LIBS)
++
 +predict: liblinear.so predict.c
-       $(CXX) $(CFLAGS) -o predict predict.c newton.o linear.o $(LIBS)
++      $(CXX) $(CFLAGS) -o predict predict.c -L. -llinear $(LIBS)
  
  newton.o: newton.cpp newton.h
+       $(CXX) $(CFLAGS) -c -o newton.o newton.cpp

diff --git a/liblinear-python.patch b/liblinear-python.patch
index e8ce53b8a5144ee8b03d95d4fe3fb24c13f2e847..b689b521eaae8b00cfa568f056c67d18d4d93371 100644 (file)
--- a/liblinear-python.patch
+++ b/liblinear-python.patch
@@ -34,21 +34,21 @@
  import os, sys
  from .liblinear import *
  from .liblinear import __all__ as liblinear_all
---- liblinear-2.45/python/setup.py.orig        2022-08-11 09:26:18.000000000 +0200
-+++ liblinear-2.45/python/setup.py     2023-01-17 21:31:10.778245422 +0100
-@@ -84,9 +84,6 @@ class CleanCommand(clean_cmd):
+--- liblinear-2.47/python/setup.py.orig        2024-02-24 08:30:08.070312591 +0100
++++ liblinear-2.47/python/setup.py     2024-02-24 08:46:01.101816242 +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)
  
-@@ -101,11 +98,6 @@ def main():
-         author_email="cjlin@csie.ntu.edu.tw",
+@@ -110,11 +107,6 @@ def main():
          url="https://www.csie.ntu.edu.tw/~cjlin/liblinear",
+         license=license_name,
          install_requires=["scipy"],
 -        ext_modules=[
 -            Extension(

diff --git a/liblinear.spec b/liblinear.spec
index 7cc9c72a088d9d17e1d1eb7ec4236f6d4d67a99e..3d774fde6f3fc2f9e9e2e971ea322dd57e85e695 100644 (file)
--- a/liblinear.spec
+++ b/liblinear.spec
@@ -12,12 +12,12 @@
 Summary:       LIBLINEAR - a Library for Large Linear Classification
 Summary(pl.UTF-8):     LIBLINEAR - biblioteka do liniowej klasyfikacji dużych danych
 Name:          liblinear
-Version:       2.45
+Version:       2.47
 Release:       1
 License:       BSD
 Group:         Libraries
 Source0:       https://www.csie.ntu.edu.tw/~cjlin/liblinear/%{name}-%{version}.tar.gz
-# Source0-md5: 28357277645087a39b5d8ac2212eed51
+# Source0-md5: 5f332f5f965d4ccb2c35a594abd6ec1d
 Patch0:                %{name}-python.patch
 Patch1:                %{name}-make.patch
 Patch2:                %{name}-matlab.patch
@@ -198,7 +198,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc python/README
 %{py_sitescriptdir}/liblinear
-%{py_sitescriptdir}/liblinear_official-2.45.0-py*.egg-info
+%{py_sitescriptdir}/liblinear_official-%{version}.0-py*.egg-info
 %endif
 
 %if %{with python3}
@@ -206,5 +206,5 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc python/README
 %{py3_sitescriptdir}/liblinear
-%{py3_sitescriptdir}/liblinear_official-2.45.0-py*.egg-info
+%{py3_sitescriptdir}/liblinear_official-%{version}.0-py*.egg-info
 %endif