diff --git a/gap-orb.changes b/gap-orb.changes index adfbfed..675f4d5 100644 --- a/gap-orb.changes +++ b/gap-orb.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Fri Dec 12 12:40:25 UTC 2014 - jengelh@inai.de + +- Update to new upstream release 4.7.3 +* Use hash functions for transformations and partial permutations + provided by newer GAP versions instead of our own. This way, if + the internal representation for these objects changes (as has + recently happened), we stay compatible (see issue #3). +* Fix bug were orb logs were not properly updated if the + enumeration stopped early (see issues #4 and #5). +* Fix bug caused by orbits with seeds (see issue #5). +* Fix error in Memory() method for orbit-by-suborbit setup objects. +* Fix a missing variable initialization, which could cause + Enumerate (and hence anything using it, such as + FindShortGeneratorsOfSubgroup) to run into an error. +- Remove orb-install.diff (fixed upstream) + ------------------------------------------------------------------- Fri May 10 13:47:02 UTC 2013 - jengelh@inai.de diff --git a/gap-orb.spec b/gap-orb.spec index 91678b6..2d49e87 100644 --- a/gap-orb.spec +++ b/gap-orb.spec @@ -18,14 +18,13 @@ Name: gap-orb Summary: GAP: Methods to enumerate Orbits -Version: 4.6 +Version: 4.7.3 Release: 0 License: GPL-3.0+ Group: Productivity/Scientific/Math URL: http://www-groups.mcs.st-and.ac.uk/~neunhoef/Computer/Software/Gap/orb.html Source: ftp://ftp.gap-system.org/pub/gap/gap4/tar.bz2/packages/orb-%version.tar.bz2 -Patch1: orb-install.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -41,8 +40,7 @@ Suggests: gap-io >= 3.3 The orb package is about enumerating orbits in various ways. %prep -%setup -qn orb -%patch -P 1 -p1 +%setup -qn orb-%version %build autoreconf -fi diff --git a/orb-4.6.tar.bz2 b/orb-4.6.tar.bz2 deleted file mode 100644 index 8ef9b9e..0000000 --- a/orb-4.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7e49e3a9c04dc37b9d2dc5e2c3fca46b603fdcfbd74ab951ae5897739cafca6c -size 1147512 diff --git a/orb-4.7.3.tar.bz2 b/orb-4.7.3.tar.bz2 new file mode 100644 index 0000000..b210615 --- /dev/null +++ b/orb-4.7.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:59de34714ac669271b31d7063a90a4a1e00956d0b811162ca0549cdf59d9b91f +size 1094759 diff --git a/orb-install.diff b/orb-install.diff deleted file mode 100644 index 0f754a2..0000000 --- a/orb-install.diff +++ /dev/null @@ -1,45 +0,0 @@ -From: Jan Engelhardt -Date: 2013-05-21 01:17:13.304398613 +0200 - -build: unbreak DESTDIR support -(3rd package in GAP) - -+ make -j10 DESTDIR=/home/abuild/rpmbuild/BUILDROOT/gap-orb-4.6-0.x86_64 -make[1]: Entering directory `/home/abuild/rpmbuild/BUILD/orb' -/bin/sh ./libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I./src -I/usr/lib/gap -I/usr/lib/gap/bin/x86_64-suse-linux-gnu-gcc-default64 -DCONFIG_H -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -c -o orb_la-orb.lo `test -f 'src/orb.c' || echo './'`src/orb.c -libtool: compile: gcc -DHAVE_CONFIG_H -I. -I./src -I/usr/lib/gap -I/usr/lib/gap/bin/x86_64-suse-linux-gnu-gcc-default64 -DCONFIG_H -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -c src/orb.c -fPIC -DPIC -o .libs/orb_la-orb.o -/bin/sh ./libtool --tag=CC --mode=link gcc -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -module -avoid-version -o orb.la -rpath /usr/lib64 orb_la-orb.lo -libtool: link: gcc -shared -fPIC -DPIC .libs/orb_la-orb.o -O2 -Wl,-soname -Wl,orb.so -o .libs/orb.so -libtool: link: ( cd ".libs" && rm -f "orb.la" && ln -s "../orb.la" "orb.la" ) -test -z "/usr/lib64" || /usr/bin/mkdir -p "/home/abuild/rpmbuild/BUILDROOT/gap-orb-4.6-0.x86_64/usr/lib64" - /bin/sh ./libtool --mode=install /usr/bin/install -c orb.la '/home/abuild/rpmbuild/BUILDROOT/gap-orb-4.6-0.x86_64/usr/lib64' -libtool: install: /usr/bin/install -c .libs/orb.so /home/abuild/rpmbuild/BUILDROOT/gap-orb-4.6-0.x86_64/usr/lib64/orb.so -libtool: install: /usr/bin/install -c .libs/orb.lai /home/abuild/rpmbuild/BUILDROOT/gap-orb-4.6-0.x86_64/usr/lib64/orb.la -libtool: install: warning: remember to run `libtool --finish /usr/lib64' -/usr/bin/mkdir -p ./bin/x86_64-suse-linux-gnu-gcc-default64 -cp /usr/lib64/orb.so /home/abuild/rpmbuild/BUILD/orb/bin/x86_64-suse-linux-gnu-gcc-default64/orb.so -cp: cannot stat '/usr/lib64/orb.so': No such file or directory -make[1]: *** [all-local] Error 1 - ---- - Makefile.am | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -Index: orb/Makefile.am -=================================================================== ---- orb.orig/Makefile.am -+++ orb/Makefile.am -@@ -19,10 +19,11 @@ all-local: orb.la install-libLTLIBRARIES - # @$(MAKE) $(AM_MAKEFLAGS) install-libLTLIBRARIES - $(mkdir_p) $(top_srcdir)/$(BINARCHDIR) - if SYS_IS_CYGWIN -- cp $(libdir)/orb.dll $(GAPINSTALLLIB) -+ mv $(DESTDIR)$(libdir)/orb.dll $(GAPINSTALLLIB) - else -- cp $(libdir)/orb.so $(GAPINSTALLLIB) -+ mv $(DESTDIR)$(libdir)/orb.so $(GAPINSTALLLIB) - endif -+ rm -f $(DESTDIR)$(libdir)/orb.la - @echo "SUCCESS!" - - distclean-local: