mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 19:55:54 -04:00
Merge branch 'master' into f22
This commit is contained in:
commit
9e3510652e
1 changed files with 5 additions and 3 deletions
|
@ -15,7 +15,7 @@
|
||||||
%bcond_with fes
|
%bcond_with fes
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# set to run sage -testall in %%install
|
# switch to run make -testall
|
||||||
%bcond_with check
|
%bcond_with check
|
||||||
%global SAGE_TIMEOUT 60
|
%global SAGE_TIMEOUT 60
|
||||||
%global SAGE_TIMEOUT_LONG 180
|
%global SAGE_TIMEOUT_LONG 180
|
||||||
|
@ -942,7 +942,7 @@ popd
|
||||||
|
|
||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
cat > %{buildroot}%{_bindir}/sage << EOF
|
cat > %{buildroot}%{_bindir}/sage << EOF
|
||||||
#!/bin/sh
|
#!/bin/bash -i
|
||||||
|
|
||||||
export CUR=\`pwd\`
|
export CUR=\`pwd\`
|
||||||
##export DOT_SAGE="\$HOME/.sage"
|
##export DOT_SAGE="\$HOME/.sage"
|
||||||
|
@ -1019,7 +1019,7 @@ pushd src/doc
|
||||||
|
|
||||||
# there we go
|
# there we go
|
||||||
ln -sf %{buildroot}%{SAGE_DOC} $SAGE_SRC/doc
|
ln -sf %{buildroot}%{SAGE_DOC} $SAGE_SRC/doc
|
||||||
python common/builder.py -k all html
|
LANGUAGES="ca de en fr hu it pt ru tr" python common/builder.py -k all html
|
||||||
export SAGE_DOC=%{buildroot}%{SAGE_DOC}
|
export SAGE_DOC=%{buildroot}%{SAGE_DOC}
|
||||||
cp -far output $SAGE_DOC
|
cp -far output $SAGE_DOC
|
||||||
|
|
||||||
|
@ -1370,6 +1370,8 @@ exit 0
|
||||||
%changelog
|
%changelog
|
||||||
* Sun Jul 19 2015 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 6.5-7
|
* Sun Jul 19 2015 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 6.5-7
|
||||||
- Correct unable to start QEPCAD within sage (#1243590)
|
- Correct unable to start QEPCAD within sage (#1243590)
|
||||||
|
- Use interactive bash on wrappers to work with other login shells (#1238341)
|
||||||
|
- Properly generate localized translations
|
||||||
|
|
||||||
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.5-6
|
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.5-6
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue