1
0
forked from pool/gap-digraphs
Jan Engelhardt 2018-11-22 12:11:09 +00:00 committed by Git OBS Bridge
parent 636d64a119
commit 44ab50256a
6 changed files with 143 additions and 10 deletions

View File

@ -0,0 +1,28 @@
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:a1aece37af0ef4af8d3dd319f82b5b64966c665fc8c0db094e19467154ec6561
size 1649172

3
digraphs-0.13.0.tar.bz2 Normal file
View File

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

23
digraphs-no-native.diff Normal file
View File

@ -0,0 +1,23 @@
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,71 @@
-------------------------------------------------------------------
Wed Nov 14 21:52:19 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
- Update to new upstream release 0.13
* The GraphViz engine used by `Splash` is now configurable
* The properties `IsPartialOrderDigraph`, `IsPreorderDigraph`,
and IsQuasiorderDigraph` were introduced, along with the
following functions for visualising these kinds of digraphs:
`DotPartialOrderDigraph`, `DotPreorderDigraph`,
`DotQuasiorderDigraph`.
* The following functions for transformations and permutations
were added `IsDigraphHomomorphism`, `IsDigraphEpimorphism`,
`IsDigraphMonomorphism`, `IsDigraphEndomorphism`,
`IsDigraphEmbedding`, `IsDigraphIsomorphism`.
-------------------------------------------------------------------
Fri Oct 19 10:39:54 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
- Update to new upstream release 0.12
* Fixed a bug in `ArticulationPoints` and `IsBiconnectedDigraph`.
* Added the property `IsChainDigraph`.
* Added the operation `IsDigraphAutomorphism`.
* Fixed: `HomomorphismDigraphFinder` sometimes failed to find a
homomorphism when one existsed.
* Fixed: A segmentation fault could be caused when using Digraphs
with NautyTracesInterface, in certain cases.
-------------------------------------------------------------------
Fri Jan 26 19:47:36 UTC 2018 - stefan.bruens@rwth-aachen.de
- Remove all transient build artifacts (e.g. config.log) to make
build reproducible
- delete remaining sources and test assets
-------------------------------------------------------------------
Fri Jan 26 18:15:27 UTC 2018 - stefan.bruens@rwth-aachen.de
- Add 0001-Drop-bad-include-of-x86intrin.h.patch
Remove unnecessary include of x86intrin.h, breaks compilation on
anything but x86.
-------------------------------------------------------------------
Fri Jan 26 14:40:18 UTC 2018 - guillaume@opensuse.org
- Add ExclusiveArch for x86 and x86_64 since it needs 'x86intrin.h'
-------------------------------------------------------------------
Sat Dec 23 09:42:01 UTC 2017 - jengelh@inai.de
- Update to new upstream release 0.11.0
* Support for computing automorphisms, canonical labellings,
and isomorphisms of digraphs with "nauty". This functionality
requires the gap-nautytracesinterface package for GAP.
However, this is not a required package, and the default
engine remains "bliss". It is possible to specify the engine
that is used by Digraphs.
* In particular, version 0.11.0 includes the following changes:
* `BlissAutomorphismGroup` and `NautyAutomorphismGroup` are
introduced.
* `DigraphCanonicalLabelling` is replaced by
`BlissCanonicalLabelling` and `NautyCanonicalLabelling`.
* `BlissCanonicalDigraph` and `NautyCanonicalDigraph` are
introduced
* `DigraphsUseNauty` and `DigraphsUseBliss` are introduced.
* The property `IsHamiltonianDigraph` and the attribute
`HamiltonianPath` were added.
- Add digraphs-no-native.diff
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 8 16:51:28 UTC 2017 - jengelh@inai.de Fri Sep 8 16:51:28 UTC 2017 - jengelh@inai.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package gap-digraphs # spec file for package gap-digraphs
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# 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
@ -12,31 +12,38 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
Name: gap-digraphs Name: gap-digraphs
Version: 0.10.1 Version: 0.13.0
Release: 0 Release: 0
Summary: GAP: Digraphs and multigraphs Summary: GAP: Digraphs and multigraphs
License: GPL-3.0+ 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: http://www-groups.mcs.st-andrews.ac.uk/~jamesm/digraphs.php
Source: https://www.gap-system.org/pub/gap/gap4/tar.bz2/packages/digraphs-%version.tar.bz2 Source: https://www.gap-system.org/pub/gap/gap4/tar.bz2/packages/digraphs-%version.tar.bz2
Patch1: digraphs-no-native.diff
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
BuildRequires: xz BuildRequires: xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: gap-core >= 4.8.2 Requires: gap-core >= 4.9.0
Requires: gap-io >= 4.4.4 Requires: gap-io >= 4.5.1
Requires: gap-orb >= 4.7.5 Requires: gap-orb >= 4.7.5
Suggests: gap-gapdoc >= 1.5.1 Suggests: gap-gapdoc >= 1.5.1
Suggests: gap-grape >= 4.5 Suggests: gap-grape >= 4.5
Suggests: gap-nautytracesinterface >= 0.2
# Source contains a modified copy of bliss-0.73, so we cannot reuse bliss-devel
Provides: bundled(bliss) = 0.73
%description %description
The Digraphs package is a GAP package containing methods for digraphs The Digraphs package is a GAP package containing methods for digraphs
@ -44,14 +51,21 @@ and multidigraphs.
%prep %prep
%setup -qn digraphs-%version %setup -qn digraphs-%version
%patch -P 1 -P 2 -p1
%build %build
autoreconf -fi
%configure --with-gaproot="%gapdir" %configure --with-gaproot="%gapdir"
make %{?_smp_mflags} make %{?_smp_mflags}
find . -type f -name "*~" -delete
%install %install
find . -type f -name .dirstamp -print -delete find . -type f -name .dirstamp -print -delete
rm -Rf autom4te.cache src m4 tst # delete tests and assets
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
rm -Rf autom4te.cache src cnf config* m4 autogen.sh aclocal.m4 *.la Makefile*
%gappkg_simple_install %gappkg_simple_install
%fdupes %buildroot/%_prefix %fdupes %buildroot/%_prefix
find %buildroot find %buildroot