%{buildroot}%{_texvardir}/dist/ls-R
%{buildroot}%{_texvardir}/main/ls-R
@@ -894,22 +946,26 @@
Hello community,
here is the log from the commit of package texlive for openSUSE:Factory
checked in at Sun Apr 4 20:22:34 CEST 2010.
--------
--- texlive/texlive-bin.changes 2010-01-28 10:50:39.000000000 +0100
+++ /mounts/work_src_done/STABLE/texlive/texlive-bin.changes 2010-04-04 20:21:07.963053000 +0200
@@ -1,0 +2,8 @@
+Mon Mar 15 13:54:55 CET 2010 - werner@suse.de
+
+- Make it work even with libpng 1.4
+- Add font config confguration for TeXLive fonts (bnc#588156)
+- Add fixed geometry.sty (bnc#559257)
+- gcc45 seems not to work with iculib/icu-xetex, switch to gcc43
+
+-------------------------------------------------------------------
texlive.changes: same change
calling whatdependson for head-i586
New:
----
fc-texlive.conf
source-geometry.dif.bz2
source-libpng14.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-bin.spec ++++++
--- /var/tmp/diff_new_pack.fPL039/_old 2010-04-04 20:21:53.000000000 +0200
+++ /var/tmp/diff_new_pack.fPL039/_new 2010-04-04 20:21:53.000000000 +0200
@@ -25,9 +25,10 @@
Name: texlive-bin
# Remark: In case of enabling ttf2pk we need also freetype(1) within the line of BuildRequires
BuildRequires: bison cairo cairo-devel dialog ed expat fdupes flex freetype2-devel gcc-c++ gd-devel ghostscript_any glitz glitz-devel jpeg libicu libicu-devel libjpeg-devel libpng-devel libpoppler-devel netpbm t1lib t1lib-devel unzip xaw3d-devel xorg-x11-devel xorg-x11-util-devel xz zip zziplib zziplib-devel
+BuildRequires: gcc43
Url: http://www.tug.org/texlive/
License: GPLv2+ ; TeX-License ..
-PreReq: coreutils ed %fillup_prereq findutils grep %install_info_prereq sed
+PreReq: coreutils ed %fillup_prereq findutils grep %install_info_prereq sed %suseconfig_fonts_prereq
Requires: /usr/bin/clear /usr/bin/dialog /bin/ed /usr/bin/env /usr/bin/perl perl-Tk ghostscript_x11 cron
Obsoletes: te_pscm te_etex te_pdf tetex
Conflicts: te_eplai te_ams ntex
@@ -35,7 +36,7 @@
Summary: The Base System of TeXLive
Group: Productivity/Publishing/TeX/Base
Version: 2009
-Release: 5
+Release: 6
Source0: ftp://tug.org/historic/systems/texlive/2009/texlive-20091107-source.tar.xz
Source1: ftp://tug.org/historic/systems/texlive/2009/texlive-20091107-texmf.tar.xz
Source2: ftp://tug.org/historic/systems/texlive/2009/texlive-20091107-extra.tar.xz
@@ -47,6 +48,7 @@
Source12: texlive.cron
Source13: texlive.sh
Source14: texlive.csh
+Source15: fc-texlive.conf
Source20: texlive-import
Source21: texlive-import.8
Source22: README.import
@@ -63,6 +65,7 @@
NoSource: 12
NoSource: 13
NoSource: 14
+NoSource: 15
NoSource: 20
NoSource: 21
NoSource: 22
@@ -77,6 +80,7 @@
Patch6: source-dviutils.dif
Patch7: source-psutils-flip.dif
Patch8: source-psutils.dif
+Patch9: source-geometry.dif.bz2
Patch10: source-poppler.dif
Patch11: source-lacheck.dif
Patch12: source-warns.dif
@@ -85,6 +89,7 @@
Patch15: source-gcc44.dif
Patch16: source-metapost.dif
Patch17: source-64.dif
+Patch18: source-libpng14.patch
Patch40: texmf.dif
Patch41: texmf-astro.dif
Patch42: texmf-musixtex.dif
@@ -101,6 +106,7 @@
NoPatch: 6
NoPatch: 7
NoPatch: 8
+NoPatch: 9
NoPatch: 10
NoPatch: 11
NoPatch: 12
@@ -109,6 +115,7 @@
NoPatch: 15
NoPatch: 16
NoPatch: 17
+NoPatch: 18
NoPatch: 40
NoPatch: 41
NoPatch: 42
@@ -123,13 +130,16 @@
# not necessary required, enabling the resulting psutils
# in texlive-tools cause dependency on texlive package
%bcond_with psutils
+
%{expand: %%global options %(mktemp /tmp/texlive-opts.XXXXXXXX)}
%global _varlib %{_localstatedir}/lib
%global _libexecdir %{_prefix}/lib
+
%define _texmf_doc %{_datadir}/texmf
%define _texmf_dist %{_datadir}/texmf
%define _texmf_main %{_libexecdir}/texmf
%define _texmf \{%{_texmf_dist},%{_texmf_main}\}
+
%define _texbindir %{_libexecdir}/texmf/bin
%define _texscrdir %{_texmf_dist}/bin/noarch
%define _texinfodir %{_texmf_main}/doc/info
@@ -183,10 +193,12 @@
#
%define posthash() %post -n texlive%{?1:-%{1}}\
%{texhash}\
+%{run_suseconfig_fonts}\
%nil
#
%define postunhash() %postun -n texlive%{?1:-%{1}}\
%{?1:%{texhash}}\
+%{run_suseconfig_fonts}\
%nil
#
@@ -455,15 +467,18 @@
%if %{with psutils}
The PSToPS utilities are
+
psbook rearranges pages into signatures
psselect selects pages and page ranges
pstops performs general page rearrangement and selection
psnup put multiple pages per physical sheet of paper
psresize alter document paper size
epsffit fits an EPSF file to a given bounding box
+
You will find a README under /usr/share/doc/packages/psutils/ which
also describes several perl-scripts for importing PostScript files. A
manual page for each ps utility is also included.
+
Authors:
--------
Angus J. C. Duggan
@@ -624,6 +639,7 @@
# Generate the Options file
exec 6>&1
exec 1>|%{options}
+
# System wide configuration
echo CPU=\"$CPU\"
echo BINARY=\"${BINARY%%-gnu*}\"
@@ -634,19 +650,23 @@
echo BUILD=\"${BUILD%%-gnu*}\"
echo XCPIE=\"$XCPIE\"
echo XLPIE=\"$XLPIE\"
+
echo export XCFLAGS XCXXFLAGS XLDFLAGS XCPIE XLPIE HOST BUILD BINARY
+
# Do not include e.g. from manual build
echo unset TEXINPUTS TEXMF HOME
+
# Environment for configuration
echo CONFIG_SHELL=/bin/bash
echo CFLAGS=\"$XCFLAGS\"
echo CXXFLAGS=\"$XCXXFLAGS\"
echo LDFLAGS=\"-Wl,-warn-common $XLDFLAGS\"
- echo CC=gcc
+ echo CC=gcc-4.3
echo CXX=g++
echo VENDOR=\"${VENDOR}\"
echo ARCH_LIB=%{_lib}
echo export CC CXX CFLAGS CXXFLAGS LDFLAGS VENDOR PATH CONFIG_SHELL ARCH_LIB
+
# Do not run TeX engine in fmtutil with batchmode
echo batchmode=no
echo export batchmode
@@ -656,31 +676,42 @@
# This is the maximum on hppa
echo ulimit -s 81920
%endif
+
# Source the rellink shell function
echo . %{SOURCE8}
trap 'rm -vf %{options}' ERR
exec 1>&6-
+
# Read the options file
. %{options}
+
# Clean texmf tree
rm -rf %{buildroot}
+
# Place texmf tree into the build root
mkdir -p %{buildroot}%{_texmf_doc}
mkdir -p %{buildroot}%{_texmf_dist}
mkdir -p %{buildroot}%{_texmf_main}
+
mkdir -p %{_builddir}/texlive
ln -sf %{buildroot}%{_texmf_doc} %{_builddir}/texlive/texmf-dist
ln -sf %{buildroot}%{_texmf_dist} %{_builddir}/texlive/texmf-dist
ln -sf %{buildroot}%{_texmf_main} %{_builddir}/texlive/texmf
+
tar --use-compress-program=xz -xpsS --strip-components=1 -f %{SOURCE1} -C %{_builddir}/texlive
+
%setup -c -q -n texlive -T
+
tar --use-compress-program=xz --strip-components=1 -xf %{S:0}
+
ln -sf %{buildroot}%{_texmf_doc} %{_builddir}/texlive/texmf-doc
ln -sf %{buildroot}%{_texmf_dist} %{_builddir}/texlive/texmf-dist
ln -sf %{buildroot}%{_texmf_main} %{_builddir}/texlive/texmf
+
rm -vf %{buildroot}%{_texmf_doc}/texmf
rm -vf %{buildroot}%{_texmf_dist}/texmf
rm -vf %{buildroot}%{_texmf_main}/texmf
+
%patch1 -p0 -b .configure
%patch2 -p0 -b .xdvizilla
%patch3 -p0 -b .arraysubs
@@ -691,6 +722,7 @@
%patch7 -p0 -b .psutils-flip
%patch8 -p0 -b .psutils
%endif
+%patch9 -p0 -b .geometry
%patch10 -p0 -b .poppler
%patch11 -p0 -b .lacheck
%patch12 -p0 -b .warns
@@ -699,6 +731,7 @@
%patch15 -p0 -b .gcc44
%patch16 -p0 -b .mp
%patch17 -p0 -b .64
+%patch18 -p0 -b .libpng14
%patch40 -p0
%patch41 -p0
%patch42 -p0
@@ -707,16 +740,20 @@
%patch45 -p0
%patch46 -p0
%patch0 -p0
+
# Move texmf tree out of the way
rm -rf %{_tmppath}/%{name}-%{version}-backup
mv -v %{buildroot} %{_tmppath}/%{name}-%{version}-backup
%build
+
# Move texmf tree back
rm -rf %{buildroot}
mv -v %{_tmppath}/%{name}-%{version}-backup %{buildroot}
+
# Read the options file
. %{options}
+
# Sanity check for system icu libraries and headers
# Remark: official libicu is _not_ compatible with libicu of XeTeX
if test -s /usr/include/layout/GlyphPositioningTables.h -a \
@@ -729,8 +766,10 @@
else
icu[0]=""
fi
+
# We have an other autoconf/automake version
./reautoconf libs/icu/dummy
+
# Run configure now
# longinteger and off_t declarations are still inconsistent, do not
# enable largefile unless you are testing.
@@ -806,13 +845,16 @@
--with-mf-x-toolkit \
--with-xdvi-x-toolkit=xaw3d \
--with-editor='vi +%%d %%s'
+
# Make the global configuration file and make a backup
make -C texk/kpathsea/ texmf.cnf
cp -p texk/kpathsea/texmf.cnf texmf.tmp
+
# Just make a configuration file for the build root environment
mkdir -p %{buildroot}%{_texcnfdir}/web2c
sed -r '\@^[A-Z]+[[:space:]]*=[[:space:]]*@ { s@(=[[:space:]]*|[:;])(/)@\1${ROOT}\2@g; }' \
< texmf.tmp > %{buildroot}%{_texcnfdir}/web2c/texmf.cnf
+
# Make build happy by using the texmf.cnf from build root environment
TEXMFCNF=%{buildroot}%{_texcnfdir}/web2c//
export TEXMFCNF
@@ -820,14 +862,18 @@
export ROOT
KPATHSEA_WARNING=0
export KPATHSEA_WARNING
+
# Just make the binaries
make
%install
+
# Read the options file
. %{options}
+
# Not required anymore
rm -f %{options}
+
# Some initial directories, permissions, and files
mkdir -p %{buildroot}%{_texscrdir}
mkdir -p %{buildroot}%{_texbindir}/$BINARY
@@ -846,6 +892,7 @@
mkdir -p %{buildroot}%{_sysconfdir}/cron.daily
mkdir -p %{buildroot}%{_sysconfdir}/permissions.d
mkdir -p %{buildroot}%{_sysconfdir}/profile.d
+ mkdir -p %{buildroot}%{_sysconfdir}/fonts/conf.d
mkdir -p %{buildroot}/sbin/conf.d
mkdir -p %{buildroot}%{_appdefdir}
mkdir -p %{buildroot}%{_x11bin}
@@ -858,12 +905,16 @@
mkdir -p %{buildroot}%{_libdir}
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
mkdir -p %{buildroot}%{_sysconfdir}/skel
+
# Set write permission for root
chmod -R u+rw,go-w,go+r,a-s %{buildroot}/
+
# Enviroment
install -m 0644 %{SOURCE13} %{buildroot}%{_sysconfdir}/profile.d/
install -m 0644 %{SOURCE14} %{buildroot}%{_sysconfdir}/profile.d/
+ install -m 0644 %{SOURCE15} %{buildroot}%{_sysconfdir}/fonts/conf.d/09-texlive.conf
install -m 0644 %{SOURCE31} %{buildroot}%{_sysconfdir}/skel/.dvipsrc
+
# Sticky bit for temporary user files
chmod 1755 %{buildroot}%{_texvardir}
chmod 1755 %{buildroot}%{_texvardir}/dist
@@ -877,6 +928,7 @@
chmod 1777 %{buildroot}%{_fontcache}/pk
chmod 1777 %{buildroot}%{_fontcache}/source
chmod 1777 %{buildroot}%{_fontcache}/tfm
+
# The main ls-R file
pushd %{buildroot}%{_texmf_main}/
ls -RLA ./ >> %{buildroot}%{_texvardir}/main/ls-R
popd
+
# Install config stuff
install -m 0644 %{SOURCE10} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.texlive
install -m 0755 %{SOURCE11} %{buildroot}/sbin/conf.d/SuSEconfig.texlive
install -m 0755 %{SOURCE12} %{buildroot}%{_sysconfdir}/cron.daily/suse-texlive
+
# Install dviutils stuff
for script in a4toa5 odd2even mydvichk; do
script=texk/seetexk/$script
test -e $script || continue
install -m 0755 $script %{buildroot}%{_texscrdir}/
done
+
%if %{with psutils}
# Install psutils stuff
mkdir -p %{buildroot}%{_texmf_doc}/doc/psutils
install -m 0644 utils/psutils/README %{buildroot}%{_texmf_doc}/doc/psutils/
install -m 0644 utils/psutils/LICENSE %{buildroot}%{_texmf_doc}/doc/psutils/
%endif
+
# Documentation at default
for pkg in texlive texlive-doc texlive-cjk texlive-arab texlive-metapost \
texlive-context texlive-omega texlive-xetex texlive-latex \
@@ -926,6 +982,7 @@
rm -f %{buildroot}%{_defaultdocdir}/$pkg/doc
ln -sf $relpath %{buildroot}%{_defaultdocdir}/$pkg/doc
done
+
# Set the environment without ROOT within formats
TEXMFCNF=%{buildroot}%{_texcnfdir}/web2c//
export TEXMFCNF
@@ -933,6 +990,7 @@
export ROOT
KPATHSEA_WARNING=0
export KPATHSEA_WARNING
+
# Install into build root
make install DESTDIR=%{buildroot} \
prefix=%{_prefix} \
@@ -950,9 +1008,11 @@
texmf=%{_texmf_dist} \
texmfmain=%{_texmf_main} \
vartexfonts=%{_fontcache}
+
# !!! No foreign update system as this will break RPM !!!
find %{buildroot}%{_texmf_dist}/ \
%{buildroot}%{_texmf_main}/ -name 'tlmgr*' | xargs -r rm -vrf
+
# Clean out not wanted file
rm -vf %{buildroot}%{_libdir}/libkpathsea.la
rm -vrf %{buildroot}%{_texmf_dist}/source
@@ -1092,6 +1152,7 @@
set +o noglob
esac
done
+
# Clean up info and manual pages
rm -vf %{buildroot}%{_texinfodir}/localdir
ln -sf dir %{buildroot}%{_texinfodir}/localdir
@@ -1112,6 +1173,7 @@
test -n "$page" -a -e "$page" || continue
mv "$page" %{buildroot}%{_texmandir}/man1/
done
+
# Repair MusixTeX/MusicTeX examples
musictex=$(find %{buildroot}%{_texmf_doc}/doc/ -name musictex -a -type d)
musixtex=$(find %{buildroot}%{_texmf_doc}/doc/ -name musixtex -a -type d)
@@ -1136,6 +1198,7 @@
if test -n "$musicdoc" -a -e "$musicdoc" ; then
mv -v "$musicdoc" ${musictex}/
fi
+
# Move some other files
bangfont=$(find %{buildroot}%{_texmf_doc}/doc/ -name bangfont.tex)
if test -n "$bangfont" -a -d %{buildroot}%{_texmf_dist}/tex/latex/bangfont/ ; then
@@ -1145,6 +1208,7 @@
if test -n "$otibet" -a -d %{buildroot}%{_texmf_dist}/tex/latex/otibet/ ; then
mv -v $otibet %{buildroot}%{_texmf_dist}/tex/latex/otibet/
fi
+
# Remove pdftosrc manual apge if not supported, add pdfetex link
if ! test -x %{buildroot}%{_texbindir}/$BINARY/pdftosrc ; then
rm -vf %{buildroot}%{_texmandir}/man1/pdftosrc.1
@@ -1152,10 +1216,12 @@
if ! test -x %{buildroot}%{_texbindir}/$BINARY/pdfetex ; then
ln -sf pdftex %{buildroot}%{_texbindir}/$BINARY/pdfetex
fi
+
# Enable LaTeX mode of detex
if ! test -x %{buildroot}%{_texbindir}/$BINARY/delatex ; then
ln -sf detex %{buildroot}%{_texbindir}/$BINARY/delatex
fi
+
# Remove windows files
rm -rf %{buildroot}%{_texmf_dist}/scripts/context/stubs/mswin
rm -rf %{buildroot}%{_texmf_dist}/tex4ht/base/win32
@@ -1195,6 +1261,7 @@
rm -vf %{buildroot}%{_texmf_doc}/doc/latex/splitindex/splitindex.exe
rm -vf %{buildroot}%{_texmf_doc}/doc/latex/bibarts/gbib*.bat
rm -vf %{buildroot}%{_texmf_doc}/doc/latex/bibarts/gbibsort.exe
+
# Configurations files which should be moved to /etc/texmf/
for cfg in mexconf.tex cyrtex.cfg cont-usr.tex language.def \
amsppt.sti pdftexconfig.tex language.dat texmf.cnf \
@@ -1220,12 +1287,14 @@
rellink %{buildroot}${sysdir}/${cfg} %{buildroot}${olddir}/${cfg}
done
done
+
rm -vf %{buildroot}%{_appdefdir}/XDvi
rellink %{buildroot}%{_texcnfdir}/xdvi/XDvi %{buildroot}%{_appdefdir}/XDvi
%if "%_x11bin" != "%_bindir"
rm -vf %{buildroot}%{_x11bin}/xdvi
rellink %{buildroot}%{_bindir}/xdvi %{buildroot}%{_x11bin}/xdvi
%endif
+
# Move scripts to noarch, symbolic links first
for f in %{buildroot}%{_texbindir}/$BINARY/* ; do
test -e $f || continue
@@ -1251,6 +1320,7 @@
mv -v $f %{buildroot}%{_texscrdir}/
esac
done
+
# Remove doubled scripts from binary bindir
target=""
fdupes -qsr %{buildroot}%{_texbindir}/$BINARY/ %{buildroot}%{_texscrdir}/ | \
@@ -1272,6 +1342,7 @@
find %{buildroot}%{_texbindir}/$BINARY/ -type d -a -empty | xargs -r rm -vr
rm -vrf %{buildroot}%{_texbindir}/$BINARY/glossaries
rm -vrf %{buildroot}%{_texbindir}/$BINARY/oberdiek
+
# Move shared/dist web2c files back to lib/main web2c
relpath=$(relpath %{_texmf_main}/web2c %{_texmf_dist}/web2c)
for f in %{buildroot}%{_texmf_dist}/web2c/* ; do
@@ -1282,6 +1353,7 @@
mv -v $f $g
ln -sf $relpath/${f##*/} $f
done
+
# Move shared/dist texconfig files back to lib/main texconfig
relpath=$(relpath %{_texmf_main}/texconfig %{_texmf_dist}/texconfig)
for f in %{buildroot}%{_texmf_dist}/texconfig/* ; do
@@ -1292,6 +1364,7 @@
mv -v $f $g
ln -sf $relpath/${f##*/} $f
done
+
# Relink manual pages and info files
relpath=$(relpath %{_texinfodir} %{_infodir})
for f in %{buildroot}%{_texinfodir}/*info* ; do
@@ -1340,15 +1413,18 @@
done
done
unset relpath
+
# Avoid build root string in format
ROOT=/tmp/=
TEXMFCNF=${ROOT}%{_texcnfdir}/web2c//
ln -sf %{buildroot} ${ROOT}
export ROOT TEXMFCNF
+
# Do some intial configurations
OPATH=${PATH}
PATH=%{buildroot}%{_texbindir}/$BINARY:%{buildroot}%{_texscrdir}:${PATH}
export PATH
+
texconfig-sys rehash
texconfig-sys paper a4
texconfig-sys dvipdfm paper a4
@@ -1380,11 +1456,14 @@
texconfig-sys dvips -P deskjet mode deskjet
texconfig-sys dvips -P ljet4 mode ljfour
texconfig-sys rehash
+
updmap-sys --syncwithtrees
texconfig-sys rehash
+
texconfig-sys init
texconfig-sys font rw
texconfig-sys rehash
+
pushd utils/vlna/
./configure \
--host=${HOST} \
@@ -1424,6 +1503,7 @@
popd
PATH=${OPATH}
unset TEXMFCNF OPATH
+
# Relink programs after initialization to catch new links
relpath=$(relpath %{_texbindir}/$BINARY %{_bindir})
for f in %{buildroot}%{_texbindir}/$BINARY/* ; do
@@ -1439,6 +1519,7 @@
rm -vf %{buildroot}%{_bindir}/$f
ln -sf $relpath/$f %{buildroot}%{_bindir}/$f
done
+
# Clean out not wanted file
if test -n "%{buildroot}" -a -d "%{buildroot}" ; then
find %{buildroot}/ -name '*.orig' -o -name '*.log' -o -name '*.aux' \
@@ -1448,6 +1529,7 @@
-name '*.orig' -o -name '*.log' -o -name '*.aux' \
-o -name '*.ilg' -o -name '.cvsignore' -o -name '*.bak' -o -name '*.mx[1-9]'
fi | xargs -r rm -vf
+
# Clean out the maps and formats
if test -n "$ROOT" -a -d "$ROOT" ; then
SLASH=$(echo "$ROOT" | tr '[[:print:]]' '/')
@@ -1470,6 +1552,7 @@
fi
rm -vf ${ROOT}
unset ROOT
+
# Clean out some file duplicates within the *same* sub package
# but *never* for font maps or any other type of configuration
for dir in %{buildroot}%{_texmf_doc}/doc/* \
@@ -1498,8 +1581,10 @@
fi
done
done
+
# Last but not least install backup texmf configuration file
cp -p texmf.tmp %{buildroot}%{_texcnfdir}/web2c/texmf.cnf
+
# The permission files, any change is also required within do.mklists
(cat > %{buildroot}/etc/permissions.d/texlive) <<-EOF
%{_texvardir}/ls-R root:root 0666
@@ -1537,11 +1622,14 @@
%{_fontcache}/source/ root:root 1755
%{_fontcache}/tfm/ root:root 1755
EOF
+
# Create the main file list
TMPDIR=${PWD}/lists
PATH=%{_sourcedir}:$PATH
export TMPDIR PATH
+
bash %{SOURCE6} -b %{name} -c
+
# Split off the specific file lists
set -o noglob
(cat | bash %{SOURCE6} -b %{name})<<-EOF
@@ -1710,11 +1798,14 @@
base .
EOF
set +o noglob
+
# Finalize the generated file lists
bash %{SOURCE6} -b %{name} -f
+
# Add missing dir for triggerin scripts
mkdir -p %{buildroot}%{_texvardir}/link/$BINARY
echo %%isbin %%dir %{_texvardir}/link/$BINARY >> lists/%{name}-base
+
# Generate the triggerin scripts which will be triggered by the noarch package
for lst in lists/%{name}-* ; do
grep -q %%ghost $lst || continue
@@ -1743,6 +1834,7 @@
echo %%isbin ${lnk} >> $lst
done
unset lst lnk
+
%lnktrigger
%lnktrigger devel
@@ -1768,6 +1860,7 @@
%lnktrigger musictex
+
%if 0%{?opensuse_bs}
%clean
++++++ texlive.spec ++++++
++++ 606 lines (skipped)
++++ between texlive/texlive.spec
++++ and /mounts/work_src_done/STABLE/texlive/texlive.spec
++++++ source-geometry.dif.bz2 ++++++
++++ 14948 lines (skipped)
++++++ source-libpng14.patch ++++++
--- texk/dvipdfmx/src/pngimage.c
+++ texk/dvipdfmx/src/pngimage.c 2010-01-21 00:56:39.000000000 +0000
@@ -148,7 +148,7 @@ check_for_png (FILE *png_file)
rewind (png_file);
if (fread (sigbytes, 1, sizeof(sigbytes), png_file) !=
sizeof(sigbytes) ||
- (!png_check_sig (sigbytes, sizeof(sigbytes))))
+ (png_sig_cmp (sigbytes, 0, sizeof(sigbytes))))
return 0;
else
return 1;
--- texk/web2c/xetexdir/pngimage.c
+++ texk/web2c/xetexdir/pngimage.c 2010-01-20 23:56:45.000000000 +0000
@@ -101,7 +101,7 @@ check_for_png (FILE *png_file)
rewind (png_file);
if (fread (sigbytes, 1, sizeof(sigbytes), png_file) !=
sizeof(sigbytes) ||
- (!png_check_sig (sigbytes, sizeof(sigbytes))))
+ (png_sig_cmp (sigbytes, 0, sizeof(sigbytes))))
return 0;
else
return 1;
--- texk/xdvipdfmx/src/pngimage.c
+++ texk/xdvipdfmx/src/pngimage.c 2010-01-21 00:59:53.000000000 +0000
@@ -146,7 +146,7 @@ check_for_png (FILE *png_file)
rewind (png_file);
if (fread (sigbytes, 1, sizeof(sigbytes), png_file) !=
sizeof(sigbytes) ||
- (!png_check_sig (sigbytes, sizeof(sigbytes))))
+ (png_sig_cmp (sigbytes, 0, sizeof(sigbytes))))
return 0;
else
return 1;
--- texk/xdvipdfmx/src/xbb.c
+++ texk/xdvipdfmx/src/xbb.c 2010-01-21 01:46:07.000000000 +0000
@@ -246,7 +246,7 @@ static int check_for_png (FILE *png_file
unsigned char sigbytes[4];
rewind (png_file);
if (fread(sigbytes, 1, sizeof(sigbytes), png_file) != sizeof(sigbytes) ||
- (!png_check_sig (sigbytes, sizeof(sigbytes)))) return 0;
+ (png_sig_cmp (sigbytes, 0, sizeof(sigbytes)))) return 0;
else return 1;
}
++++++ texlive.spec.in ++++++
--- /var/tmp/diff_new_pack.fPL039/_old 2010-04-04 20:21:54.000000000 +0200
+++ /var/tmp/diff_new_pack.fPL039/_new 2010-04-04 20:21:54.000000000 +0200
@@ -22,9 +22,10 @@
Name: @@NAME@@
# Remark: In case of enabling ttf2pk we need also freetype(1) within the line of BuildRequires
BuildRequires: bison cairo cairo-devel dialog ed expat fdupes flex freetype2-devel gcc-c++ gd-devel ghostscript_any glitz glitz-devel jpeg libicu libicu-devel libjpeg-devel libpng-devel libpoppler-devel netpbm t1lib t1lib-devel unzip xaw3d-devel xorg-x11-devel xorg-x11-util-devel xz zip zziplib zziplib-devel
+BuildRequires: gcc43
Url: http://www.tug.org/texlive/
License: GPL v2 or later ; TeX-License ..
-PreReq: coreutils ed %fillup_prereq findutils grep %install_info_prereq sed @@PREREQADD@@
+PreReq: coreutils ed %fillup_prereq findutils grep %install_info_prereq sed %suseconfig_fonts_prereq @@PREREQADD@@
@@PROVIDES: TeX Dvips PicTeX@@
Requires: /usr/bin/clear /usr/bin/dialog /bin/ed /usr/bin/env /usr/bin/perl perl-Tk ghostscript_x11 cron
Obsoletes: te_pscm te_etex te_pdf tetex
@@ -46,6 +47,7 @@
Source12: texlive.cron
Source13: texlive.sh
Source14: texlive.csh
+Source15: fc-texlive.conf
Source20: texlive-import
Source21: texlive-import.8
Source22: README.import
@@ -61,6 +63,7 @@
Patch6: source-dviutils.dif
Patch7: source-psutils-flip.dif
Patch8: source-psutils.dif
+Patch9: source-geometry.dif.bz2
Patch10: source-poppler.dif
Patch11: source-lacheck.dif
Patch12: source-warns.dif
@@ -69,6 +72,7 @@
Patch15: source-gcc44.dif
Patch16: source-metapost.dif
Patch17: source-64.dif
+Patch18: source-libpng14.patch
Patch40: texmf.dif
Patch41: texmf-astro.dif
Patch42: texmf-musixtex.dif
@@ -147,10 +151,12 @@
#
%define posthash() %post -n texlive%{?1:-%{1}}\
%{texhash}\
+%{run_suseconfig_fonts}\
%nil
#
%define postunhash() %postun -n texlive%{?1:-%{1}}\
%{?1:%{texhash}}\
+%{run_suseconfig_fonts}\
%nil
#
@@ -781,7 +787,7 @@
echo CFLAGS=\"$XCFLAGS\"
echo CXXFLAGS=\"$XCXXFLAGS\"
echo LDFLAGS=\"-Wl,-warn-common $XLDFLAGS\"
- echo CC=gcc
+ echo CC=gcc-4.3
echo CXX=g++
echo VENDOR=\"${VENDOR}\"
echo ARCH_LIB=%{_lib}
@@ -842,6 +848,7 @@
%patch7 -p0 -b .psutils-flip
%patch8 -p0 -b .psutils
%endif
+%patch9 -p0 -b .geometry
%patch10 -p0 -b .poppler
%patch11 -p0 -b .lacheck
%patch12 -p0 -b .warns
@@ -850,6 +857,7 @@
%patch15 -p0 -b .gcc44
%patch16 -p0 -b .mp
%patch17 -p0 -b .64
+%patch18 -p0 -b .libpng14
%patch40 -p0
%patch41 -p0
%patch42 -p0
@@ -1010,6 +1018,7 @@
mkdir -p %{buildroot}%{_sysconfdir}/cron.daily
mkdir -p %{buildroot}%{_sysconfdir}/permissions.d
mkdir -p %{buildroot}%{_sysconfdir}/profile.d
+ mkdir -p %{buildroot}%{_sysconfdir}/fonts/conf.d
mkdir -p %{buildroot}/sbin/conf.d
mkdir -p %{buildroot}%{_appdefdir}
mkdir -p %{buildroot}%{_x11bin}
@@ -1036,6 +1045,7 @@
# Enviroment
install -m 0644 %{SOURCE13} %{buildroot}%{_sysconfdir}/profile.d/
install -m 0644 %{SOURCE14} %{buildroot}%{_sysconfdir}/profile.d/
+ install -m 0644 %{SOURCE15} %{buildroot}%{_sysconfdir}/fonts/conf.d/09-texlive.conf
install -m 0644 %{SOURCE31} %{buildroot}%{_sysconfdir}/skel/.dvipsrc
# Sticky bit for temporary user files
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org