- don't conflict with ht package - ht binary is now called t4ht (#959696)

- require coreutils (#928566)
- update build scripts
- update symlink references tetex -> texlive
- handle texmf -> texmf-dist upstream move
- do proper obsoletion again
This commit is contained in:
Jindrich Novy 2013-05-25 20:22:08 +02:00
parent d5df12b365
commit d409867d84
8 changed files with 53847 additions and 41616 deletions

View File

@ -9,6 +9,15 @@ gcc tl2rpm.c -o tl2rpm -O2 -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fst
rm -f _mkdirs.spec _unpack.spec _sources.spec _remove.spec _packages.spec _font.spec _files.spec _dirs.spec
touch _mkdirs.spec
./tl2rpm
if [ -d 2011 ]; then
grep ^name texlive.tlpdb | grep -v i386 | sed -s s/name\ // | sort > /tmp/tl2012
grep ^name 2011/texlive.tlpdb | grep -v i386 | sed -s s/name\ // | sort > /tmp/tl2011
diff /tmp/tl2011 /tmp/tl2012 | grep '<' | sed -s 's/^< /Obsoletes: texlive-/' | sed -s 's/$/ < %{tl_version}/' > _obsoletes.spec
diff /tmp/tl2011 /tmp/tl2012 | grep '<' | sed -s 's/^< /Obsoletes: texlive-/' | sed -s 's/$/-doc < %{tl_version}/' >> _obsoletes.spec
diff /tmp/tl2011 /tmp/tl2012 | grep '<' | sed -s 's/^< /Obsoletes: texlive-/' | sed -s 's/$/-fedora-fonts < %{tl_version}/' >> _obsoletes.spec
diff /tmp/tl2011 /tmp/tl2012 | grep '<' | sed -s 's/^< /Obsoletes: texlive-/' | sed -s 's/$/-bin < %{tl_version}/' >> _obsoletes.spec
rm -f /tmp/tl2011 /tmp/tl2012
fi
mv _mkdirs.spec _mkdirs.spec.tmp
sort _mkdirs.spec.tmp > _mkdirs.spec
rm -f _mkdirs.spec.tmp
@ -24,15 +33,17 @@ while read LINE; do
else
echo "$LINE"
fi
done < _main_one_srpm.spec > texlive.spec
done < texlive.spec.template > texlive.spec
#exit 0
rm -f ../RPMS/noarch/texlive*
rm -f ../RPMS/x86_64/texlive*
RPMBUILDDIR=`rpm --eval "%_topdir"`
rm -f $RPMBUILDDIR/RPMS/noarch/texlive*
rm -f $RPMBUILDDIR/RPMS/x86_64/texlive*
for i in `ls texlive/archive`; do
rm -f ~/rpm/SOURCES/$i
rm -f $RPMBUILDDIR/SOURCES/$i
done
ACTDIR=`pwd`
for i in `ls texlive/archive`; do
ln -s ~/source/tl/texlive/archive/$i ~/rpm/SOURCES/$i
ln -s $ACTDIR/texlive/archive/$i $RPMBUILDDIR/SOURCES/$i
done
LANG=C time rpmbuild -bb texlive.spec > buildlog-srpm 2>&1
[ "$?" != "0" ] && exit 1

View File

@ -12,13 +12,11 @@ echo "Syncing with remote server..."
[ -e texlive/archive/lineara.source.tar.xz ] && mv texlive/archive/lineara.source.tar.xz texlive/archive/linearA.source.tar.xz
[ -e texlive/archive/musixtex-fnts.tar.xz ] && mv texlive/archive/musixtex-fnts.tar.xz texlive/archive/musixtex-fonts.tar.xz
[ -e texlive/archive/musixtex-fnts.doc.tar.xz ] && mv texlive/archive/musixtex-fnts.doc.tar.xz texlive/archive/musixtex-fonts.doc.tar.xz
[ -e texlive/archive/tlwg.tar.xz ] && mv texlive/archive/tlwg.tar.xz texlive/archive/fonts-tlwg.tar.xz
[ -e texlive/archive/tlwg.doc.tar.xz ] && mv texlive/archive/tlwg.doc.tar.xz texlive/archive/fonts-tlwg.doc.tar.xz
[ -e texlive/archive/tlwg.source.tar.xz ] && mv texlive/archive/tlwg.source.tar.xz texlive/archive/fonts-tlwg.source.tar.xz
#rsync -av --delete ftp.cstug.cz::pub/tex/local/tlpretest/archive texlive --delete-excluded \
#rsync -av --delete rsync://ftp.ctex.org/mirrors/texlive/tlpretest/ texlive --delete-excluded \
#rsync -av --delete rsync://ftp.ctex.org/mirrors/CTAN/systems/texlive/tlnet/ texlive --delete-excluded \
rsync -av --delete rsync://ftp.fernuni-hagen.de/ctan/systems/texlive/tlnet/archive texlive --delete-excluded \
#rsync -av --delete rsync://ftp.fernuni-hagen.de/ctan/systems/texlive/tlnet/archive texlive --delete-excluded \
rsync -av --delete ftp.cstug.cz::pub/tex/local/tlpretest/archive texlive --delete-excluded \
--exclude '*mactex*' \
--exclude '*.win32*' \
--exclude '*.i386-freebsd*' \
@ -35,6 +33,7 @@ rsync -av --delete rsync://ftp.fernuni-hagen.de/ctan/systems/texlive/tlnet/archi
--exclude '*.alpha-*' \
--exclude '*.x86_64-*' \
--exclude '*.universal-darwin*' \
--exclude '*.armhf-linux*' \
--exclude '*.exe.*' \
--exclude '*.exe' \
--exclude 'install-tl*' \
@ -54,9 +53,6 @@ EXIT=$?
[ -e texlive/archive/linearA.source.tar.xz ] && mv texlive/archive/linearA.source.tar.xz texlive/archive/lineara.source.tar.xz
[ -e texlive/archive/musixtex-fonts.tar.xz ] && mv texlive/archive/musixtex-fonts.tar.xz texlive/archive/musixtex-fnts.tar.xz
[ -e texlive/archive/musixtex-fonts.doc.tar.xz ] && mv texlive/archive/musixtex-fonts.doc.tar.xz texlive/archive/musixtex-fnts.doc.tar.xz
[ -e texlive/archive/fonts-tlwg.tar.xz ] && mv texlive/archive/fonts-tlwg.tar.xz texlive/archive/tlwg.tar.xz
[ -e texlive/archive/fonts-tlwg.doc.tar.xz ] && mv texlive/archive/fonts-tlwg.doc.tar.xz texlive/archive/tlwg.doc.tar.xz
[ -e texlive/archive/fonts-tlwg.source.tar.xz ] && mv texlive/archive/fonts-tlwg.source.tar.xz texlive/archive/tlwg.source.tar.xz
UPDATES=`grep 'tar.xz$' /tmp/rsynclogCTAN`
if [ "$UPDATES" == "" ]; then
rm -f /tmp/rsynclogCTAN
@ -74,8 +70,10 @@ echo "Creating symlinks..."
for i in `ls texlive/archive`; do
rm -f ~/rpm/SOURCES/$i
done
RPMBUILDDIR=`rpm --eval "%_topdir"`
ACTDIR=`pwd`
for i in `ls texlive/archive`; do
ln -s ~/source/tl/texlive/archive/$i ~/rpm/SOURCES/$i
ln -s $ACTDIR/texlive/archive/$i $RPMBUILDDIR/SOURCES/$i
done
echo "Expanding..."

View File

@ -61,12 +61,10 @@ source/utils/xz* \
source/extra*
#source/utils/asymptote*
DATE=`date +%Y%m%d`_r`grep Checked /tmp/rsynclog | cut -d" " -f4 | sed s/.$//`
sed -i s/global\ source_date.*$/global\ source_date\ $DATE/g _main.spec
sed -i s/global\ source_date.*$/global\ source_date\ $DATE/g _main_one_srpm.spec
sed -i s/global\ source_date.*$/global\ source_date\ $DATE/g dist/_main_one_srpm.spec
sed -i s/global\ source_date.*$/global\ source_date\ $DATE/g texlive.spec.template
rm -f texlive-*-source.tar.xz
echo "Packing..."
time tar Oc source | xz -cv -T0 - > texlive-$DATE-source.tar.xz
rm -rf source
mv source.svn source
mv texlive*-source.tar.xz SOURCES
mv texlive*-source.tar.xz `rpm --eval "%_topdir"`/SOURCES

80182
texlive.spec

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
%global source_date 20130427_r30134
%global source_date 20130523_r30652
%global tl_version 2012
%global tl_rel 22
%global tl_rel 23
%global tl_release %{tl_rel}.%{source_date}%{?dist}
%global tl_noarch_release %{tl_rel}%{?dist}
%global source_name texlive-%{source_date}-source
@ -170,10 +170,10 @@ popd
# nuke useless tlmgr packaging stuff and doc droppings
rm -rf %{buildroot}%{_texdir}/tlpkg/tlpobj/
rm -rf %{buildroot}%{_texdir}/texmf-dist/tlpkg/tlpobj/
rm -rf %{buildroot}%{_texdir}/texmf/doc/man/man*/*.pdf
rm -rf %{buildroot}%{_texdir}/texmf/doc/man/Makefile
rm -rf %{buildroot}%{_texdir}/texmf/doc/man/man*/Makefile
rm -rf %{buildroot}%{_texdir}/texmf/doc/info/dir
rm -rf %{buildroot}%{_texdir}/texmf-dist/doc/man/man*/*.pdf
rm -rf %{buildroot}%{_texdir}/texmf-dist/doc/man/Makefile
rm -rf %{buildroot}%{_texdir}/texmf-dist/doc/man/man*/Makefile
rm -rf %{buildroot}%{_texdir}/texmf-dist/doc/info/dir
mkdir -p %{buildroot}%{_bindir}
mv %{buildroot}/bin/i386-linux/* %{buildroot}%{_bindir}
@ -235,40 +235,42 @@ rm -f man
[ ! -e mfplain ] && ln -s mpost mfplain
[ ! -e texlua ] && ln -s luatex texlua
[ ! -e texluac ] && ln -s luatex texluac
for i in physe phyzzx installfont-tl pdfthumb ppower4 tcdialog latexmk kanji-config-updmap kanji-config-updmap-sys; do
rm -f %{buildroot}%{_bindir}/$i
rm -f %{buildroot}%{_datadir}/texlive/texmf/doc/man/man1/$i.*
for i in physe phyzzx installfont-tl pdfthumb ppower4 tcdialog latexmk; do
rm -f $i
rm -f %{buildroot}%{_datadir}/texlive/texmf-dist/doc/man/man1/$i.*
done
rm -rf %{buildroot}%{_includedir}/ptexenc
# 959696
mv ht t4ht
popd
# fix symlinks
pushd %{buildroot}%{_bindir}
for i in allcm allneeded fontinst kpsetool updmap-sys ps2frag pslatex rubibtex rumakeindex dvi2fax dvired kpsewhere; do
rm -f $i
ln -s /usr/share/texlive/texmf-dist/scripts/tetex/$i.sh $i
ln -s /usr/share/texlive/texmf-dist/scripts/texlive/$i.sh $i
done
for i in texdoctk updmap e2pall; do
rm -f $i
ln -s /usr/share/texlive/texmf-dist/scripts/tetex/$i.pl $i
ln -s /usr/share/texlive/texmf-dist/scripts/texlive/$i.pl $i
done
for i in fmtutil fmtutil-sys texconfig texconfig-sys texconfig-dialog texlinks; do
rm -f $i
ln -s /usr/share/texlive/texmf/scripts/tetex/$i.sh $i
ln -s /usr/share/texlive/texmf-dist/scripts/texlive/$i.sh $i
done
rm -f deweb
ln -s /usr/share/texlive/texmf/scripts/chktex/deweb.pl deweb
ln -s /usr/share/texlive/texmf-dist/scripts/chktex/deweb.pl deweb
rm -f ps2eps
ln -s /usr/share/texlive/texmf/scripts/ps2eps/ps2eps.pl ps2eps
ln -s /usr/share/texlive/texmf-dist/scripts/ps2eps/ps2eps.pl ps2eps
rm -f mkjobtexmf
ln -s /usr/share/texlive/texmf-dist/scripts/mkjobtexmf/mkjobtexmf.pl mkjobtexmf
rm -f rungs
ln -s /usr/share/texlive/texmf/scripts/texlive/rungs.tlu rungs
ln -s /usr/share/texlive/texmf-dist/scripts/texlive/rungs.tlu rungs
rm -f context
cat > context << EOF
\#!/bin/sh
export TEXMF=/usr/share/texlive/texmf-dist;
export TEXMFCNF=/usr/share/texlive/texmf/web2c;
export TEXMFCNF=/usr/share/texlive/texmf-dist/web2c;
export TEXMFCACHE=/var/lib/texmf;
%{_bindir}/mtxrun --script context "\\$@"
EOF
@ -279,9 +281,9 @@ popd
%include _remove.spec
mkdir -p %{buildroot}/%{_datadir}/
mkdir -p %{buildroot}/%{_infodir}/
cp -R %{buildroot}/%{_texdir}/texmf/doc/man %{buildroot}/%{_datadir}/
find %{buildroot}/%{_texdir}/texmf/doc/man -type f | xargs rm -f
mv %{buildroot}/%{_texdir}/texmf/doc/info/* %{buildroot}/%{_infodir}/
cp -R %{buildroot}/%{_texdir}/texmf-dist/doc/man %{buildroot}/%{_datadir}/
find %{buildroot}/%{_texdir}/texmf-dist/doc/man -type f | xargs rm -f
mv %{buildroot}/%{_texdir}/texmf-dist/doc/info/* %{buildroot}/%{_infodir}/
# nuke useless tlmgr packaging stuff
rm -rf %{buildroot}%{_texdir}/tlpkg/tlpobj/
@ -292,21 +294,20 @@ pushd %{buildroot}%{_texdir}
[ ! -h texmf-var ] && ln -s %{_texmf_var} texmf-var
popd
pushd %{buildroot}%{_texdir}/texmf-config/web2c
ln -s ../../texmf/web2c/updmap.cfg updmap.cfg
ln -s ../../texmf-dist/web2c/updmap.cfg updmap.cfg
popd
# touch ghosts
touch %{buildroot}%{_texdir}/texmf/ls-R
touch %{buildroot}%{_texdir}/texmf-local/ls-R
touch %{buildroot}%{_texdir}/texmf-dist/ls-R
# configure ConTeXt
for i in ctxtools luatools texexec texmfstart; do
sed -i -e 's|mtxrun|export TEXMF=/usr/share/texlive/texmf-dist; export TEXMFCNF=/usr/share/texlive/texmf/web2c; export TEXMFCACHE=/var/lib/texmf; mtxrun|' %{buildroot}%{_bindir}/$i
done
#for i in ctxtools luatools texexec texmfstart; do
# sed -i -e 's|mtxrun|export TEXMF=/usr/share/texlive/texmf-dist; export TEXMFCNF=/usr/share/texlive/texmf-dist/web2c; export TEXMFCACHE=/var/lib/texmf; mtxrun|' %{buildroot}%{_bindir}/$i
#done
# configure texmf-local - make it visible to kpathsea
sed -i -e 's|^TEXMFLOCAL.*|TEXMFLOCAL\ =\ \$TEXMFROOT/texmf-local//|' %{buildroot}/%{_texdir}/texmf/web2c/texmf.cnf
sed -i -e 's|^TEXMFLOCAL.*|TEXMFLOCAL\ =\ \$TEXMFROOT/texmf-local//|' %{buildroot}/%{_texdir}/texmf-dist/web2c/texmf.cnf
# create macro file for building texlive
mkdir -p %{buildroot}%{_sysconfdir}/rpm
@ -345,7 +346,6 @@ fi
%dir %{_texdir}/texmf-local/texmf-compat
%include _dirs.spec
%{_texdir}/licenses/*
%attr(0644, root, root) %verify(not md5 size mtime) %ghost %{_texdir}/texmf/ls-R
%attr(0644, root, root) %verify(not md5 size mtime) %ghost %{_texdir}/texmf-dist/ls-R
%attr(0644, root, root) %verify(not md5 size mtime) %ghost %{_texdir}/texmf-local/ls-R
%{_texdir}/texlive.tlpdb
@ -368,6 +368,14 @@ fi
%{_libdir}/*.so
%changelog
* Mon May 6 2013 Jindrich Novy <novyjindrich@gmail.com> - 2012-23-20130506
- don't conflict with ht package - ht binary is now called t4ht (#959696)
- require coreutils (#928566)
- update build scripts
- update symlink references tetex -> texlive
- handle texmf -> texmf-dist upstream move
- do proper obsoletion again
* Mon Apr 29 2013 Tom Callaway <spot@fedoraproject.org> - 2012-22-20130427
- obsolete/provide ctan-musixtex-fonts and tex-musixtex

File diff suppressed because it is too large Load Diff

140
tl2rpm.c
View File

@ -223,8 +223,7 @@ char *pkg_blacklist[] = {
};
char *rem[] = { /* any file beginning with this will be removed */
// "texmf/scripts/tlgs/gswin32",
"texmf/doc/info/kpathsea.info",
"texmf-dist/doc/info/kpathsea.info",
"texmf-dist/scripts/context/stubs/source",
"readme-txt.dir",
"tlpkg/installer",
@ -332,7 +331,7 @@ void parse() {
asprintf(&new_l, "texmf-dist%s", rel+5);
l = new_l;
}
if (!strncmp(l, "texmf/doc/man/man", 17)) { /* does package have any man pages? */
if (!strncmp(l, "texmf-dist/doc/man/man", 22)) { /* does package have any man pages? */
pkg[p-1].has_man = 1;
if ( l[strlen(l)-2] == '.' && l[strlen(l)-1] >= '0' && l[strlen(l)-1] <= '9' ) {
pkg[p-1].runf = realloc(pkg[p-1].runf, (pkg[p-1].runfs+1)*sizeof(char *));
@ -343,7 +342,7 @@ void parse() {
}
goto skip;
}
if (!strncmp(l, "texmf/doc/info/", 15)) { /* does package have any info pages? */
if (!strncmp(l, "texmf-dist/doc/info/", 20)) { /* does package have any info pages? */
pkg[p-1].has_info = 1;
if ( !strncmp(&l[strlen(l)-5], ".info", 5) ) {
pkg[p-1].runf = realloc(pkg[p-1].runf, (pkg[p-1].runfs+1)*sizeof(char *));
@ -608,13 +607,13 @@ int installed, srcno=100, mainsrcno = 6000, mainpkg;
FILE *fpack, *ffile, *funpack, *fsrc, *fremove, *ffont;
char *cnf_files[] = {
"texmf/web2c/fmtutil.cnf",
"texmf/web2c/updmap.cfg",
"texmf/web2c/texmf.cnf",
"texmf/web2c/context.cnf",
"texmf/web2c/mktex.cnf",
"texmf/dvips/config/config.ps", /* rhbz#441171 */
"texmf/tex/generic/config/language.dat",/* rhbz#929367 */
"texmf-dist/web2c/fmtutil.cnf",
"texmf-dist/web2c/updmap.cfg",
"texmf-dist/web2c/texmf.cnf",
"texmf-dist/web2c/context.cnf",
"texmf-dist/web2c/mktex.cnf",
"texmf-dist/dvips/config/config.ps", /* rhbz#441171 */
"texmf-dist/tex/generic/config/language.dat", /* rhbz#929367 */
NULL,
};
@ -705,35 +704,35 @@ void append_filelist( char *pkg, char *pkgsuf, int files, char **filelist, char
goto next;
}
}
if (!strncmp(&filelist[n][bin_index], "texmf/doc/man/man", 17)) { /* relocate man pages to correct paths */
if (!strncmp(&filelist[n][bin_index], "texmf-dist/doc/man/man", 22)) { /* relocate man pages to correct paths */
size_t sz = strlen(&filelist[n][bin_index]);
char *man = &filelist[n][bin_index];
if (man[sz-1] >= '0' && man[sz-1] <= '9') {
fprintf(ffile, "%%{_mandir}/%s*\n", &filelist[n][bin_index+14]);
fprintf(ffile, "%%{_mandir}/%s*\n", &filelist[n][bin_index+19]);
}
goto next;
}
if (!strncmp(&filelist[n][bin_index], "texmf/doc/info", 14)) { /* relocate path for info files, ignore all other files such as 'dir' */
if (!strncmp(&filelist[n][bin_index], "texmf-dist/doc/info", 19)) { /* relocate path for info files, ignore all other files such as 'dir' */
if (!strncmp(&filelist[n][strlen(filelist[n])-5], ".info", 5)) {
fprintf(ffile, "%%{_infodir}/%s*\n", &filelist[n][bin_index+15]);
fprintf(ffile, "%%{_infodir}/%s*\n", &filelist[n][bin_index+20]);
}
goto next;
}
if (!strcmp(&filelist[n][bin_index], "texmf/web2c/updmap.cfg")) {
if (!strcmp(&filelist[n][bin_index], "texmf-dist/web2c/updmap.cfg")) {
fprintf(fremove, "\n# disable all Maps/MixedMaps we add them by scriptlets\n");
fprintf(fremove, "sed -i '/^M/d' %%{buildroot}%%{_texdir}/texmf/web2c/updmap.cfg\n");
fprintf(fremove, "sed -i '/^M/d' %%{buildroot}%%{_texdir}/texmf-dist/web2c/updmap.cfg\n");
} else
if (!strcmp(&filelist[n][bin_index], "texmf/web2c/fmtutil.cnf")) {
if (!strcmp(&filelist[n][bin_index], "texmf-dist/web2c/fmtutil.cnf")) {
fprintf(fremove, "\n# disable all formats\n");
fprintf(fremove, "sed -i '/^[a-z].*$/s/^/\\#\\!\\ /' %%{buildroot}%%{_texdir}/texmf/web2c/fmtutil.cnf\n");
fprintf(fremove, "sed -i '/^[a-z].*$/s/^/\\#\\!\\ /' %%{buildroot}%%{_texdir}/texmf-dist/web2c/fmtutil.cnf\n");
} else
if (!strcmp(&filelist[n][bin_index], "texmf/tex/generic/config/language.us")) {
if (!strcmp(&filelist[n][bin_index], "texmf-dist/tex/generic/config/language.us")) {
fprintf(fremove, "\n# disable all hyphenations\n");
fprintf(fremove, "cp -f %%{buildroot}%%{_texdir}/texmf/tex/generic/config/language.us %%{buildroot}%%{_texdir}/texmf/tex/generic/config/language.dat\n");
fprintf(fremove, "cp -f %%{buildroot}%%{_texdir}/texmf-dist/tex/generic/config/language.us %%{buildroot}%%{_texdir}/texmf-dist/tex/generic/config/language.dat\n");
} else
if (!strcmp(&filelist[n][bin_index], "texmf/tex/generic/config/language.us.def")) {
if (!strcmp(&filelist[n][bin_index], "texmf-dist/tex/generic/config/language.us.def")) {
fprintf(fremove, "\n# disable all hyphenations\n");
fprintf(fremove, "cp -f %%{buildroot}%%{_texdir}/texmf/tex/generic/config/language.us.def %%{buildroot}%%{_texdir}/texmf/tex/generic/config/language.def\n");
fprintf(fremove, "cp -f %%{buildroot}%%{_texdir}/texmf-dist/tex/generic/config/language.us.def %%{buildroot}%%{_texdir}/texmf-dist/tex/generic/config/language.def\n");
}
{ /* add %config(noreplace) for config files */
int i;
@ -1154,6 +1153,7 @@ void solve(char *name) {
fprintf(fpack, "BuildArch: noarch\n");
fprintf(fsrc, "Source%04d: "CTAN_URL"%s.tar."UNPACK"\n", mainsrcno++, name);
fprintf(fpack, "Requires: texlive-base\n");
fprintf(fpack, REQ_POST_POSTUN"coreutils\n");
for (n=0; n<pkg[i].reqs; n++) {
if ( pkg[i].req[n] ) {
if ( pkg[i].req[n]->catalogue_license & LIC_NOTALLOWED ) {
@ -1201,7 +1201,7 @@ void solve(char *name) {
fprintf(fpack, "Provides: tex(latex-base) = %%{tl_version}\n");
} else if (!strcmp(name+11, "basic")) {
fprintf(fpack, "Provides: tex(tex) = %%{tl_version}, tex = %%{tl_version}\n");
fprintf(fpack, "Requires: dvipdfm, dvipdfmx, xdvik\n");
fprintf(fpack, "Requires: dvipdfmx, xdvik\n");
} else if (!strcmp(name+11, "langcjk")) {
fprintf(fpack, "Provides: tex(japanese) = %%{tl_version}\n");
fprintf(fpack, "Provides: tex(east-asian) = %%{tl_version}\n");
@ -1318,7 +1318,7 @@ void solve(char *name) {
fprintf(fpack, "Provides: kpathsea = %%{tl_version}\n");
fprintf(fpack, "Obsoletes: kpathsea < %%{tl_version}\n");
fprintf(funpack, "\n# add reference to support old texmf tree\n"
"sed -i 's|TEXMFLOCAL = $SELFAUTOPARENT/../texmf-local|TEXMFLOCAL = $SELFAUTOPARENT/../texmf|g' %%{buildroot}%%{_texdir}/texmf/web2c/texmf.cnf\n\n");
"sed -i 's|TEXMFLOCAL = $SELFAUTOPARENT/../texmf-local|TEXMFLOCAL = $SELFAUTOPARENT/../texmf|g' %%{buildroot}%%{_texdir}/texmf-dist/web2c/texmf.cnf\n\n");
}
if ( !strncmp(name, "asana-math", 10) ) {
fprintf(fpack, "Provides: texlive-Asana-Math = %%{tl_version}.1\n");
@ -1535,8 +1535,8 @@ void solve(char *name) {
#endif
fprintf(fpack, "if [ \"$1\" == \"0\" ]; then\n");
for (k=0; k<pkg[i].runfs; k++) {
if (!strncmp(pkg[i].runf[k], "texmf/doc/info/", 15)) {
fprintf(fpack, " /sbin/install-info --delete %%{_infodir}/%s %%{_infodir}/dir 2>/dev/null || :\n", &pkg[i].runf[k][15]);
if (!strncmp(pkg[i].runf[k], "texmf-dist/doc/info/", 20)) {
fprintf(fpack, " /sbin/install-info --delete %%{_infodir}/%s %%{_infodir}/dir 2>/dev/null || :\n", &pkg[i].runf[k][20]);
}
}
fprintf(fpack, "fi\n\n");
@ -1553,8 +1553,8 @@ void solve(char *name) {
int k;
for (k=0; k<pkg[i].runfs; k++) {
if (!strncmp(pkg[i].runf[k], "texmf/doc/info/", 15)) {
fprintf(fpack, "/sbin/install-info %%{_infodir}/%s %%{_infodir}/dir 2>/dev/null\n", &pkg[i].runf[k][15]);
if (!strncmp(pkg[i].runf[k], "texmf-dist/doc/info/", 20)) {
fprintf(fpack, "/sbin/install-info %%{_infodir}/%s %%{_infodir}/dir 2>/dev/null\n", &pkg[i].runf[k][20]);
}
}
}
@ -1564,25 +1564,25 @@ void solve(char *name) {
continue;
}
if ( !strncmp(pkg[i].exe[n], "addMap ", 7) ) {
fprintf(fpack, "sed -i '/^Map %s/d' %%{_texdir}/texmf/web2c/updmap.cfg\n", &pkg[i].exe[n][7]);
fprintf(fpack, "echo \"Map %s\" >> %%{_texdir}/texmf/web2c/updmap.cfg\n", &pkg[i].exe[n][7]);
fprintf(fpack, "sed -i '/^Map %s/d' %%{_texdir}/texmf-dist/web2c/updmap.cfg\n", &pkg[i].exe[n][7]);
fprintf(fpack, "echo \"Map %s\" >> %%{_texdir}/texmf-dist/web2c/updmap.cfg\n", &pkg[i].exe[n][7]);
run_updmap = 1;
continue;
}
if ( !strncmp(pkg[i].exe[n], "addMixedMap ", 12) ) {
fprintf(fpack, "sed -i '/^MixedMap %s/d' %%{_texdir}/texmf/web2c/updmap.cfg\n", &pkg[i].exe[n][12]);
fprintf(fpack, "echo \"MixedMap %s\" >> %%{_texdir}/texmf/web2c/updmap.cfg\n", &pkg[i].exe[n][12]);
fprintf(fpack, "sed -i '/^MixedMap %s/d' %%{_texdir}/texmf-dist/web2c/updmap.cfg\n", &pkg[i].exe[n][12]);
fprintf(fpack, "echo \"MixedMap %s\" >> %%{_texdir}/texmf-dist/web2c/updmap.cfg\n", &pkg[i].exe[n][12]);
run_updmap = 1;
continue;
}
if ( !strncmp(pkg[i].exe[n], "addKanjiMap ", 12) ) {
fprintf(fpack, "sed -i '/^KanjiMap %s/d' %%{_texdir}/texmf/web2c/updmap.cfg\n", &pkg[i].exe[n][12]);
fprintf(fpack, "echo \"KanjiMap %s\" >> %%{_texdir}/texmf/web2c/updmap.cfg\n", &pkg[i].exe[n][12]);
fprintf(fpack, "sed -i '/^KanjiMap %s/d' %%{_texdir}/texmf-dist/web2c/updmap.cfg\n", &pkg[i].exe[n][12]);
fprintf(fpack, "echo \"KanjiMap %s\" >> %%{_texdir}/texmf-dist/web2c/updmap.cfg\n", &pkg[i].exe[n][12]);
run_updmap = 1;
continue;
}
if ( !strncmp(pkg[i].exe[n], "BuildFormat ", 12) ) {
fprintf(fpack, "sed -i 's/^\\#\\!\\ %s/%s/' %%{_texdir}/texmf/web2c/fmtutil.cnf\n", &pkg[i].exe[n][12], &pkg[i].exe[n][12]);
fprintf(fpack, "sed -i 's/^\\#\\!\\ %s/%s/' %%{_texdir}/texmf-dist/web2c/fmtutil.cnf\n", &pkg[i].exe[n][12], &pkg[i].exe[n][12]);
run_fmtutil = 1;
continue;
}
@ -1614,7 +1614,7 @@ void solve(char *name) {
opt_char = *opt;
*opt = '\0';
fprintf(fpack, "sed -i 's/^\\#\\!\\ %s.*$/%s %s %s %s/' %%{_texdir}/texmf/web2c/fmtutil.cnf\n", name, name, engine, patterns?patterns:"-", options);
fprintf(fpack, "sed -i 's/^\\#\\!\\ %s.*$/%s %s %s %s/' %%{_texdir}/texmf-dist/web2c/fmtutil.cnf\n", name, name, engine, patterns?patterns:"-", options);
name[strlen(name)] = ' ';
engine[strlen(engine)] = ' ';
@ -1643,33 +1643,33 @@ void solve(char *name) {
file += 5;
for (k=10; pkg[i].exe[n][k]; k++) if ( pkg[i].exe[n][k] == ' ' ) pkg[i].exe[n][k] = '\0';
fprintf(fpack, "sed -i '/%s.*/d' %%{_texdir}/texmf/tex/generic/config/language.dat\n", name);
fprintf(fpack, "echo \"%s %s\" >> %%{_texdir}/texmf/tex/generic/config/language.dat\n", name, file);
fprintf(fpack, "sed -i '/%s.*/d' %%{_texdir}/texmf-dist/tex/generic/config/language.dat\n", name);
fprintf(fpack, "echo \"%s %s\" >> %%{_texdir}/texmf-dist/tex/generic/config/language.dat\n", name, file);
if ( synonyms ) {
char *syn = synonyms, *s;
while ( (s=strchr(syn, ',')) ) {
*s = '\0';
fprintf(fpack, "sed -i '/=%s/d' %%{_texdir}/texmf/tex/generic/config/language.dat\n", syn);
fprintf(fpack, "echo \"=%s\" >> %%{_texdir}/texmf/tex/generic/config/language.dat\n", syn);
fprintf(fpack, "sed -i '/=%s/d' %%{_texdir}/texmf-dist/tex/generic/config/language.dat\n", syn);
fprintf(fpack, "echo \"=%s\" >> %%{_texdir}/texmf-dist/tex/generic/config/language.dat\n", syn);
*s = ',';
syn = s+1;
}
fprintf(fpack, "sed -i '/=%s/d' %%{_texdir}/texmf/tex/generic/config/language.dat\n", syn);
fprintf(fpack, "echo \"=%s\" >> %%{_texdir}/texmf/tex/generic/config/language.dat\n", syn);
fprintf(fpack, "sed -i '/=%s/d' %%{_texdir}/texmf-dist/tex/generic/config/language.dat\n", syn);
fprintf(fpack, "echo \"=%s\" >> %%{_texdir}/texmf-dist/tex/generic/config/language.dat\n", syn);
}
fprintf(fpack, "sed -i '/\\\\addlanguage{%s}.*/d' %%{_texdir}/texmf/tex/generic/config/language.def\n", name);
fprintf(fpack, "echo \"\\addlanguage{%s}{%s}{}{%s}{%s}\" >> %%{_texdir}/texmf/tex/generic/config/language.def\n", name, file, lefthyphenmin, righthyphenmin);
fprintf(fpack, "sed -i '/\\\\addlanguage{%s}.*/d' %%{_texdir}/texmf-dist/tex/generic/config/language.def\n", name);
fprintf(fpack, "echo \"\\addlanguage{%s}{%s}{}{%s}{%s}\" >> %%{_texdir}/texmf-dist/tex/generic/config/language.def\n", name, file, lefthyphenmin, righthyphenmin);
if ( synonyms ) {
char *syn = synonyms, *s;
while ( (s=strchr(syn, ',')) ) {
*s = '\0';
fprintf(fpack, "sed -i '/\\\\addlanguage{%s}.*/d' %%{_texdir}/texmf/tex/generic/config/language.def\n", syn);
fprintf(fpack, "echo \"\\addlanguage{%s}{%s}{}{%s}{%s}\" >> %%{_texdir}/texmf/tex/generic/config/language.def\n", syn, file, lefthyphenmin, righthyphenmin);
fprintf(fpack, "sed -i '/\\\\addlanguage{%s}.*/d' %%{_texdir}/texmf-dist/tex/generic/config/language.def\n", syn);
fprintf(fpack, "echo \"\\addlanguage{%s}{%s}{}{%s}{%s}\" >> %%{_texdir}/texmf-dist/tex/generic/config/language.def\n", syn, file, lefthyphenmin, righthyphenmin);
*s = ',';
syn = s+1;
}
fprintf(fpack, "sed -i '/\\\\addlanguage{%s}.*/d' %%{_texdir}/texmf/tex/generic/config/language.def\n", syn);
fprintf(fpack, "echo \"\\addlanguage{%s}{%s}{}{%s}{%s}\" >> %%{_texdir}/texmf/tex/generic/config/language.def\n", syn, file, lefthyphenmin, righthyphenmin);
fprintf(fpack, "sed -i '/\\\\addlanguage{%s}.*/d' %%{_texdir}/texmf-dist/tex/generic/config/language.def\n", syn);
fprintf(fpack, "echo \"\\addlanguage{%s}{%s}{}{%s}{%s}\" >> %%{_texdir}/texmf-dist/tex/generic/config/language.def\n", syn, file, lefthyphenmin, righthyphenmin);
}
for (--k; k>=10; k--) if ( pkg[i].exe[n][k] == '\0' ) pkg[i].exe[n][k] = ' ';
run_fmtutil = 1;
@ -1693,22 +1693,22 @@ void solve(char *name) {
continue;
}
if ( !strncmp(pkg[i].exe[n], "addMap ", 7) ) {
fprintf(fpack, "sed -i '/^Map %s/d' %%{_texdir}/texmf/web2c/updmap.cfg > /dev/null 2>&1\n", &pkg[i].exe[n][7]);
fprintf(fpack, "sed -i '/^Map %s/d' %%{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1\n", &pkg[i].exe[n][7]);
run_updmap = 1;
continue;
}
if ( !strncmp(pkg[i].exe[n], "addMixedMap ", 12) ) {
fprintf(fpack, "sed -i '/^MixedMap %s/d' %%{_texdir}/texmf/web2c/updmap.cfg > /dev/null 2>&1\n", &pkg[i].exe[n][12]);
fprintf(fpack, "sed -i '/^MixedMap %s/d' %%{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1\n", &pkg[i].exe[n][12]);
run_updmap = 1;
continue;
}
if ( !strncmp(pkg[i].exe[n], "addKanjiMap ", 12) ) {
fprintf(fpack, "sed -i '/^KanjiMap %s/d' %%{_texdir}/texmf/web2c/updmap.cfg > /dev/null 2>&1\n", &pkg[i].exe[n][12]);
fprintf(fpack, "sed -i '/^KanjiMap %s/d' %%{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1\n", &pkg[i].exe[n][12]);
run_updmap = 1;
continue;
}
if ( !strncmp(pkg[i].exe[n], "BuildFormat ", 12) ) {
fprintf(fpack, "sed -i 's/^%s.*$/\\#\\!\\ %s/' %%{_texdir}/texmf/web2c/fmtutil.cnf > /dev/null 2>&1\n", &pkg[i].exe[n][12], &pkg[i].exe[n][12]);
fprintf(fpack, "sed -i 's/^%s.*$/\\#\\!\\ %s/' %%{_texdir}/texmf-dist/web2c/fmtutil.cnf > /dev/null 2>&1\n", &pkg[i].exe[n][12], &pkg[i].exe[n][12]);
run_fmtutil = 1;
continue;
}
@ -1740,7 +1740,7 @@ void solve(char *name) {
opt_char = *opt;
*opt = '\0';
fprintf(fpack, "sed -i 's/^%s.*$/\\#\\!\\ %s %s %s %s/' %%{_texdir}/texmf/web2c/fmtutil.cnf > /dev/null 2>&1\n", name, name, engine, patterns?patterns:"-", options);
fprintf(fpack, "sed -i 's/^%s.*$/\\#\\!\\ %s %s %s %s/' %%{_texdir}/texmf-dist/web2c/fmtutil.cnf > /dev/null 2>&1\n", name, name, engine, patterns?patterns:"-", options);
name[strlen(name)] = ' ';
engine[strlen(engine)] = ' ';
@ -1769,27 +1769,27 @@ void solve(char *name) {
file += 5;
for (k=10; pkg[i].exe[n][k]; k++) if ( pkg[i].exe[n][k] == ' ' ) pkg[i].exe[n][k] = '\0';
fprintf(fpack, "sed -i '/%s.*/d' %%{_texdir}/texmf/tex/generic/config/language.dat > /dev/null 2>&1\n", name);
fprintf(fpack, "sed -i '/%s.*/d' %%{_texdir}/texmf-dist/tex/generic/config/language.dat > /dev/null 2>&1\n", name);
if ( synonyms ) {
char *syn = synonyms, *s;
while ( (s=strchr(syn, ',')) ) {
*s = '\0';
fprintf(fpack, " sed -i '/=%s/d' %%{_texdir}/texmf/tex/generic/config/language.dat > /dev/null 2>&1\n", syn);
fprintf(fpack, " sed -i '/=%s/d' %%{_texdir}/texmf-dist/tex/generic/config/language.dat > /dev/null 2>&1\n", syn);
*s = ',';
syn = s+1;
}
fprintf(fpack, " sed -i '/=%s/d' %%{_texdir}/texmf/tex/generic/config/language.dat > /dev/null 2>&1\n", syn);
fprintf(fpack, " sed -i '/=%s/d' %%{_texdir}/texmf-dist/tex/generic/config/language.dat > /dev/null 2>&1\n", syn);
}
fprintf(fpack, "sed -i '/\\\\addlanguage{%s}.*/d' %%{_texdir}/texmf/tex/generic/config/language.def > /dev/null 2>&1\n", name);
fprintf(fpack, "sed -i '/\\\\addlanguage{%s}.*/d' %%{_texdir}/texmf-dist/tex/generic/config/language.def > /dev/null 2>&1\n", name);
if ( synonyms ) {
char *syn = synonyms, *s;
while ( (s=strchr(syn, ',')) ) {
*s = '\0';
fprintf(fpack, "sed -i '/\\\\addlanguage{%s}.*/d' %%{_texdir}/texmf/tex/generic/config/language.def > /dev/null 2>&1\n", syn);
fprintf(fpack, "sed -i '/\\\\addlanguage{%s}.*/d' %%{_texdir}/texmf-dist/tex/generic/config/language.def > /dev/null 2>&1\n", syn);
*s = ',';
syn = s+1;
}
fprintf(fpack, "sed -i '/\\\\addlanguage{%s}.*/d' %%{_texdir}/texmf/tex/generic/config/language.def > /dev/null 2>&1\n", syn);
fprintf(fpack, "sed -i '/\\\\addlanguage{%s}.*/d' %%{_texdir}/texmf-dist/tex/generic/config/language.def > /dev/null 2>&1\n", syn);
}
for (--k; k>=10; k--) if ( pkg[i].exe[n][k] == '\0' ) pkg[i].exe[n][k] = ' ';
run_fmtutil = 1;
@ -1808,7 +1808,7 @@ void solve(char *name) {
fprintf(fpack, "if [ -e /var/run/texlive/run-texhash ]; then %%{_bindir}/texhash 2> /dev/null; rm -f /var/run/texlive/run-texhash; fi\n");
if ( run_updmap ) fprintf(fpack, "if [ -e /var/run/texlive/run-updmap ]; then %%{_bindir}/updmap-sys --syncwithtrees --nohash --quiet &> /dev/null; rm -f /var/run/texlive/run-updmap; fi\n");
if ( run_fmtutil ) fprintf(fpack, "if [ -e /var/run/texlive/run-fmtutil ]; then %%{_bindir}/fmtutil-sys --all &> /dev/null; rm -f /var/run/texlive/run-fmtutil; fi\n");
fprintf(fpack, "if [ -e /var/run/texlive/run-mtxrun ]; then export TEXMF=/usr/share/texlive/texmf-dist; export TEXMFCNF=/usr/share/texlive/texmf/web2c; export TEXMFCACHE=/var/lib/texmf; %%{_bindir}/mtxrun --generate &> /dev/null; rm -f /var/run/texlive/run-mtxrun; fi\n");
fprintf(fpack, "if [ -e /var/run/texlive/run-mtxrun ]; then export TEXMF=/usr/share/texlive/texmf-dist; export TEXMFCNF=/usr/share/texlive/texmf-dist/web2c; export TEXMFCACHE=/var/lib/texmf; %%{_bindir}/mtxrun --generate &> /dev/null; rm -f /var/run/texlive/run-mtxrun; fi\n");
fprintf(fpack, ":\n\n");
} else if ( pkg[i].runfs ) {
#ifndef SRPMS
@ -1821,8 +1821,8 @@ void solve(char *name) {
int k;
for (k=0; k<pkg[i].runfs; k++) {
if (!strncmp(pkg[i].runf[k], "texmf/doc/info/", 15)) {
fprintf(fpack, "/sbin/install-info %%{_infodir}/%s %%{_infodir}/dir 2>/dev/null\n", &pkg[i].runf[k][15]);
if (!strncmp(pkg[i].runf[k], "texmf-dist/doc/info/", 20)) {
fprintf(fpack, "/sbin/install-info %%{_infodir}/%s %%{_infodir}/dir 2>/dev/null\n", &pkg[i].runf[k][20]);
}
}
}
@ -1840,7 +1840,7 @@ void solve(char *name) {
fprintf(fpack, "%%posttrans\n");
#endif
fprintf(fpack, "if [ -e /var/run/texlive/run-texhash ] && [ -e %%{_bindir}/texhash ]; then %%{_bindir}/texhash 2> /dev/null; rm -f /var/run/texlive/run-texhash; fi\n");
fprintf(fpack, "if [ -e /var/run/texlive/run-mtxrun ]; then export TEXMF=/usr/share/texlive/texmf-dist; export TEXMFCNF=/usr/share/texlive/texmf/web2c; export TEXMFCACHE=/var/lib/texmf; %%{_bindir}/mtxrun --generate &> /dev/null; rm -f /var/run/texlive/run-mtxrun; fi\n");
fprintf(fpack, "if [ -e /var/run/texlive/run-mtxrun ]; then export TEXMF=/usr/share/texlive/texmf-dist; export TEXMFCNF=/usr/share/texlive/texmf-dist/web2c; export TEXMFCACHE=/var/lib/texmf; %%{_bindir}/mtxrun --generate &> /dev/null; rm -f /var/run/texlive/run-mtxrun; fi\n");
fprintf(fpack, ":\n\n");
}
@ -2022,11 +2022,11 @@ void solve(char *name) {
#ifdef SRPMS
if (pkg[i].has_man) {
fprintf(fremove, "mkdir -p %%{buildroot}/%%{_datadir}/\n");
fprintf(fremove, "mv %%{buildroot}/%%{_texdir}/texmf/doc/man %%{buildroot}/%%{_datadir}/\n");
fprintf(fremove, "mv %%{buildroot}/%%{_texdir}/texmf-dist/doc/man %%{buildroot}/%%{_datadir}/\n");
}
if (pkg[i].has_info) {
fprintf(fremove, "mkdir -p %%{buildroot}/%%{_infodir}/\n");
fprintf(fremove, "mv %%{buildroot}/%%{_texdir}/texmf/doc/info/* %%{buildroot}/%%{_infodir}/\n");
fprintf(fremove, "mv %%{buildroot}/%%{_texdir}/texmf-dist/doc/info/* %%{buildroot}/%%{_infodir}/\n");
}
#endif
#ifdef SRPMS
@ -2060,13 +2060,9 @@ void solve(char *name) {
fprintf(fpack, "Provides: xdvipdfmx = %%{version}-%%{release}\n");
fprintf(fpack, "Obsoletes: xdvipdfmx < %%{version}-%%{release}\n");
}
if ( !strcmp(name, "dvipdfm") ) {
fprintf(fpack, "Provides: dvipdfm = %%{tl_version}\n");
fprintf(fpack, "Obsoletes: dvipdfm < %%{tl_version}\n");
}
if ( !strcmp(name, "dvipdfmx") ) {
fprintf(fpack, "Provides: dvipdfmx = %%{tl_version}\n");
fprintf(fpack, "Obsoletes: dvipdfmx < %%{tl_version}\n");
fprintf(fpack, "Provides: dvipdfmx = %%{tl_version}, dvipdfm = %%{tl_version}\n");
fprintf(fpack, "Obsoletes: dvipdfmx < %%{tl_version}, dvipdfm < %%{tl_version}\n");
}
if ( !strcmp(name, "xdvi") ) {
fprintf(fpack, "Provides: xdvi = %%{tl_version}, xdvik = %%{tl_version}, tetex-xdvi = 3.1-99\n");

File diff suppressed because it is too large Load Diff