diff --git a/gap-pkg-nautytracesinterface-nauty.patch b/gap-pkg-nautytracesinterface-nauty.patch index bf82998..3b6f82d 100644 --- a/gap-pkg-nautytracesinterface-nauty.patch +++ b/gap-pkg-nautytracesinterface-nauty.patch @@ -1,6 +1,6 @@ ---- Makefile.am.orig 2017-11-20 12:16:23.000000000 -0700 -+++ Makefile.am 2017-11-26 22:05:08.391946010 -0700 -@@ -9,22 +9,22 @@ ACLOCAL_AMFLAGS = -I m4 +--- Makefile.am.orig 2018-11-27 05:02:24.000000000 -0700 ++++ Makefile.am 2019-01-26 22:18:46.042437354 -0700 +@@ -9,30 +9,24 @@ ACLOCAL_AMFLAGS = -I m4 BINARCHDIR = bin/$(GAPARCH) GAPINSTALLLIB = $(abs_top_srcdir)/$(BINARCHDIR)/NautyTracesInterface.so @@ -8,12 +8,23 @@ +lib_LTLIBRARIES = libNautyTracesInterface.la -NautyTracesInterface_la_SOURCES = src/NautyTracesInterface.c --NautyTracesInterface_la_CPPFLAGS = $(GAP_CPPFLAGS) $(NAUTY_CPPFLAGS) -DCONFIG_H +-NautyTracesInterface_la_CPPFLAGS = $(GAP_CPPFLAGS) $(NAUTY_CPPFLAGS) +-NautyTracesInterface_la_CPLAGS = $(GAP_CFLAGS) +-NautyTracesInterface_la_LDFLAGS = $(GAP_LDFLAGS) +-NautyTracesInterface_la_LDFLAGS += $(NAUTY_PATH)/nauty.o +-NautyTracesInterface_la_LDFLAGS += $(NAUTY_PATH)/nautil.o +-NautyTracesInterface_la_LDFLAGS += $(NAUTY_PATH)/naugraph.o +-NautyTracesInterface_la_LDFLAGS += $(NAUTY_PATH)/schreier.o +-NautyTracesInterface_la_LDFLAGS += $(NAUTY_PATH)/naurng.o +-NautyTracesInterface_la_LDFLAGS += $(NAUTY_PATH)/naugroup.o +-NautyTracesInterface_la_LDFLAGS += $(NAUTY_PATH)/nautinv.o +-NautyTracesInterface_la_LDFLAGS += -module -avoid-version +libNautyTracesInterface_la_SOURCES = src/NautyTracesInterface.c -+libNautyTracesInterface_la_CPPFLAGS = $(GAP_CPPFLAGS) $(NAUTY_CPPFLAGS) -DCONFIG_H - # Note that the latter is only for GAP 4.4.12 --NautyTracesInterface_la_LDFLAGS = $(NAUTY_PATH)/nauty.o $(NAUTY_PATH)/nautil.o $(NAUTY_PATH)/naugraph.o $(NAUTY_PATH)/schreier.o $(NAUTY_PATH)/naurng.o $(NAUTY_PATH)/naugroup.o $(NAUTY_PATH)/nautinv.o -module -avoid-version -+libNautyTracesInterface_la_LDFLAGS = -lnauty -no-undefined -version-info 0:0:0 ++libNautyTracesInterface_la_CPPFLAGS = $(GAP_CPPFLAGS) $(NAUTY_CPPFLAGS) ++libNautyTracesInterface_la_CPLAGS = $(GAP_CFLAGS) ++libNautyTracesInterface_la_LDFLAGS = $(GAP_LDFLAGS) ++libNautyTracesInterface_la_LDFLAGS += -lnauty ++libNautyTracesInterface_la_LDFLAGS += -module -avoid-version if SYS_IS_CYGWIN -NautyTracesInterface_la_LDFLAGS += -no-undefined -version-info 0:0:0 -Wl,$(GAPROOT)/bin/$(GAPARCH)/gap.dll +libNautyTracesInterface_la_LDFLAGS += -no-undefined -version-info 0:0:0 -Wl,$(GAPROOT)/bin/$(GAPARCH)/gap.dll @@ -23,10 +34,11 @@ +all-local: libNautyTracesInterface.la $(mkdir_p) $(top_srcdir)/$(BINARCHDIR) if SYS_IS_CYGWIN - cp .libs/NautyTracesInterface.dll $(GAPINSTALLLIB) +- cp .libs/NautyTracesInterface.dll $(GAPINSTALLLIB) ++ cp .libs/libNautyTracesInterface.dll $(GAPINSTALLLIB) else - cp .libs/NautyTracesInterface.so $(GAPINSTALLLIB) -+ cp -p .libs/libNautyTracesInterface.so $(GAPINSTALLLIB) ++ cp .libs/libNautyTracesInterface.so $(GAPINSTALLLIB) endif @echo "SUCCESS!" diff --git a/gap-pkg-nautytracesinterface-test.patch b/gap-pkg-nautytracesinterface-test.patch new file mode 100644 index 0000000..78f1af1 --- /dev/null +++ b/gap-pkg-nautytracesinterface-test.patch @@ -0,0 +1,9 @@ +--- tst/testall.g.orig 2018-11-27 05:02:24.000000000 -0700 ++++ tst/testall.g 2019-02-01 13:34:20.285831316 -0700 +@@ -29,5 +29,6 @@ for test in tests do + Print("Test '",test,"' succeeded\n"); + else + Print("Test '",test,"' failed\n"); ++ GAP_EXIT_CODE(1); + fi; + od; diff --git a/gap-pkg-nautytracesinterface.spec b/gap-pkg-nautytracesinterface.spec index 97a9bc7..fc37782 100644 --- a/gap-pkg-nautytracesinterface.spec +++ b/gap-pkg-nautytracesinterface.spec @@ -1,13 +1,13 @@ # There have been no official releases yet, so we pull from git -%global gitdate 20180710 -%global gittag c037e1a013a794d475a6cfc567715cf0d0ff7fc4 +%global gitdate 20181127 +%global gittag 6497df82e644a7711bc7bef2300e692cec59dcd4 %global shorttag %(cut -b -7 <<< %{gittag}) %global user sebasguts %global pkgname nautytracesinterface Name: gap-pkg-%{pkgname} Version: 0.2 -Release: 6.%{gitdate}git%{shorttag}%{?dist} +Release: 7.%{gitdate}git%{shorttag}%{?dist} Summary: GAP interface to nauty and Traces License: GPLv2+ @@ -15,6 +15,8 @@ URL: https://github.com/sebasguts/NautyTracesInterface Source0: https://github.com/%{user}/NautyTracesInterface/tarball/%{gittag}/%{user}-%{pkgname}-%{shorttag}.tar.gz # Fedora-only patch: use the system nauty library Patch0: %{name}-nauty.patch +# Make the test run exit with a nonzero exit code if any tests fail +Patch1: %{name}-test.patch BuildRequires: gap-devel BuildRequires: gap-pkg-autodoc @@ -22,11 +24,20 @@ BuildRequires: gcc-c++ BuildRequires: libnauty-devel BuildRequires: libtool -Requires: gap-core +Requires: gap-core%{?_isa} %description This GAP package provides an interface to nauty and Traces. +%package doc +Summary: NautyTracesInterface documentation +BuildArch: noarch +Requires: %{name} = %{version}-%{release} +Requires: gap-online-help + +%description doc +This package contains documentation for gap-pkg-%{pkgname}. + %prep %autosetup -p0 -n %{user}-NautyTracesInterface-%{shorttag} @@ -53,17 +64,24 @@ mkdir -p %{buildroot}%{_gap_dir}/pkg/%{pkgname} cp -a bin examples gap tst VERSION *.g %{buildroot}%{_gap_dir}/pkg/%{pkgname} %check -gap -l "%{buildroot}%{_gap_dir};%{_gap_dir}" < tst/testall.g 2>&1 | tee log -grep -Fvq fail log -rm -f log +gap -l "%{buildroot}%{_gap_dir};%{_gap_dir}" < tst/testall.g %files %doc README %license COPYING -%docdir %{_gap_dir}/pkg/%{pkgname}/examples %{_gap_dir}/pkg/%{pkgname}/ +%exclude %{_gap_dir}/pkg/%{pkgname}/examples/ + +%files doc +%docdir %{_gap_dir}/pkg/%{pkgname}/examples/ +%{_gap_dir}/pkg/%{pkgname}/examples/ %changelog +* Fri Feb 1 2019 Jerry James - 0.2-7.20181127git6497df8 +- Update to latest git snapshot for gap 4.10.0 +- Add -test patch +- Add -doc subpackage + * Thu Jan 31 2019 Fedora Release Engineering - 0.2-6.20180710gitc037e1a - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 50b905f..6ae5dfb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sebasguts-nautytracesinterface-c037e1a.tar.gz) = a50c27c4b1c1939d9d13326132ea7981a55fb6539128674b3fbee156568445e62a233690dbb02a8382a823045b4b2540cf30e7d7da73347468055c83f67899bf +SHA512 (sebasguts-nautytracesinterface-6497df8.tar.gz) = ad9d5c69074436ff1df5ae47adfa5b7fff689a70bf7e1d606fbc50f6226c583d919a93501aeb28ab669d4753ac99bf96325ba094add02d5d17b49bd5fc8781e2