Version 4.13.0
- Change from %bcond_with to %bcond - Drop unused ATLAS data source - Switch from ExclusiveArch to ExcludeArch
This commit is contained in:
Jerry James
parent
1d80efbc6e
commit
91c86d4c84
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/gap*.tar.bz2
|
||||
/gap*.tar.gz
|
||||
/gap-testdata.tar.xz
|
||||
/gapicon.bmp
|
||||
|
||||
68
gap.spec
68
gap.spec
@ -1,6 +1,3 @@
|
||||
# The module loader does not work with PIE
|
||||
%undefine _hardened_build
|
||||
|
||||
%global gaparchdir %{_libdir}/gap
|
||||
%global gaplibdir %{_datadir}/gap
|
||||
%global icondir %{_datadir}/icons/hicolor
|
||||
@ -11,7 +8,7 @@
|
||||
%else
|
||||
%global gapcpu %{_build}
|
||||
%endif
|
||||
%global gaparch %{gapcpu}-%{gapbits}-kv8
|
||||
%global gaparch %{gapcpu}-%{gapbits}-kv9
|
||||
|
||||
# Files installed in nearly every package by GAPDoc
|
||||
%global GAPDoc_files chooser.html lefttoc.css manual.css manual.js nocolorprompt.css ragged.css rainbow.js times.css toggless.css toggless.js
|
||||
@ -21,17 +18,17 @@
|
||||
# refuses to run unless all four are present. Therefore, build as follows:
|
||||
# 1. Build this package in bootstrap mode.
|
||||
# 2. Build GAPDoc in bootstrap mode.
|
||||
# 3. Build gap-pkg-transgrp.
|
||||
# 4. Build gap-pkg-autodoc in bootstrap mode.
|
||||
# 5. Build gap-pkg-io
|
||||
# 6. Build GAPDoc in non-bootstrap mode.
|
||||
# 7. Build gap-pkg-autodoc in non-bootstrap mode.
|
||||
# 8. Build gap-pkg-primgrp and gap-pkg-smallgrp.
|
||||
# 3. Build gap-pkg-autodoc in bootstrap mode.
|
||||
# 4. Build gap-pkg-io
|
||||
# 5. Build GAPDoc in non-bootstrap mode.
|
||||
# 6. Build gap-pkg-autodoc in non-bootstrap mode.
|
||||
# 7. Build gap-pkg-primgrp and gap-pkg-smallgrp.
|
||||
# 8. Build gap-pkg-transgrp.
|
||||
# 9. Build this package in non-bootstrap mode.
|
||||
%bcond_with bootstrap
|
||||
%bcond bootstrap 0
|
||||
|
||||
Name: gap
|
||||
Version: 4.12.2
|
||||
Version: 4.13.0
|
||||
Release: %autorelease
|
||||
Summary: Computational discrete algebra
|
||||
|
||||
@ -39,7 +36,8 @@ Summary: Computational discrete algebra
|
||||
|
||||
License: GPL-2.0-or-later
|
||||
URL: https://www.gap-system.org/
|
||||
Source0: https://github.com/gap-system/gap/releases/download/v%{version}/%{name}-%{version}.tar.gz
|
||||
VCS: https://github.com/gap-system/gap
|
||||
Source0: %{vcs}/releases/download/v%{version}/%{name}-%{version}.tar.gz
|
||||
Source1: gap-README.fedora
|
||||
Source2: update-gap-workspace
|
||||
Source3: gap.xml
|
||||
@ -49,15 +47,15 @@ Source6: gap.1.in
|
||||
Source7: gac.1.in
|
||||
Source8: update-gap-workspace.1
|
||||
Source9: gap.vim
|
||||
# ATLAS data used during the tests
|
||||
Source10: gap-testdata.tar.xz
|
||||
Source10: gapicon.bmp
|
||||
# This patch applies a change from Debian to allow help files to be in gzip
|
||||
# compressed DVI files, and also adds support for viewing with xdg-open.
|
||||
Patch0: %{name}-help.patch
|
||||
# Avoid the popcount instruction on systems that do not support it
|
||||
Patch1: %{name}-popcount.patch
|
||||
|
||||
ExclusiveArch: %{gap_arches}
|
||||
# See https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
|
||||
ExcludeArch: %{ix86}
|
||||
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: gcc-c++
|
||||
@ -203,23 +201,15 @@ Library containing core GAP logic
|
||||
# Get the README
|
||||
cp -p %{SOURCE1} README.fedora
|
||||
|
||||
# Compile default package path into the executable
|
||||
sed 's,^GAP_CPPFLAGS =,& -DSYS_DEFAULT_PATHS="\\"%{gaplibdir}:%{gaparchdir}\\"",' \
|
||||
-i Makefile.rules
|
||||
# Avoid unnecessary rpaths
|
||||
sed -i '/LINK/s/ -Wl,-rpath,\$(libdir)//' Makefile.rules
|
||||
|
||||
%build
|
||||
# -Wl,-z,now breaks use of RTLD_LAZY
|
||||
# Even though the GAP kernel is single-threaded, it must be linked with pthreads
|
||||
# or packages cannot successfully load and run multithreaded shared objects.
|
||||
export LDFLAGS="-lpthread -Wl,-z,relro -Wl,--as-needed"
|
||||
export LDFLAGS='%{build_ldflags} -Wl,-z,lazy'
|
||||
export STRIP=%{_bindir}/true
|
||||
export LC_ALL=C.UTF-8
|
||||
%configure
|
||||
|
||||
# Get rid of undesirable hardcoded rpaths
|
||||
sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
|
||||
-e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
|
||||
-i libtool
|
||||
%configure --disable-maintainer-mode
|
||||
|
||||
%make_build V=1
|
||||
|
||||
@ -234,13 +224,10 @@ pdftex gapmacrodoc.tex
|
||||
cd -
|
||||
|
||||
# Remove build paths
|
||||
#sed -i "s|$PWD|%%{gapdir}|g" sysinfo.gap bin/gap.sh gac doc/make_doc
|
||||
sed -i "s|$PWD|%{gapdir}|g" sysinfo.gap gac doc/make_doc
|
||||
|
||||
# Don't link every package shared object with libpthread
|
||||
sed -i "s/[[:blank:]]*-lpthread[[:blank:]]*//" sysinfo.gap
|
||||
|
||||
# Fix mangled paths in gap.sh
|
||||
sed -i "s|^\(GAP_EXE=\).*|\1%{_bindir}|;/ GAP_EXE=/d" bin/gap.sh
|
||||
sed -i "s/[[:blank:]]*-pthread[[:blank:]]*//" sysinfo.gap
|
||||
|
||||
# Create an RPM macro file for GAP packages
|
||||
cat > macros.%{name} << EOF
|
||||
@ -288,7 +275,6 @@ rm %{buildroot}%{gaparchdir}/gap
|
||||
ln %{buildroot}%{_bindir}/gap %{buildroot}%{gaparchdir}/gap
|
||||
|
||||
# Remove files we do not want or install elsewhere
|
||||
rm %{buildroot}%{_libdir}/*.la
|
||||
rm %{buildroot}%{gaplibdir}/{*.md,COPYRIGHT,LICENSE}
|
||||
rm -fr %{buildroot}%{gaplibdir}/etc/vim
|
||||
|
||||
@ -323,7 +309,7 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}
|
||||
touch %{buildroot}%{_localstatedir}/lib/%{name}/workspace.gz
|
||||
|
||||
# Install the icon; the original is 1024x1024
|
||||
bmptopnm cnf/cygwin/gapicon.bmp > gapicon.pnm
|
||||
bmptopnm %{SOURCE10} > gapicon.pnm
|
||||
for size in 16 22 24 32 36 48 64 72 96 128 192 256 512; do
|
||||
mkdir -p %{buildroot}%{icondir}/${size}x${size}/apps
|
||||
pamscale -xsize=$size -ysize=$size gapicon.pnm | pnmtopng -compression=9 \
|
||||
@ -369,14 +355,6 @@ fi
|
||||
%if %{without bootstrap}
|
||||
%check
|
||||
export LC_ALL=C.UTF-8
|
||||
sed -e "s|GAP_DIR=.*|GAP_DIR=$PWD|" \
|
||||
-e "s|GAP_EXE=.*|GAP_EXE=$PWD|" \
|
||||
-i bin/gap.sh
|
||||
sed -i "s|80 -r|& -l $PWD|" Makefile.rules
|
||||
|
||||
# Unpack the test data
|
||||
tar -C pkg -xf %{SOURCE10}
|
||||
|
||||
make check
|
||||
%endif
|
||||
|
||||
@ -439,9 +417,9 @@ make check
|
||||
%{_datadir}/vim/vimfiles/syntax/gap.vim
|
||||
|
||||
%files -n libgap
|
||||
%{_libdir}/libgap.so.8
|
||||
%{_libdir}/libgap.so.8.*
|
||||
%{_libdir}/libgap.so.9
|
||||
%{_libdir}/libgap.so
|
||||
%{_libdir}/pkgconfig/libgap.pc
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
|
||||
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (gap-4.12.2.tar.gz) = 10d89c53152557cefd4b47fff5a17ebc04bf82bc21f667bf3d09d5e481fa096254e85181ee8b208011a89b18acfcc45672b86049db218f2dc7c9129b5dbcba8f
|
||||
SHA512 (gap-testdata.tar.xz) = 06ab8c17a84a8de4834b8d10eb794fd3bb6a5be3416f410e63bab315a12199ded3e2d83d048db1737a0574a2fa87f2f1b76cb4e7c1b431fd0bea46a523acd3d7
|
||||
SHA512 (gap-4.13.0.tar.gz) = b2c47184ba6ff66ab273f9244ba6cbcf9306e692898381eb16a888d6a43b0538fe936071952b44e6a1e7780eaa5d6083e92bb064886956fa712cf99fbc0dcc85
|
||||
SHA512 (gapicon.bmp) = 170760ba7c945d91e9e2685da83d53c43fa2cd343bf803ed2efef714cf0db65c91821bf2b7558b163d223e4908b145178e46beb1cc261cbb39466bd2b8d532ea
|
||||
|
||||
Loading…
Reference in New Issue
Block a user