Compare commits
1 commit
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
322d945d9a |
1 changed files with 31 additions and 4 deletions
|
|
@ -35,7 +35,7 @@
|
|||
Summary: System for algebraic geometry and commutative algebra
|
||||
Name: Macaulay2
|
||||
Version: 1.9.2
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
|
||||
License: GPLv2 or GPLv3
|
||||
URL: http://macaulay2.com/
|
||||
|
|
@ -279,8 +279,8 @@ sed -i 's/\(libm[[:alpha:]]*\)\.a/\1.so/' Macaulay2/bin/Makefile.in
|
|||
%patch7 -p1 -b .mpir
|
||||
%endif
|
||||
# factory-gftables symlink
|
||||
mkdir -p BUILD/%{_target_platform}/usr-dist/common/share/Macaulay2/Core/factory
|
||||
ln -s %{_datadir}/factory/gftables \
|
||||
mkdir -p BUILD/%{_target_platform}/usr-dist/common/share/Macaulay2/Core
|
||||
ln -s %{_datadir}/factory \
|
||||
BUILD/%{_target_platform}/usr-dist/common/share/Macaulay2/Core/factory
|
||||
%patch8 -p1 -b .gtest
|
||||
%patch9 -p1 -b .givaro
|
||||
|
|
@ -358,6 +358,11 @@ find BUILD/%{_target_platform}/ -name *.errors -execdir echo {} \; -execdir cat
|
|||
%install
|
||||
make install -C BUILD/%{_target_platform} DESTDIR=%{buildroot} IgnoreExampleErrors=true
|
||||
|
||||
# link, don't copy, the normaliz binary
|
||||
normaliz_bin=$(ls -1 %{buildroot}%{_libexecdir}/Macaulay2/*Linux*/normaliz)
|
||||
rm -f $normaliz_bin
|
||||
ln -s %{_bindir}/normaliz $normaliz_bin
|
||||
|
||||
# app img
|
||||
install -p -m644 -D %{SOURCE10} \
|
||||
%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/Macaulay2.png
|
||||
|
|
@ -395,6 +400,24 @@ LDFLAGS="$RPM_LD_FLAGS" \
|
|||
time make -k check -C BUILD/%{_target_platform} Verbose=true ||:
|
||||
|
||||
|
||||
# This script deals with accidental replacement of the factory symlink with
|
||||
# a directory. Once F26 has reached EOL, this can be removed.
|
||||
%pretrans -p <lua>
|
||||
path = "%{_datadir}/Macaulay2/Core/factory"
|
||||
st = posix.stat(path)
|
||||
if st and st.type == "directory" then
|
||||
status = os.rename(path, path .. ".rpmmoved")
|
||||
if not status then
|
||||
suffix = 0
|
||||
while not status do
|
||||
suffix = suffix + 1
|
||||
status = os.rename(path .. ".rpmmoved", path .. ".rpmmoved." .. suffix)
|
||||
end
|
||||
os.rename(path, path .. ".rpmmoved")
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
%post
|
||||
touch --no-create %{_datadir}/icons/hicolor ||:
|
||||
for info_file in %{INFO_FILES}
|
||||
|
|
@ -439,7 +462,11 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor > /dev/null 2>&1 ||:
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed Apr 5 2017 Jerry James <loganjerry@gmail.com> -1.9.2-1
|
||||
* Tue Oct 17 2017 Jerry James <loganjerry@gmail.com> - 1.9.2-2
|
||||
- Link rather than copy the normaliz binary
|
||||
- Fix accidental replacement of factory symlink with a directory
|
||||
|
||||
* Wed Apr 5 2017 Jerry James <loganjerry@gmail.com> - 1.9.2-1
|
||||
- Macaulay2-1.9.2
|
||||
- Drop upstreamed patches: -disable_broken_debug_functions, -gc, -rpath,
|
||||
-rh_configure_hack
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue