From 98a02d8147af330a063d2630829e66729845c24a Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Jan 22 2023 09:36:25 +0000 Subject: Drop support for i686 and switch to SPDX licenses --- diff --git a/R-igraph-disable-i686-test.patch b/R-igraph-disable-i686-test.patch deleted file mode 100644 index 34d569e..0000000 --- a/R-igraph-disable-i686-test.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up igraph/tests/testthat/test_layout.kk.R.no-i686 igraph/tests/testthat/test_layout.kk.R ---- igraph/tests/testthat/test_layout.kk.R.no-i686 2022-09-02 14:40:38.026597550 -0400 -+++ igraph/tests/testthat/test_layout.kk.R 2022-09-02 14:41:40.896948288 -0400 -@@ -47,9 +47,6 @@ test_that("Kamada-Kawai layout generator - } else if (Sys.info()["sysname"] == "Linux" && - Sys.info()["machine"] == "x86_64") { - expect_that(sum(l), equals(-1.83036635516248)) -- } else if (Sys.info()["sysname"] == "Linux" && -- Sys.info()["machine"] == "i686") { -- expect_that(sum(l), equals(0.0631144692360025)) - } - - }) diff --git a/R-igraph.spec b/R-igraph.spec index 2e95e44..97a8872 100644 --- a/R-igraph.spec +++ b/R-igraph.spec @@ -14,18 +14,20 @@ Name: R-%{packname} Version: %{packver} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Network Analysis and Visualization # Main: GPLv2+; html_library.tcl: TCL -License: GPLv2+ and TCL +License: GPL-2.0-or-later AND TCL URL: https://CRAN.R-project.org/package=%{packname} Source0: https://cran.r-project.org/src/contrib/%{packname}_%{packver}.tar.gz # Unbundle some things: Patch0002: 0002-Unbundle-uuid.patch Patch0003: 0003-Unbundle-arpack.patch Patch0004: 0004-Increase-tolerances-to-work-on-all-arches.patch -Patch0005: R-igraph-disable-i686-test.patch + +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} # Here's the R view of the dependencies world: # Depends: R-methods @@ -143,6 +145,10 @@ _R_CHECK_FORCE_SUGGESTS_=0 %{_bindir}/R CMD check %{packname} $ARGS %changelog +* Sun Jan 22 2023 Elliott Sales de Andrade - 1.3.5-3 +- Drop support for i686 +- Switch to SPDX licenses + * Wed Jan 18 2023 Fedora Release Engineering - 1.3.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild