1
0
forked from pool/gap-digraphs

- Update to release 1.6.0

OBS-URL: https://build.opensuse.org/package/show/science/gap-digraphs?expand=0&rev=21
This commit is contained in:
Jan Engelhardt 2022-11-19 04:34:17 +00:00 committed by Git OBS Bridge
parent 44ab50256a
commit be609e1edf
6 changed files with 41 additions and 79 deletions

View File

@ -1,28 +0,0 @@
From 0ffdc3c3455a485768467a3f755ccaaa13f4f9b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Fri, 26 Jan 2018 19:14:51 +0100
Subject: [PATCH] Drop bad include of x86intrin.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Trying to include it does break compilation on anything but x86, and even
on x86 it is completely unnecessary, as builtins are "just there".
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
---
src/homos.h | 1 -
1 file changed, 1 deletion(-)
Index: digraphs-0.12.2/src/homos.h
===================================================================
--- digraphs-0.12.2.orig/src/homos.h
+++ digraphs-0.12.2/src/homos.h
@@ -14,7 +14,6 @@
#include <limits.h>
#include <setjmp.h>
-#include <x86intrin.h>
#include "bliss-0.73/bliss_C.h"
#include "src/schreier-sims.h"

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:53473fb0700bf071b2fa3627195b6f27116b7e9764d61d81f0b0215c89af9927
size 1727567

3
digraphs-1.6.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7a3a5a06ce64e4e36ded30d8a5372e19739a6547b8905f492eba990969ab646f
size 3620954

View File

@ -1,23 +0,0 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2017-12-23 10:46:26.870315439 +0100
build: drop host-specific compile flags
The system which built the program is not the same as to which runs it.
---
Makefile.am | 2 --
1 file changed, 2 deletions(-)
Index: digraphs-0.12.2/Makefile.am
===================================================================
--- digraphs-0.12.2.orig/Makefile.am
+++ digraphs-0.12.2/Makefile.am
@@ -19,8 +19,6 @@ digraphs_la_SOURCES += src/bliss-0.73/ti
digraphs_la_SOURCES += src/bliss-0.73/bliss_C.cc
digraphs_la_CPPFLAGS = $(GAP_CPPFLAGS)
-digraphs_la_CXXFLAGS = -O3 -march=native -mpopcnt
-digraphs_la_CFLAGS = -O3 -march=native -mpopcnt $(GAP_CFLAGS)
digraphs_la_LDFLAGS = $(GAP_LDFLAGS) -module -avoid-version
if SYS_IS_CYGWIN

View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Sat Nov 19 04:25:36 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
- Update to release 1.6.0
* The `ViewString` for immutable digraphs attempts to show more
of the known information about the digraph. This will break tests
that relied on the previous behaviour, that contained only the
numbers of vertices and edges.
* The behaviour of `QuotientDigraph` has been changed so that it
no longer returns digraphs with multiple edges.
* `IsEulerianDigraph` would previously return `true` for digraphs
that are Eulerian when their isolated vertices were removed,
which contradicted the documentation. `IsEulerianDigraph` now
returns `false` for _all_ digraphs that are not strongly
connected.
- Delete 0001-Drop-bad-include-of-x86intrin.h.patch,
digraphs-no-native.diff
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 14 21:52:19 UTC 2018 - Jan Engelhardt <jengelh@inai.de> Wed Nov 14 21:52:19 UTC 2018 - Jan Engelhardt <jengelh@inai.de>

View File

@ -1,7 +1,7 @@
# #
# spec file for package gap-digraphs # spec file for package gap-digraphs
# #
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2022 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,30 +17,26 @@
Name: gap-digraphs Name: gap-digraphs
Version: 0.13.0 Version: 1.6.0
Release: 0 Release: 0
Summary: GAP: Digraphs and multigraphs Summary: GAP: Digraphs and multigraphs
License: GPL-3.0-or-later License: GPL-3.0-or-later
Group: Productivity/Scientific/Math Group: Productivity/Scientific/Math
Url: http://www-groups.mcs.st-andrews.ac.uk/~jamesm/digraphs.php URL: https://digraphs.github.io/Digraphs/
#Git-Clone: https://github.com/digraphs/Digraphs
Source: https://www.gap-system.org/pub/gap/gap4/tar.bz2/packages/digraphs-%version.tar.bz2 Source: https://github.com/digraphs/Digraphs/releases/download/v%version/digraphs-%version.tar.gz
Patch1: digraphs-no-native.diff BuildRequires: edge-addition-planarity-suite-devel
Patch2: 0001-Drop-bad-include-of-x86intrin.h.patch
BuildRequires: automake
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gap-devel BuildRequires: gap-devel
BuildRequires: gap-rpm-devel BuildRequires: gap-rpm-devel
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: gmp-devel BuildRequires: gmp-devel
BuildRequires: libtool Requires: gap-core >= 4.10
BuildRequires: xz Requires: gap-datastructures >= 0.2.5
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: gap-core >= 4.9.0
Requires: gap-io >= 4.5.1 Requires: gap-io >= 4.5.1
Requires: gap-orb >= 4.7.5 Requires: gap-orb >= 4.8.2
Suggests: gap-gapdoc >= 1.5.1 Suggests: gap-gapdoc >= 1.6.3
Suggests: gap-grape >= 4.5 Suggests: gap-grape >= 4.8.1
Suggests: gap-nautytracesinterface >= 0.2 Suggests: gap-nautytracesinterface >= 0.2
# Source contains a modified copy of bliss-0.73, so we cannot reuse bliss-devel # Source contains a modified copy of bliss-0.73, so we cannot reuse bliss-devel
Provides: bundled(bliss) = 0.73 Provides: bundled(bliss) = 0.73
@ -50,27 +46,26 @@ The Digraphs package is a GAP package containing methods for digraphs
and multidigraphs. and multidigraphs.
%prep %prep
%setup -qn digraphs-%version %autosetup -n digraphs-%version
%patch -P 1 -P 2 -p1
%build %build
autoreconf -fi %configure --with-gaproot="%gapdir" --without-intrinsics \
%configure --with-gaproot="%gapdir" --with-external-planarity
make %{?_smp_mflags} %make_build
find . -type f -name "*~" -delete find . -type f -name "*~" -print -delete
%install %install
%gappkg_simple_install
pushd "%buildroot/$fmoddir/"
find . -type f -name .dirstamp -print -delete find . -type f -name .dirstamp -print -delete
# delete tests and assets # delete tests and assets
rm -Rf tst data/symmetric-closure.ds6.gz data/test-1.d6 rm -Rf tst data/symmetric-closure.ds6.gz data/test-1.d6
# delete sources and build artifacts, user is not expected to rebuild in distribution tree # delete sources and build artifacts, user is not expected to rebuild in distribution tree
rm -Rf autom4te.cache src cnf config* m4 autogen.sh aclocal.m4 *.la Makefile* rm -Rf autom4te.cache src cnf config* m4 autogen.sh aclocal.m4 *.la Makefile*
rm -Rf extern/edge* extern/bliss*/[a-z]* extern/bliss*/.deps extern/bliss*/.libs extern/bliss*/.clang*
%gappkg_simple_install popd
%fdupes %buildroot/%_prefix %fdupes %buildroot/%_prefix
find %buildroot
%files -f %name.files %files -f %name.files
%defattr(-,root,root)
%changelog %changelog