Merge branch 'master' into f22

This commit is contained in:
pcpa 2015-08-02 12:31:35 -03:00
commit 9e3510652e

View file

@ -15,7 +15,7 @@
%bcond_with fes
%endif
# set to run sage -testall in %%install
# switch to run make -testall
%bcond_with check
%global SAGE_TIMEOUT 60
%global SAGE_TIMEOUT_LONG 180
@ -942,7 +942,7 @@ popd
#------------------------------------------------------------------------
cat > %{buildroot}%{_bindir}/sage << EOF
#!/bin/sh
#!/bin/bash -i
export CUR=\`pwd\`
##export DOT_SAGE="\$HOME/.sage"
@ -1019,7 +1019,7 @@ pushd src/doc
# there we go
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}
cp -far output $SAGE_DOC
@ -1370,6 +1370,8 @@ exit 0
%changelog
* Sun Jul 19 2015 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 6.5-7
- 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
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild