jjames pushed to rpms/gap-pkg-hap (f37). "Version 1.53."
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-02-28 23:37:03 UTC
From 95c61c45efb846a1c10541f76445aac2c607e408 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry(a)gmail.com>
Date: Feb 28 2023 23:36:36 +0000
Subject: Version 1.53.
---
diff --git a/gap-pkg-hap.spec b/gap-pkg-hap.spec
index ff39bf3..5022b4e 100644
--- a/gap-pkg-hap.spec
+++ b/gap-pkg-hap.spec
@@ -11,7 +11,7 @@
%bcond_with bootstrap
Name: gap-pkg-%{pkgname}
-Version: 1.52
+Version: 1.53
Release: 1%{?dist}
Summary: Homological Algebra Programming for GAP
@@ -129,9 +129,6 @@ chmod a-x lib/Kelvin/{*.xml,kelvin.gd,*.gi,init.g,tutex/*.txt} \
lib/Perturbations/Gcomplexes/*.gz \
www/SideLinks/About/*.g
-# Fix a bad entity, again (https://github.com/gap-packages/hap/pull/102)
-sed -i 's/gr;/gt;/' tutorial/tutex/14.20.txt
-
%build
# Build the documentation
export LC_ALL=C.UTF-8
@@ -173,6 +170,9 @@ gap -l "%{buildroot}%{gap_dir};" -o 3G tst/testquick.g
%{gap_dir}/pkg/%{pkgname}/tutorial/
%changelog
+* Tue Feb 28 2023 Jerry James <loganjerry(a)gmail.com> - 1.53-1
+- Version 1.53
+
* Mon Feb 13 2023 Jerry James <loganjerry(a)gmail.com> - 1.52-1
- Version 1.52
diff --git a/sources b/sources
index 88312a7..d89dbab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (hap-1.52.tar.gz) = f5e66b4d250da7e6d4a810483562426b33b54f056b6055520220dd926fa66c204ebaa2f65d572089dccbc08ac2e384fd47b988b6e67ff0a41533e8b86758d0bb
+SHA512 (hap-1.53.tar.gz) = 8f0c0fea71a7e53f2709b66c72fd91611ad3ebacd1cb3309dfe22a24fc2c824f11c7b81d8d23d86b161255563bdb280a15ab107ae341993a6591899b5f5d4e1d
https://src.fedoraproject.org/rpms/gap-pkg-hap/c/95c61c45efb846a1c10541f7...
1Â year, 1Â month
pagure pushed to rpms/python-cryptography (rawhide). "ensure correct
compiler flags are used for Rust code"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-02-28 23:29:32 UTC
From cf6e4c6ecf1d73549a6568cef4b43f3dcca19786 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe(a)gmail.com>
Date: Feb 28 2023 23:06:55 +0000
Subject: ensure correct compiler flags are used for Rust code
---
diff --git a/python-cryptography.spec b/python-cryptography.spec
index 76ea9b9..c40d3a3 100644
--- a/python-cryptography.spec
+++ b/python-cryptography.spec
@@ -6,7 +6,7 @@
Name: python-%{srcname}
Version: 37.0.2
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: PyCA's cryptography library
# cryptography is dual licensed under the Apache-2.0 and BSD-3-Clause,
@@ -37,8 +37,6 @@ BuildRequires: python%{python3_pkgversion}-cffi >= 1.7
BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_pkgversion}-setuptools
BuildRequires: python%{python3_pkgversion}-setuptools-rust >= 0.11.3
-# Cargo.toml requires asn1 0.6, but package FTBFS with 0.6.1
-BuildRequires: rust-asn1-devel >= 0.6.4
%if %{with tests}
%if 0%{?fedora}
@@ -73,22 +71,24 @@ recipes to Python developers.
%prep
%autosetup -p1 -n %{srcname}-%{version}
-
-%generate_buildrequires
-
%if 0%{?fedora}
-# Fedora: use cargo macros to make use of RPMified crates
%cargo_prep
-cd src/rust
-rm -f Cargo.lock
-%cargo_generate_buildrequires
-cd ../..
+rm src/rust/Cargo.lock
%else
# RHEL: use vendored Rust crates
%cargo_prep -V 1
%endif
+%if 0%{?fedora}
+%generate_buildrequires
+# Fedora: use RPMified crates
+cd src/rust
+%cargo_generate_buildrequires
+cd ../..
+%endif
+
%build
+export RUSTFLAGS="%build_rustflags"
%py3_build
%install
@@ -129,6 +129,9 @@ PYTHONPATH=${PWD}/vectors:%{buildroot}%{python3_sitearch} \
%{python3_sitearch}/%{srcname}-%{version}-py*.egg-info
%changelog
+* Tue Feb 28 2023 Fabio Valentini <decathorpe(a)gmail.com> - 37.0.2-9
+- Ensure correct compiler flags are used for Rust code.
+
* Wed Feb 22 2023 Christian Heimes <cheimes(a)redhat.com> - 37.0.2-8
- Fix CVE-2023-23931: Don't allow update_into to mutate immutable objects, resolves rhbz#2171820
- Fix FTBFS due to failing test_load_invalid_ec_key_from_pem and test_decrypt_invalid_decrypt, resolves rhbz#2171661
https://src.fedoraproject.org/rpms/python-cryptography/c/cf6e4c6ecf1d7354...
1Â year, 1Â month
jjames pushed to rpms/gap-pkg-hap (f38). "Version 1.53."
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-02-28 23:11:07 UTC
From af97dcfb5a6ef7b49df266fdb88ee2c006a1e605 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry(a)gmail.com>
Date: Feb 28 2023 22:23:18 +0000
Subject: Version 1.53.
---
diff --git a/gap-pkg-hap.spec b/gap-pkg-hap.spec
index 8539a8c..043e319 100644
--- a/gap-pkg-hap.spec
+++ b/gap-pkg-hap.spec
@@ -11,7 +11,7 @@
%bcond_with bootstrap
Name: gap-pkg-%{pkgname}
-Version: 1.52
+Version: 1.53
Release: 1%{?dist}
Summary: Homological Algebra Programming for GAP
@@ -129,9 +129,6 @@ chmod a-x lib/Kelvin/{*.xml,kelvin.gd,*.gi,init.g,tutex/*.txt} \
lib/Perturbations/Gcomplexes/*.gz \
www/SideLinks/About/*.g
-# Fix a bad entity, again (https://github.com/gap-packages/hap/pull/102)
-sed -i 's/gr;/gt;/' tutorial/tutex/14.20.txt
-
%build
# Build the documentation
export LC_ALL=C.UTF-8
@@ -173,6 +170,9 @@ gap -l "%{buildroot}%{gap_libdir};" -o 3G tst/testquick.g
%{gap_libdir}/pkg/%{pkgname}/tutorial/
%changelog
+* Tue Feb 28 2023 Jerry James <loganjerry(a)gmail.com> - 1.53-1
+- Version 1.53
+
* Mon Feb 13 2023 Jerry James <loganjerry(a)gmail.com> - 1.52-1
- Version 1.52
diff --git a/sources b/sources
index 88312a7..d89dbab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (hap-1.52.tar.gz) = f5e66b4d250da7e6d4a810483562426b33b54f056b6055520220dd926fa66c204ebaa2f65d572089dccbc08ac2e384fd47b988b6e67ff0a41533e8b86758d0bb
+SHA512 (hap-1.53.tar.gz) = 8f0c0fea71a7e53f2709b66c72fd91611ad3ebacd1cb3309dfe22a24fc2c824f11c7b81d8d23d86b161255563bdb280a15ab107ae341993a6591899b5f5d4e1d
https://src.fedoraproject.org/rpms/gap-pkg-hap/c/af97dcfb5a6ef7b49df266fd...
1Â year, 1Â month
stefanberger pushed to rpms/libtpms (f36). "Build of libtpms 0.9.6
with fixes for CVE-2023-1017 & CVE-2023-1018"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-02-28 23:00:28 UTC
From 03eb885c4f282a530030c4bd0364780e51d00874 Mon Sep 17 00:00:00 2001
From: Stefan Berger <stefanb(a)linux.vnet.ibm.com>
Date: Feb 28 2023 23:00:15 +0000
Subject: Build of libtpms 0.9.6 with fixes for CVE-2023-1017 & CVE-2023-1018
---
diff --git a/.gitignore b/.gitignore
index b906a61..9112da8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@
/libtpms-20220307.tar.xz
/libtpms-20220425.tar.xz
/libtpms-0.9.5.tar.gz
+/libtpms-0.9.6.tar.gz
diff --git a/libtpms.spec b/libtpms.spec
index 866a6da..e05119f 100644
--- a/libtpms.spec
+++ b/libtpms.spec
@@ -1,5 +1,5 @@
Name: libtpms
-Version: 0.9.5
+Version: 0.9.6
Release: 1%{?dist}
Summary: Library providing Trusted Platform Module (TPM) functionality
License: BSD
@@ -58,6 +58,9 @@ make check
%{_mandir}/man3/TPM*
%changelog
+* Tue Feb 28 2023 Stefan Berger <stefanb(a)linux.ibm.com> - 0.9.6-1
+- Build of libtpms 0.9.6 with fixes for CVE-2023-1017 & CVE-2023-1018
+
* Fri Jul 01 2022 Stefan Berger <stefanb(a)linux.ibm.com> - 0.9.5-1
- Build of libtpms 0.9.5
diff --git a/sources b/sources
index 51045bf..d7ed1ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libtpms-0.9.5.tar.gz) = 96b8d6dd66a6c4bc7b72d172d0b75444c7725a7fb5b0f792cd1cff9d8f7ec894c51e94493816f033198cc8adf2f95cf473629431dadb70b423068d834de09e21
+SHA512 (libtpms-0.9.6.tar.gz) = 35f26e4849eb98cd73461aff439c19f77bbbcde9b7661402e3d419354c4dcddd057349c4f7178573f1ceea2e95326498eb9afea3bd48064bbff534fc7f6939c3
https://src.fedoraproject.org/rpms/libtpms/c/03eb885c4f282a530030c4bd0364...
1Â year, 1Â month
music pushed to rpms/python-pandas (f38). "Update to 1.5.3 (close
RHBZ#2162303)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-02-28 22:48:20 UTC
From 3f6fa92505efe514b3c180f960a523d52838042a Mon Sep 17 00:00:00 2001
From: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Feb 27 2023 23:03:24 +0000
Subject: Update to 1.5.3 (close RHBZ#2162303)
---
diff --git a/.gitignore b/.gitignore
index 6241222..20a392a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@
/pandas-1.3.5.tar.gz
/pandas-1.5.1.tar.gz
/pandas-1.5.2.tar.gz
+/pandas-1.5.3.tar.gz
diff --git a/e73d4d29203dab20e001beb1090d07683de583d6.patch b/e73d4d29203dab20e001beb1090d07683de583d6.patch
new file mode 100644
index 0000000..544bc87
--- /dev/null
+++ b/e73d4d29203dab20e001beb1090d07683de583d6.patch
@@ -0,0 +1,97 @@
+From e73d4d29203dab20e001beb1090d07683de583d6 Mon Sep 17 00:00:00 2001
+From: Patrick Hoefler <61934744+phofl(a)users.noreply.github.com>
+Date: Sat, 28 Jan 2023 08:37:26 -0500
+Subject: [PATCH] Backport PR #50925 on branch 1.5.x (TST: Remove fsspec
+ internals from tests) (#51038)
+
+TST: Remove fsspec internals from tests (#50925)
+
+Co-authored-by: Thomas Li <47963215+lithomas1(a)users.noreply.github.com>
+---
+ pandas/tests/io/test_fsspec.py | 2 --
+ pandas/tests/io/test_gcs.py | 24 +++++-------------------
+ 2 files changed, 5 insertions(+), 21 deletions(-)
+
+diff --git a/pandas/tests/io/test_fsspec.py b/pandas/tests/io/test_fsspec.py
+index 4f033fd63f978..fd1b30eca449e 100644
+--- a/pandas/tests/io/test_fsspec.py
++++ b/pandas/tests/io/test_fsspec.py
+@@ -50,10 +50,8 @@ def test_read_csv(cleared_fs, df1):
+
+
+ def test_reasonable_error(monkeypatch, cleared_fs):
+- from fsspec import registry
+ from fsspec.registry import known_implementations
+
+- registry.target.clear()
+ with pytest.raises(ValueError, match="nosuchprotocol"):
+ read_csv("nosuchprotocol://test/test.csv")
+ err_msg = "test error message"
+diff --git a/pandas/tests/io/test_gcs.py b/pandas/tests/io/test_gcs.py
+index 6907d8978e603..538969b7e226c 100644
+--- a/pandas/tests/io/test_gcs.py
++++ b/pandas/tests/io/test_gcs.py
+@@ -22,17 +22,12 @@
+ @pytest.fixture
+ def gcs_buffer(monkeypatch):
+ """Emulate GCS using a binary buffer."""
+- from fsspec import (
+- AbstractFileSystem,
+- registry,
+- )
+-
+- registry.target.clear() # remove state
++ import fsspec
+
+ gcs_buffer = BytesIO()
+ gcs_buffer.close = lambda: True
+
+- class MockGCSFileSystem(AbstractFileSystem):
++ class MockGCSFileSystem(fsspec.AbstractFileSystem):
+ def open(*args, **kwargs):
+ gcs_buffer.seek(0)
+ return gcs_buffer
+@@ -41,7 +36,8 @@ def ls(self, path, **kwargs):
+ # needed for pyarrow
+ return [{"name": path, "type": "file"}]
+
+- monkeypatch.setattr("gcsfs.GCSFileSystem", MockGCSFileSystem)
++ # Overwrites the default implementation from gcsfs to our mock class
++ fsspec.register_implementation("gs", MockGCSFileSystem, clobber=True)
+
+ return gcs_buffer
+
+@@ -54,9 +50,6 @@ def test_to_read_gcs(gcs_buffer, format):
+
+ GH 33987
+ """
+- from fsspec import registry
+-
+- registry.target.clear() # remove state
+
+ df1 = DataFrame(
+ {
+@@ -131,9 +124,6 @@ def test_to_csv_compression_encoding_gcs(gcs_buffer, compression_only, encoding)
+ GH 35677 (to_csv, compression), GH 26124 (to_csv, encoding), and
+ GH 32392 (read_csv, encoding)
+ """
+- from fsspec import registry
+-
+- registry.target.clear() # remove state
+ df = tm.makeDataFrame()
+
+ # reference of compressed and encoded file
+@@ -173,12 +163,8 @@ def test_to_csv_compression_encoding_gcs(gcs_buffer, compression_only, encoding)
+ @td.skip_if_no("gcsfs")
+ def test_to_parquet_gcs_new_file(monkeypatch, tmpdir):
+ """Regression test for writing to a not-yet-existent GCS Parquet file."""
+- from fsspec import (
+- AbstractFileSystem,
+- registry,
+- )
++ from fsspec import AbstractFileSystem
+
+- registry.target.clear() # remove state
+ df1 = DataFrame(
+ {
+ "int": [1, 3],
diff --git a/python-pandas.spec b/python-pandas.spec
index fda3023..1ec716f 100644
--- a/python-pandas.spec
+++ b/python-pandas.spec
@@ -12,8 +12,8 @@
%bcond_without single_tests
Name: python-pandas
-Version: 1.5.2
-Release: 2%{?dist}
+Version: 1.5.3
+Release: 1%{?dist}
Summary: Python library providing high-performance data analysis tools
# The entire source is BSD-3-Clause and covered by LICENSE, except:
@@ -78,6 +78,15 @@ Source0: https://github.com/pandas-dev/pandas/archive/v%{version}/pandas-
# https://github.com/pandas-dev/pandas/pull/49913
Patch: https://github.com/pandas-dev/pandas/pull/49913.patch
+# [PATCH] Backport PR #50925 on branch 1.5.x (TST: Remove fsspec internals from
+# tests) (#51038)
+#
+# TST: Remove fsspec internals from tests (#50925)
+# https://github.com/pandas-dev/pandas/commit/e73d4d29203dab20e001beb1090d0...
+# fixes:
+# ERROR at setup of test_to_read_gcs[…]
+Patch: https://github.com/pandas-dev/pandas/commit/e73d4d29203dab20e001beb1090d0...
+
%global _description %{expand:
pandas is an open source, BSD-licensed library providing
high-performance, easy-to-use data structures and data
@@ -590,12 +599,43 @@ k="${k-}${k+ and }not (TestStata and test_strl_latin1)"
k="${k-}${k+ and }not (TestStata and test_utf8_writer)"
%endif
+# TODO: Why does this fail?
+# E assert 0 == 1
+k="${k-}${k+ and }not test_switch_options"
+
+%ifarch x86_64
+# These are brittle and fail with tiny floating-point differences on COPR
+# builders but not Koji builders, like:
+# > raise_assert_detail(obj, msg, left, right, index_values=index_values)
+# E AssertionError: numpy array are different
+# E
+# E numpy array values are different (16.66667 %)
+# E [left]: [0.09999999999999999, 1.0, 10.0, 100.0, 1000.0, 10000.0]
+# E [right]: [0.1, 1.0, 10.0, 100.0, 1000.0, 10000.0]
+k="${k-}${k+ and }not (TestSeriesPlots and test_bar_log)"
+k="${k-}${k+ and }not (TestDataFramePlotsSubplots and test_bar_log_no_subplots)"
+k="${k-}${k+ and }not (TestDataFramePlotsSubplots and test_bar_log_subplots)"
+%endif
+
%if 0%{?fedora} > 37
# The text of an error message has changed in libarrow/pyarrow 10, which is
# harmless but breaks one test. Disable it until a patch is available upstream.
# CI: pyarrow 10 broke our ci
# https://github.com/pandas-dev/pandas/issues/50058
k="${k-}${k+ and }not test_arrow_array"
+
+# Probably also related to upstream pinning pyarrow < 10 for CI:
+# E TypeError: Expected unicode, got pyarrow.lib.StringScalar
+k="${k-}${k+ and }not (TestConstructors and test_from_sequence_of_strings_pa_array)"
+
+# TODO: Why does this fail? Does it need a slightly older version of dask?
+# E AssertionError: Caused unexpected warning(s): [('RuntimeWarning', RuntimeWarning('invalid value encountered in cast'), '/builddir/build/BUILDROOT/python-pandas-1.5.3-1.fc39.x86_64/usr/lib64/python3.11/site-packages/pandas/core/dtypes/cast.py', 1836)]
+k="${k-}${k+ and }not test_construct_dask_float_array_int_dtype_match_ndarray"
+
+# Incompatibility with python-xarray ≥ 2023.01.0. See:
+# https://github.com/pydata/xarray/blob/v2023.02.0/doc/whats-new.rst#breaki...
+# CFTimeIndex.get_loc() got an unexpected keyword argument 'method'
+k="${k-}${k+ and }not test_xarray_cftimeindex_nearest"
%endif
%if 0%{?fc37}
@@ -669,6 +709,9 @@ export PYTHONHASHSEED="$(
%changelog
+* Mon Feb 27 2023 Benjamin A. Beasley <code(a)musicinmybrain.net> - 1.5.3-1
+- Update to 1.5.3 (close RHBZ#2162303)
+
* Fri Jan 20 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.5.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
diff --git a/sources b/sources
index 048ab2b..45b979b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pandas-1.5.2.tar.gz) = 9551c403f37f516b3547966d3ca90b0014c9cfe254a342600e2d17199ea8ea256de05d6784ac422f75cf9c1dcca893962c33fb97e65be45ffc2518a0e164070d
+SHA512 (pandas-1.5.3.tar.gz) = 220ec6923ebc1d0063537d8a62f53a8ce2631c35c1f3f5b63ee892617507603553db69a2d06f8cd338366e008f746994c3420ee58d151df1b94f5b5719b03b43
https://src.fedoraproject.org/rpms/python-pandas/c/3f6fa92505efe514b3c180...
1Â year, 1Â month
stefanberger pushed to rpms/libtpms (f37). "Build of libtpms 0.9.6
with fixes for CVE-2023-1017 & CVE-2023-1018"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-02-28 22:46:26 UTC
From 09870eee5395f62a8c46ddec5c767d938582d044 Mon Sep 17 00:00:00 2001
From: Stefan Berger <stefanb(a)linux.vnet.ibm.com>
Date: Feb 28 2023 22:46:16 +0000
Subject: Build of libtpms 0.9.6 with fixes for CVE-2023-1017 & CVE-2023-1018
---
diff --git a/.gitignore b/.gitignore
index a87aeee..4c6571c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
/libtpms-20220425.tar.xz
/libtpms-0.9.4.tar.gz
/libtpms-0.9.5.tar.gz
+/libtpms-0.9.6.tar.gz
diff --git a/libtpms.spec b/libtpms.spec
index bd1906e..f93a3cf 100644
--- a/libtpms.spec
+++ b/libtpms.spec
@@ -1,6 +1,6 @@
Name: libtpms
-Version: 0.9.5
-Release: 2%{?dist}
+Version: 0.9.6
+Release: 1%{?dist}
Summary: Library providing Trusted Platform Module (TPM) functionality
License: BSD
@@ -58,6 +58,9 @@ make check
%{_mandir}/man3/TPM*
%changelog
+* Tue Feb 28 2023 Stefan Berger <stefanb(a)linux.ibm.com> - 0.9.6-1
+- Build of libtpms 0.9.6 with fixes for CVE-2023-1017 & CVE-2023-1018
+
* Thu Jul 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
diff --git a/sources b/sources
index 51045bf..d7ed1ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libtpms-0.9.5.tar.gz) = 96b8d6dd66a6c4bc7b72d172d0b75444c7725a7fb5b0f792cd1cff9d8f7ec894c51e94493816f033198cc8adf2f95cf473629431dadb70b423068d834de09e21
+SHA512 (libtpms-0.9.6.tar.gz) = 35f26e4849eb98cd73461aff439c19f77bbbcde9b7661402e3d419354c4dcddd057349c4f7178573f1ceea2e95326498eb9afea3bd48064bbff534fc7f6939c3
https://src.fedoraproject.org/rpms/libtpms/c/09870eee5395f62a8c46ddec5c76...
1Â year, 1Â month
stefanberger pushed to rpms/libtpms (f38). "Build of libtpms 0.9.6
with fixes for CVE-2023-1017 & CVE-2023-1018"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-02-28 22:44:18 UTC
From dceb0d4f74f2478c03d230f6fca77963c24918c4 Mon Sep 17 00:00:00 2001
From: Stefan Berger <stefanb(a)linux.vnet.ibm.com>
Date: Feb 28 2023 22:44:08 +0000
Subject: Build of libtpms 0.9.6 with fixes for CVE-2023-1017 & CVE-2023-1018
---
diff --git a/.gitignore b/.gitignore
index a87aeee..4c6571c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
/libtpms-20220425.tar.xz
/libtpms-0.9.4.tar.gz
/libtpms-0.9.5.tar.gz
+/libtpms-0.9.6.tar.gz
diff --git a/libtpms.spec b/libtpms.spec
index f8f4197..d384ee7 100644
--- a/libtpms.spec
+++ b/libtpms.spec
@@ -1,6 +1,6 @@
Name: libtpms
-Version: 0.9.5
-Release: 3%{?dist}
+Version: 0.9.6
+Release: 1%{?dist}
Summary: Library providing Trusted Platform Module (TPM) functionality
License: BSD
@@ -58,6 +58,9 @@ make check
%{_mandir}/man3/TPM*
%changelog
+* Tue Feb 28 2023 Stefan Berger <stefanb(a)linux.ibm.com> - 0.9.6-1
+- Build of libtpms 0.9.6 with fixes for CVE-2023-1017 & CVE-2023-1018
+
* Thu Jan 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
diff --git a/sources b/sources
index 51045bf..d7ed1ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libtpms-0.9.5.tar.gz) = 96b8d6dd66a6c4bc7b72d172d0b75444c7725a7fb5b0f792cd1cff9d8f7ec894c51e94493816f033198cc8adf2f95cf473629431dadb70b423068d834de09e21
+SHA512 (libtpms-0.9.6.tar.gz) = 35f26e4849eb98cd73461aff439c19f77bbbcde9b7661402e3d419354c4dcddd057349c4f7178573f1ceea2e95326498eb9afea3bd48064bbff534fc7f6939c3
https://src.fedoraproject.org/rpms/libtpms/c/dceb0d4f74f2478c03d230f6fca7...
1Â year, 1Â month
jjames pushed to rpms/libsvm (f38). "Version 3.31."
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-02-28 22:39:32 UTC
From a9060619807333fb768b76bf468c843b3afc0c8d Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry(a)gmail.com>
Date: Feb 28 2023 22:10:33 +0000
Subject: Version 3.31.
---
diff --git a/libsvm-3.25.pom b/libsvm-3.25.pom
deleted file mode 100644
index 62cead6..0000000
--- a/libsvm-3.25.pom
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.sonatype.oss</groupId>
- <artifactId>oss-parent</artifactId>
- <version>9</version>
- </parent>
-
- <groupId>tw.edu.ntu.csie</groupId>
- <artifactId>libsvm</artifactId>
- <version>3.25</version>
-
- <name>libsvm</name>
- <description>LIBSVM - A Library for Support Vector Machines</description>
- <url>https://github.com/cjlin1/libsvm</url>
-
- <inceptionYear>2014</inceptionYear>
-
- <licenses>
- <license>
- <name>BSD 3-Clause License</name>
- <url>http://www.csie.ntu.edu.tw/~cjlin/libsvm/COPYRIGHT</url>
- </license>
- </licenses>
-
- <scm>
- <connection>scm:git:git@github.com:cjlin1/libsvm.git</connection>
- <developerConnection>scm:git:git@github.com:cjlin1/libsvm.git</developerConnection>
- <url>https://github.com/cjlin1/libsvm</url>
- </scm>
-
- <distributionManagement>
- <snapshotRepository>
- <id>ossrh</id>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- </snapshotRepository>
- </distributionManagement>
-
- <properties>
- <java.version>8</java.version>
- <maven.exec.plugin.version>3.0.0</maven.exec.plugin.version>
- <build.helper.plugin.version>3.0.0</build.helper.plugin.version>
- <maven-plugin-version>3.8.0</maven-plugin-version>
- <javadoc.plugin.version>3.2.0</javadoc.plugin.version>
- <source.plugin.version>3.2.1</source.plugin.version>
- <nexus.staging.plugin.version>1.6.8</nexus.staging.plugin.version>
- <gpg.plugin.version>1.6</gpg.plugin.version>
- <gpg.keyname>91EA7956A2DAD9CE</gpg.keyname>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>${maven.exec.plugin.version}</version>
- <executions>
- <execution>
- <id>m4</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <executable>m4</executable>
- <arguments>
- <argument>java/libsvm/svm.m4</argument>
- </arguments>
- <outputFile>target/generated-sources/libsvm/svm.java</outputFile>
- <workingDirectory>${project.basedir}</workingDirectory>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>${build.helper.plugin.version}</version>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.basedir}/java/libsvm</source>
- <source>${project.basedir}/target/generated-sources/libsvm</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-plugin-version}</version>
- <configuration>
- <source>${java.version}</source>
- <target>${java.version}</target>
- <showDeprecation>true</showDeprecation>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadoc.plugin.version}</version>
- <configuration>
- <!-- workaround for https://bugs.openjdk.java.net/browse/JDK-8212233 -->
- <javaApiLinks>
- <property>
- <name>foo</name>
- <value>bar</value>
- </property>
- </javaApiLinks>
- <links>
- <link>http://docs.oracle.com/javase/8/docs/api/</link>
- </links>
- <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
- <encoding>utf-8</encoding>
- <show>public</show>
- <detectLinks>false</detectLinks>
- <detectOfflineLinks>true</detectOfflineLinks>
- <detectJavaApiLink>true</detectJavaApiLink>
- <!-- Speeds up the build of the javadocs -->
- <quiet>true</quiet>
- <use>false</use>
- <doclint>none</doclint>
- <additionalJOption>-html5</additionalJOption>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>${source.plugin.version}</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>package</phase>
- <goals>
- <goal>jar-no-fork</goal>
- <goal>test-jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- <version>${nexus.staging.plugin.version}</version>
- <extensions>true</extensions>
- <configuration>
- <serverId>ossrh</serverId>
- <nexusUrl>https://oss.sonatype.org/</nexusUrl>
- <autoReleaseAfterClose>false</autoReleaseAfterClose>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>release-sign-artifacts</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>${gpg.plugin.version}</version>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
\ No newline at end of file
diff --git a/libsvm-3.30.pom b/libsvm-3.30.pom
new file mode 100644
index 0000000..8502ac4
--- /dev/null
+++ b/libsvm-3.30.pom
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.sonatype.oss</groupId>
+ <artifactId>oss-parent</artifactId>
+ <version>9</version>
+ </parent>
+
+ <groupId>tw.edu.ntu.csie</groupId>
+ <artifactId>libsvm</artifactId>
+ <version>3.30</version>
+
+ <name>libsvm</name>
+ <description>LIBSVM - A Library for Support Vector Machines</description>
+ <url>https://github.com/cjlin1/libsvm</url>
+
+ <inceptionYear>2014</inceptionYear>
+
+ <licenses>
+ <license>
+ <name>BSD 3-Clause License</name>
+ <url>http://www.csie.ntu.edu.tw/~cjlin/libsvm/COPYRIGHT</url>
+ </license>
+ </licenses>
+
+ <scm>
+ <connection>scm:git:git@github.com:cjlin1/libsvm.git</connection>
+ <developerConnection>scm:git:git@github.com:cjlin1/libsvm.git</developerConnection>
+ <url>https://github.com/cjlin1/libsvm</url>
+ </scm>
+
+ <distributionManagement>
+ <snapshotRepository>
+ <id>ossrh</id>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <properties>
+ <java.version>8</java.version>
+ <maven.exec.plugin.version>3.0.0</maven.exec.plugin.version>
+ <build.helper.plugin.version>3.0.0</build.helper.plugin.version>
+ <maven-plugin-version>3.8.0</maven-plugin-version>
+ <javadoc.plugin.version>3.2.0</javadoc.plugin.version>
+ <source.plugin.version>3.2.1</source.plugin.version>
+ <nexus.staging.plugin.version>1.6.8</nexus.staging.plugin.version>
+ <gpg.plugin.version>1.6</gpg.plugin.version>
+ <gpg.keyname>91EA7956A2DAD9CE</gpg.keyname>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>${maven.exec.plugin.version}</version>
+ <executions>
+ <execution>
+ <id>m4</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <executable>m4</executable>
+ <arguments>
+ <argument>java/libsvm/svm.m4</argument>
+ </arguments>
+ <outputFile>target/generated-sources/libsvm/svm.java</outputFile>
+ <workingDirectory>${project.basedir}</workingDirectory>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>${build.helper.plugin.version}</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${project.basedir}/java/libsvm</source>
+ <source>${project.basedir}/target/generated-sources/libsvm</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-plugin-version}</version>
+ <configuration>
+ <source>${java.version}</source>
+ <target>${java.version}</target>
+ <showDeprecation>true</showDeprecation>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${javadoc.plugin.version}</version>
+ <configuration>
+ <!-- workaround for https://bugs.openjdk.java.net/browse/JDK-8212233 -->
+ <javaApiLinks>
+ <property>
+ <name>foo</name>
+ <value>bar</value>
+ </property>
+ </javaApiLinks>
+ <links>
+ <link>http://docs.oracle.com/javase/8/docs/api/</link>
+ </links>
+ <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
+ <encoding>utf-8</encoding>
+ <show>public</show>
+ <detectLinks>false</detectLinks>
+ <detectOfflineLinks>true</detectOfflineLinks>
+ <detectJavaApiLink>true</detectJavaApiLink>
+ <!-- Speeds up the build of the javadocs -->
+ <quiet>true</quiet>
+ <use>false</use>
+ <doclint>none</doclint>
+ <additionalJOption>-html5</additionalJOption>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>${source.plugin.version}</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar-no-fork</goal>
+ <goal>test-jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>nexus-staging-maven-plugin</artifactId>
+ <version>${nexus.staging.plugin.version}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <serverId>ossrh</serverId>
+ <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+ <autoReleaseAfterClose>false</autoReleaseAfterClose>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>release-sign-artifacts</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>${gpg.plugin.version}</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
diff --git a/libsvm.javaDir.patch b/libsvm.javaDir.patch
index 6fddb76..2a058d1 100644
--- a/libsvm.javaDir.patch
+++ b/libsvm.javaDir.patch
@@ -1,13 +1,13 @@
-diff -up ./java/Makefile.javaDir ./java/Makefile
---- ./java/Makefile.javaDir 2016-12-22 04:58:49.000000000 +1000
-+++ ./java/Makefile 2018-04-17 12:11:53.773004141 +1000
+diff -up java/Makefile.orig java/Makefile
+--- java/Makefile.orig 2023-02-28 01:31:32.000000000 -0700
++++ java/Makefile 2023-02-28 14:44:58.446569758 -0700
@@ -5,8 +5,8 @@ FILES = libsvm/svm.class libsvm/svm_mode
svm_train.class svm_predict.class svm_toy.class svm_scale.class
#JAVAC = jikes
--JAVAC_FLAGS = -target 1.7 -source 1.7
+-JAVAC_FLAGS = --release 11
-JAVAC = javac
-+JAVAC_FLAGS = -target 1.8 -source 1.8 -classpath ${CLASSPATH}
++JAVAC_FLAGS = --release 8
+JAVAC ?= javac
# JAVAC_FLAGS =
export CLASSPATH := .:$(CLASSPATH)
@@ -33,11 +33,3 @@ diff -up ./java/Makefile.javaDir ./java/Makefile
dist: clean all
rm *.class libsvm/*.class
-diff -up ./java/test_applet.html.javaDir ./java/test_applet.html
---- ./java/test_applet.html.javaDir 2016-12-22 04:58:51.000000000 +1000
-+++ ./java/test_applet.html 2018-04-17 11:51:17.927996424 +1000
-@@ -1 +1,3 @@
--<APPLET code="svm_toy.class" archive="libsvm.jar" width=300 height=350></APPLET>
-+<html>
-+<applet code="svm_toy.class" archive="libsvm.jar" width=300 height=350></applet>
-+</html>
diff --git a/libsvm.packageMain.patch b/libsvm.packageMain.patch
index 7bfe158..bb39a64 100644
--- a/libsvm.packageMain.patch
+++ b/libsvm.packageMain.patch
@@ -1,7 +1,7 @@
diff -up Makefile.orig Makefile
---- Makefile.orig 2022-08-10 08:06:19.000000000 -0600
-+++ Makefile 2022-08-12 08:32:32.832261639 -0600
-@@ -1,11 +1,44 @@
+--- Makefile.orig 2023-02-28 01:31:32.000000000 -0700
++++ Makefile 2023-02-28 13:56:21.696052600 -0700
+@@ -1,7 +1,14 @@
CXX ?= g++
-CFLAGS = -Wall -Wconversion -O3 -fPIC
+CFLAGS = ${RPM_CFLAGS} -Wconversion -fPIC
@@ -14,6 +14,17 @@ diff -up Makefile.orig Makefile
+IS_64 := $(shell /bin/uname -i | awk '/64/ {print 64}')
+PREFIXDIR ?= /usr
+export PREFIXDIR
+ ifeq ($(OS),Darwin)
+ SHARED_LIB_FLAG = -dynamiclib -Wl,-install_name,libsvm.so.$(SHVER)
+ else
+@@ -9,20 +16,80 @@ else
+ endif
+
+ # Uncomment the following lines to enable parallelization with OpenMP
+-# CFLAGS += -fopenmp
+-# SHARED_LIB_FLAG += -fopenmp
++CFLAGS += -fopenmp
++SHARED_LIB_FLAG += -fopenmp
-all: svm-train svm-predict svm-scale
+LIBDIR ?= ${PREFIXDIR}/lib${IS_64}
@@ -46,12 +57,7 @@ diff -up Makefile.orig Makefile
+ ln -sf libsvm.so.$(SHVER) libsvm.so
+
+libsvm.so.$(SHVER): svm.o
- if [ "$(OS)" = "Darwin" ]; then \
- SHARED_LIB_FLAG="-dynamiclib -Wl,-install_name,libsvm.so.$(SHVER)"; \
- else \
-@@ -14,12 +47,46 @@ lib: svm.o
- $(CXX) $${SHARED_LIB_FLAG} svm.o -o libsvm.so.$(SHVER)
-
+ $(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
+ $(CXX) $(CFLAGS) svm-predict.c $(LIBS) -o svm-predict -lm
diff --git a/libsvm.spec b/libsvm.spec
index f2046fc..a0ca890 100644
--- a/libsvm.spec
+++ b/libsvm.spec
@@ -1,12 +1,8 @@
%global shver 3
-%global tarballver 3.3
-%global libdir_libsvm %{_libdir}/libsvm
-%global python3_libsvm_dir %{python3_sitearch}/libsvm
%global maven_group_id tw.edu.ntu.csie
-%global pom_file_version 3.25
-%global pom_file_name JPP.%{maven_group_id}-%{name}.pom
+%global pom_file_version 3.30
%global octpkg %{name}
-%global release_date 2022-08-11
+%global release_date 2023-02-28
%global cpp_std c++17
%if %{defined rhel}
@@ -24,13 +20,15 @@
%endif
Name: libsvm
-Version: 3.30
-Release: 2%{?dist}
+Version: 3.31
+Release: 1%{?dist}
Summary: A Library for Support Vector Machines
+%global upver %(tr -d . <<< %{version})
+
License: BSD-3-Clause
URL: https://www.csie.ntu.edu.tw/~cjlin/libsvm/
-Source0: https://www.csie.ntu.edu.tw/~cjlin/libsvm/%{name}-%{tarballver}.tar.gz
+Source0: https://github.com/cjlin1/libsvm/archive/v%{upver}/%{name}-%{upver}.tar.gz
Source1: https://www.csie.ntu.edu.tw/~cjlin/libsvm/log
Source2: https://www.csie.ntu.edu.tw/~cjlin/papers/guide/guide.pdf
Source3: libsvm-svm-toy-qt.desktop
@@ -42,11 +40,12 @@ Source6: libsvm.INDEX
Source7: libsvm.CITATION
Source8: libsvm.DESCRIPTION
Patch0: %{name}.packageMain.patch
-Patch2: %{name}.javaDir.patch
-Patch4: %{name}.toolsDir.patch
-Patch5: %{name}.svm-toy-qt5.patch
+Patch1: %{name}.javaDir.patch
+Patch2: %{name}.toolsDir.patch
+Patch3: %{name}.svm-toy-qt5.patch
# Fix a broken attempt to detect an empty string
-Patch6: %{name}.matlab.patch
+# https://github.com/cjlin1/libsvm/pull/194
+Patch4: %{name}.matlab.patch
# This can be removed when F40 reaches EOL
%if %{without java}
@@ -130,7 +129,7 @@ svm-toy is a libsvm demonstration program which has a qt-GUI to
display the derived separating hyperplane.
%prep
-%autosetup -p0 -n %{name}-%{tarballver}
+%autosetup -p0 -n %{name}-%{upver}
cp -p %{SOURCE1} ChangeLog
cp -p %{SOURCE2} %{SOURCE3} .
cp -p %{SOURCE4} %{name}-svm-toy-qt-48.png
@@ -141,7 +140,7 @@ cp -p %{SOURCE5} pom.xml
# org.sonatype.oss.oss-parent is deprecated and slated for removal from Fedora
%pom_remove_parent
-# Update the POM file, which is stuck on version 3.25
+# Update the POM file, which is stuck on version 3.30
%pom_xpath_set '/pom:project/pom:version' %{version}
%mvn_file %{maven_group_id}:%{name} %{maven_group_id}/%{name}
@@ -154,7 +153,13 @@ rm FAQ.html.orig
%if %{with python}
# Fix shebangs
-%py3_shebang_fix python/libsvm tools
+%py3_shebang_fix tools
+# Remove useless shebangs
+for p in python/libsvm/{commonutil,svm,svmutil}.py; do
+ sed -i.orig '1,+1d' $p
+ touch -r $p.orig $p
+ rm $p.orig
+done
%endif
%if %{with python}
@@ -202,14 +207,13 @@ ln -s %{name}.so.%{shver} %{buildroot}%{_libdir}/%{name}.so
# Python
cd python
%pyproject_install
+%pyproject_save_files libsvm
cd -
cd tools
for p in *.py; do
- install -p -m 755 *.py %{buildroot}%{python3_libsvm_dir}
- ln -s %{python3_libsvm_dir}/$p %{buildroot}%{_bindir}/svm-$p
+ install -p -m 755 $p %{buildroot}%{_bindir}/svm-$p
done
cd -
-chmod 0755 %{buildroot}%{python3_libsvm_dir}/{commonutil,svm,svmutil}.py
%endif
%if %{with java}
@@ -281,16 +285,14 @@ cp -p README java/README-Java
%endif
%if %{with python}
-%files -n python3-%{name}
+%files -n python3-%{name} -f %{pyproject_files}
%doc python/README-Python tools/README-Tools
-%{python3_libsvm_dir}/
-%{python3_sitearch}/libsvm*.dist-info/
%{_bindir}/svm-*.py
%endif
%if %{with java}
%files java -f .mfiles
-%doc java/README-Java java/test_applet.html
+%doc java/README-Java
%{_javadir}/%{name}.jar
%files javadoc
@@ -304,6 +306,9 @@ cp -p README java/README-Java
%{_datadir}/applications/*%{name}-svm-toy-qt.desktop
%changelog
+* Tue Feb 28 2023 Jerry James <loganjerry(a)gmail.com> - 3.31-1
+- Version 3.31
+
* Mon Feb 27 2023 Jerry James <loganjerry(a)gmail.com> - 3.30-2
- Dynamically generate python BuildRequires
diff --git a/libsvm.svm-toy-qt5.patch b/libsvm.svm-toy-qt5.patch
index 15ae15e..4808048 100644
--- a/libsvm.svm-toy-qt5.patch
+++ b/libsvm.svm-toy-qt5.patch
@@ -1,17 +1,18 @@
diff -up svm-toy/qt/Makefile.orig svm-toy/qt/Makefile
---- svm-toy/qt/Makefile.orig 2022-08-10 08:06:28.000000000 -0600
-+++ svm-toy/qt/Makefile 2022-08-12 08:37:20.299002661 -0600
+--- svm-toy/qt/Makefile.orig 2023-02-28 01:31:32.000000000 -0700
++++ svm-toy/qt/Makefile 2023-02-28 14:19:22.252890728 -0700
@@ -1,13 +1,14 @@
# use ``export QT_SELECT=qt5'' in a command window for using qt5
# may need to adjust the path of header files
CXX? = g++
-INCLUDE = /usr/include/x86_64-linux-gnu/qt5
-CFLAGS = -Wall -O3 -I$(INCLUDE) -I$(INCLUDE)/QtWidgets -I$(INCLUDE)/QtGui -I$(INCLUDE)/QtCore -fPIC -std=c++11
+-LIB = -lQt5Widgets -lQt5Gui -lQt5Core
+-MOC = /usr/bin/moc
+INCLUDE = /usr/include/qt5
+CPP_STD ?= c++11
+CFLAGS = ${RPM_CFLAGS} -I$(INCLUDE) -I$(INCLUDE)/QtWidgets -I$(INCLUDE)/QtGui -I$(INCLUDE)/QtCore -fPIC -std=${CPP_STD}
- LIB = -lQt5Widgets -lQt5Gui -lQt5Core
--MOC = /usr/bin/moc
++LIB = -fopenmp -lQt5Widgets -lQt5Gui -lQt5Core
+MOC ?= /usr/bin/moc-qt5
svm-toy: svm-toy.cpp svm-toy.moc ../../svm.o
@@ -27,8 +28,8 @@ diff -up svm-toy/qt/Makefile.orig svm-toy/qt/Makefile
- rm -f *~ svm-toy svm-toy.moc ../../svm.o
+ rm -f *~ svm-toy-qt svm-toy.moc ../../svm.o
diff -up svm-toy/qt/svm-toy.cpp.orig svm-toy/qt/svm-toy.cpp
---- svm-toy/qt/svm-toy.cpp.orig 2022-08-10 08:06:28.000000000 -0600
-+++ svm-toy/qt/svm-toy.cpp 2022-08-12 09:22:09.296679615 -0600
+--- svm-toy/qt/svm-toy.cpp.orig 2023-02-28 01:31:32.000000000 -0700
++++ svm-toy/qt/svm-toy.cpp 2023-02-28 14:19:03.158156750 -0700
@@ -326,12 +326,12 @@ private slots:
double x,y;
if(sscanf(buf,"%d%*d:%lf%*d:%lf",&v,&x,&y)==3)
diff --git a/sources b/sources
index 8b9389b..323808f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (guide.pdf) = 5e97a7b76ad4217d7987c5c07f0420e780b61b82fb88fe0e6015681fabb5078980b280cec4a0a7208ea225b9fa84de878295039f4513df26f0d404a21812e44c
-SHA512 (libsvm-3.3.tar.gz) = 705cdebffce0d9ea053cf51b2bfd46303d306b7a2c34ee46065f19e1227459fbdbe6fde6e4769935a0c225da831ec137fb9c0c28fbc2efa06724a94bdd76500d
+SHA512 (libsvm-331.tar.gz) = 78d3241fbf0286da077b8e612604feee13946b551888dcd8f47d23b4791f2a1daf516f3871e9a02d1b70cb58e12705603af8ef3c2ff0aac4211423d5053c7083
https://src.fedoraproject.org/rpms/libsvm/c/a9060619807333fb768b76bf468c8...
1Â year, 1Â month