Dr. Werner Fink 2013-08-07 11:00:57 +00:00 committed by Git OBS Bridge
parent 7b184522fe
commit 96d8df7dc5
2 changed files with 52 additions and 0 deletions

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Aug 7 09:57:30 UTC 2013 - werner@suse.de
- Repair several wrong paths cause by the move of TEXMFMAIN that is
+ the location of TLUtils.pm used by updmap
+ the location of xasy.py
- Help aysmptote configure script to detect libOSMesa with the
implicite dependcy to libglapi which now provides the offscreen
feature of aysmptote
-------------------------------------------------------------------
Tue Aug 6 09:24:21 UTC 2013 - werner@suse.de

View File

@ -112,6 +112,7 @@ BuildRequires: %{name}-filesystem
BuildRequires: ghostscript-devel
BuildRequires: ghostscript-library
BuildRequires: glibc-devel
BuildRequires: glu-devel
BuildRequires: gsl-devel
BuildRequires: jpeg
BuildRequires: kernel-devel
@ -119,6 +120,8 @@ BuildRequires: libicu-devel
BuildRequires: libjpeg-devel
BuildRequires: libopenssl-devel
%if 0%{suse_version} > 1220
BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libglapi-devel
BuildRequires: libOSMesa-devel
%else
BuildRequires: Mesa-devel
@ -223,8 +226,13 @@ Prefix: %{_bindir}
%global _libexecdir %{_prefix}/lib
%define _texmfdistdir %{_datadir}/texmf
%if 0%{texlive_version} >= 2013
%define _texmfmaindir %{_texmfdistdir}
%define _texmfdirs %{_texmfdistdir}
%else
%define _texmfmaindir %{_libexecdir}/texmf
%define _texmfdirs \{%{_texmfdistdir},%{_texmfmaindir}\}
%endif
%define _texmfconfdir %{_sysconfdir}/texmf
%define _texmfvardir %{_varlib}/texmf
@ -2372,18 +2380,25 @@ popd
pushd utils/asymptote
autoreconf
(cat>libOSMesa.so)<<-'EOF'
/* GNU ld script */
INPUT(%{_libdir}/libOSMesa.so AS_NEEDED(-lglapi))
EOF
PATH=$prefix/bin:$PATH \
TEXMFLOCAL=%{_texmfmaindir} \
TEXMFCNF=$texmfcnf \
STRIP=/bin/true \
STRIPPROG=/bin/true \
LDFLAGS="$LDFLAGS -L$PWD" \
./configure \
--host=${HOST} \
--build=${BUILD} \
--prefix=%{_prefix} \
--bindir=%{_bindir} \
--libdir=%{_libdir} \
--datadir=%{_texmfmaindir} \
--disable-texlive-build \
--enable-offscreen \
--enable-readline \
--enable-gsl \
--enable-fftw \
@ -2408,9 +2423,15 @@ popd
install -m 0755 texk/seetexk/odd2even ${prefix}/bin/
# install perl modules
%if 0%{texlive_version} >= 2013
mkdir -p ${prefix}/share/tlpkg/TeXLive
install -m 0644 texk/tests/TeXLive/TLConfig.pm ${prefix}/share/tlpkg/TeXLive/
install -m 0644 texk/tests/TeXLive/TLUtils.pm ${prefix}/share/tlpkg/TeXLive/
%else
mkdir -p ${prefix}/lib/tlpkg/TeXLive
install -m 0644 texk/tests/TeXLive/TLConfig.pm ${prefix}/lib/tlpkg/TeXLive/
install -m 0644 texk/tests/TeXLive/TLUtils.pm ${prefix}/lib/tlpkg/TeXLive/
%endif
%if %{with buildbiber}
# dump a biber executable
@ -2559,8 +2580,16 @@ popd
pushd ${prefix}/lib/
tar -cspSf - *.so* | tar -xvspSf - -C %{buildroot}%{_libdir}/
tar -cspSf - mktex | tar -xvspSf - -C %{buildroot}%{_libexecdir}/
popd
%if 0%{texlive_version} < 2013
pushd ${prefix}/lib/
tar -cspSf - tlpkg | tar -xvspSf - -C %{buildroot}%{_libexecdir}/
popd
%else
pushd ${prefix}/share/
tar -cspSf - tlpkg | tar -xvspSf - -C %{buildroot}%{_datadir}/
popd
%endif
pushd ${prefix}/include/
tar -cspSf - . | tar -xvspSf - -C %{buildroot}%{_includedir}/
popd
@ -2634,12 +2663,20 @@ popd
find -type l -printf '%f\a%l\n' | \
while IFS=$'\a' read dst src; do
case "$src" in
%if 0%{texlive_version} >= 2013
*/texmf/*) ln -sf ../share/texmf/${src#../texmf/} $dst ;;
%else
*/texmf/*) ln -sf ../lib/texmf/${src#../texmf/} $dst ;;
%endif
*/texmf-dist/*) ln -sf ../share/texmf/${src#../texmf-dist/} $dst ;;
esac
done
# set xasy script link
%if 0%{texlive_version} >= 2013
ln -sf ../share/texmf/asymptote/GUI/xasy.py xasy
%else
ln -sf ../lib/texmf/asymptote/GUI/xasy.py xasy
%endif
# some scripts not included in main source tar ball
test -e match_parens || ln -sf ../share/texmf/scripts/match_parens/match_parens match_parens
test -e mf2pt1 || ln -sf ../share/texmf/scripts/mf2pt1/mf2pt1.pl mf2pt1
@ -2743,8 +2780,13 @@ VERBOSE=false %{_texmfdistdir}/texconfig/update || :
%files
%defattr(-,root,root,755)
%if 0%{texlive_version} >= 2013
%{_datadir}/tlpkg/TeXLive/TLConfig.pm
%{_datadir}/tlpkg/TeXLive/TLUtils.pm
%else
%{_libexecdir}/tlpkg/TeXLive/TLConfig.pm
%{_libexecdir}/tlpkg/TeXLive/TLUtils.pm
%endif
# is part of texlive-kpathsea
#%config(noreplace) %verify(not md5 size mtime) %{_texmfconfdir}/web2c/fmtutil.cnf
#%config(noreplace) %verify(not md5 size mtime) %{_texmfconfdir}/web2c/texmf.cnf