rpms/texlive-texmf/devel texlive.2007.ls-R, NONE, 1.1 texlive-texmf.spec, 1.10, 1.11 texlive.2007.ls-R-japanese, 1.1, NONE

Jindrich Novy (jnovy) fedora-extras-commits at redhat.com
Mon Jan 28 07:24:02 UTC 2008


Author: jnovy

Update of /cvs/extras/rpms/texlive-texmf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24483

Modified Files:
	texlive-texmf.spec 
Added Files:
	texlive.2007.ls-R 
Removed Files:
	texlive.2007.ls-R-japanese 
Log Message:
* Mon Jan 28 2008 Jindrich Novy <jnovy at redhat.com> - 2007-10
- BR: texinfo-tex
- package Japanese separately -> texlive-texmf-japanese
- prevent packaging patch backups
- correct directory/file permissions in less wasteful way to
  increase build speed
- run only brp-compress



--- NEW FILE texlive.2007.ls-R ---
% ls-R -- filename database for kpathsea; do not change this line.
./:
.:
bibtex
context
default.ls-R
doc
dvipdfm
dvips
fmtutil
fonts
jbibtex
ls-R
makeindex
metafont
metapost
omega
pdvips
ptex
pxdvi
scripts
tex
texconfig
texdoctk
vtex
web2c
xdvi

./bibtex:
bib
bst
csf

./bibtex/bib:
adrconv
base
bibtopic
camel
dk-bib
dtk
gloss
gustlib
index
jurabib
minitoc
revtex

./bibtex/bib/adrconv:
example.bib

./bibtex/bib/base:
xampl.bib

./bibtex/bib/bibtopic:
articles.bib
books.bib

./bibtex/bib/camel:
camel.bib

./bibtex/bib/dk-bib:
litteratur.bib

./bibtex/bib/dtk:
beispiel.bib
dtk.bib

./bibtex/bib/gloss:
glsbase.bib
sample.bib

./bibtex/bib/gustlib:
plbib.bib

./bibtex/bib/index:
test.bib

./bibtex/bib/jurabib:
book.bib
comment.bib
jbtest.bib
jbtesthu.bib

./bibtex/bib/minitoc:
fminitoc.bib
minitoc.bib
mtc-add.bib

./bibtex/bib/revtex:
apssamp.bib

./bibtex/bst:
adrconv
aguplus
ams
base
camel
context
dk-bib
dtk
germbib
gloss
gustlib
index
jurabib
minitoc
multibib
natbib
revtex

./bibtex/bst/adrconv:
adrconv.bst
adrfax.bst
birthday.bst
email.bst

./bibtex/bst/aguplus:
agu.bst
agufull.bst

./bibtex/bst/ams:
amsalpha.bst
amsplain.bst
amsra.bst
amsrn.bst
amsrs.bst
amsru.bst
amsry.bst

./bibtex/bst/base:
abbrv.bst
acm.bst
alpha.bst
apalike.bst
ieeetr.bst
plain.bst
siam.bst
unsrt.bst

./bibtex/bst/camel:
law.bst

./bibtex/bst/context:
cont-ab.bst
cont-au.bst
cont-no.bst
cont-ti.bst

./bibtex/bst/dk-bib:
dk-abbrv.bst
dk-alpha.bst
dk-apali.bst
dk-plain.bst
dk-unsrt.bst

./bibtex/bst/dtk:
dtk.bst

./bibtex/bst/germbib:
gerabbrv.bst
geralpha.bst
gerapali.bst
gerplain.bst
gerunsrt.bst

./bibtex/bst/gloss:
glsplain.bst
glsshort.bst

./bibtex/bst/gustlib:
plabbrv.bst
plalpha.bst
plplain.bst
plunsrt.bst

./bibtex/bst/index:
xagsm.bst
xplain.bst

./bibtex/bst/jurabib:
jox.bst
jurabib.bst
jureco.bst
jurunsrt.bst

./bibtex/bst/minitoc:
en-mtc.bst
fr-mtc.bst

./bibtex/bst/multibib:
mbplain.bst

./bibtex/bst/natbib:
abbrvnat.bst
plainnat.bst
unsrtnat.bst

./bibtex/bst/revtex:
apsrev.bst
[...25084 lines suppressed...]
pgfbaseshapes.tex
pgfbasesnakes.tex
pgfcore.tex
pgf.tex

./tex/plain/pgf/frontendlayer:
tikz.tex

./tex/plain/pgf/systemlayer:
pgfsys.tex

./tex/plain/pgf/utilities:
pgffor.tex
pgfrcs.tex

./tex/plain/plgraph:
autopict.sty
color.tex
graphicx.tex
miniltx.tex
picture.tex
psfrag.tex

./tex/plain/plnfss:
ams.pfd
il2cm.pfd
il2cmr.pfd
ly1lm.pfd
MIKmathf.tex
ot1cm.pfd
ot1cmr.pfd
ot4cm.pfd
plnfss.tex
qxlm.pfd
t1lm.pfd
t5cm.pfd
t5cmr.pfd
t5lm.pfd
ts1lm.pfd

./tex/plain/rsfs:
scrload.tex

./tex/plain/vertex:
aer.sty
ecnmet.sty
fntest.tex
jepcont.tex
jep.sty
jet.sty
jpe.sty
ppt.sty
qje.sty
restud.sty
test.tex
twocol.tex
vertest.tex
vertex.tex

./tex/plain/vntex:
dblaccnt.tex
t5code.tex
vntexinfo.tex

./tex/plain/wasy:
wasyfont.tex

./tex/platex:
config

./tex/platex/config:
hyphen.cfg
language.dat
pdfplatex-pl.ini
platex-pl.ini

./tex/texinfo:
texinfo.tex
txi-cs.tex
txi-de.tex
txi-en.tex
txi-es.tex
txi-fr.tex
txi-it.tex
txi-nl.tex
txi-no.tex
txi-pl.tex
txi-pt.tex
txi-ru.tex
txi-sr.tex
txi-tr.tex
txi-uk.tex

./tex/xelatex:
graphics
xetexconfig
xetexurl

./tex/xelatex/graphics:
xetex.def

./tex/xelatex/xetexconfig:
crop.cfg
geometry.cfg

./tex/xelatex/xetexurl:
url.sty

./texconfig:
g
generic
README
tcfmgr
tcfmgr.map
v
x

./texconfig/g:
generic

./texconfig/v:
vt100

./texconfig/x:
xterm

./texdoctk:
texdocrc.defaults
texdoctk.dat

./vtex:
config

./vtex/config:
lucidabr.ali
lucidabr-k.ali
lumath.ali
lumath-k.ali
uaq.ali
ugq.ali

./web2c:
aleph.pool
amiga-pl.tcx
context.cnf
cp1250cs.tcx
cp1250pl.tcx
cp1250t1.tcx
cp227.tcx
cp852-cs.tcx
cp852-pl.tcx
cp8bit.tcx
empty.tcx
etex
fmtutil.cnf
il1-t1.tcx
il2-cs.tcx
il2-pl.tcx
il2-t1.tcx
kam-cs.tcx
kam-t1.tcx
macce-pl.tcx
macce-t1.tcx
maz-pl.tcx
mf.pool
mktex.cnf
mktexdir
mktexnam
mktexnam.opt
mktex.opt
mktexupd
natural.tcx
omega.pool
pdfetex
pdftex.pool
ptex.pool
tcvn-t5.tcx
texmf.cnf
tex.pool
updmap.cfg
updmap.cfg.old
viscii-t5.tcx
xetex.pool

./web2c/etex:
jadetex.fmt
jadetex.log

./web2c/pdfetex:
pdfjadetex.fmt
pdfjadetex.log

./xdvi:
pixmaps
XDvi
xdvi.cfg

./xdvi/pixmaps:
toolbar2.xpm
toolbar.xpm


Index: texlive-texmf.spec
===================================================================
RCS file: /cvs/extras/rpms/texlive-texmf/devel/texlive-texmf.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- texlive-texmf.spec	25 Jan 2008 08:25:40 -0000	1.10
+++ texlive-texmf.spec	28 Jan 2008 07:23:26 -0000	1.11
@@ -6,12 +6,12 @@
 %{!?_texmf_var: %global _texmf_var  %{_var}/lib/texmf}
 %{!?_texmf_conf: %global _texmf_conf %{_sysconfdir}/texmf}
 %{!?_texmf_local: %global _texmf_local %{_usr}/local/share/texmf}
-%define	enable_japanese	1
+
 %define	ptex_texmf_ver 2.5
 
 Name:		texlive-texmf
 Version:	2007
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	Architecture independent parts of the TeX formatting system
 
 Group:		Applications/Publishing
@@ -27,11 +27,7 @@
 Source1:	texlive.texmf-var-%{version}.zip
 
 # pregenerated kpathsea ls-R files in case no binary TeXLive is present to regenerate them
-%if %{enable_japanese}
-Source10:	texlive.%{version}.ls-R-japanese
-%else
 Source10:	texlive.%{version}.ls-R
-%endif
 Source11:	texlive.var.%{version}.ls-R
 
 # missing files (note - Fedora installs this with a patch)
@@ -44,6 +40,9 @@
 Source99: texlive-filter-requires.sh
 %define __perl_requires %{SOURCE99}
 
+# speed up build, run only brp-compress, nothing else is needed
+%define __os_install_post /usr/lib/rpm/redhat/brp-compress %{nil}
+
 # Source1000-: Japanese pTeX
 Source1000: ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/ptex-texmf-%{ptex_texmf_ver}.tar.gz
 Source1001: ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/platex/platex209.tar.bz2
@@ -64,6 +63,7 @@
 Requires:	texlive-texmf-errata = %{version}
 Requires:	xdg-utils
 Requires:	tex-preview
+Requires:	texinfo-tex
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -129,6 +129,14 @@
 This package contains the components of the TEXMF tree needed for the
 texlive-latex package.
 
+%package japanese
+Group:		Applications/Publishing
+Summary:	Texmf files needed for texlive-japanese
+Requires:	texlive-texmf = %{version}-%{release}
+
+%description japanese
+Architecture independent files for Japanese support in TeXLive.
+
 %prep
 %setup -q -c
 
@@ -136,8 +144,8 @@
 unzip -d texmf-var %{SOURCE1}
 install -p -m644 %{SOURCE50} texmf-var/dvips/config/config.generic
 
-%patch0  -p0 -b .badenv
-%patch1  -p0 -b .tkdefaults
+%patch0  -p0
+%patch1  -p0
 %patch2  -p1
 %patch3  -p1
 
@@ -153,7 +161,6 @@
 rm -rf texmf/scripts/pdfcrop
 
 # Japanese pTeX
-%if %{enable_japanese}
 # set platex to Japanese pLaTeX. original one is moved to platex-pl
 cd texmf-dist/tex/platex/config
 for i in *.ini ; do
@@ -191,7 +198,6 @@
 rm -rf pdvipsk-font
 # Prepare texmf.cnf
 %patch1001 -p0
-%endif
 
 %build
 # not compiling anything, but this stuff isn't really %%prep or %%install
@@ -212,9 +218,13 @@
 popd
 
 # nuke these
-rm -f  texmf/web2c/texmf.cnf-4WIN
-rm -f  texmf/web2c/texmf.cnf.orig
-rm -f  texmf/texdoctk/texdocrc-win32.defaults
+rm -f texmf/web2c/texmf.cnf-4WIN
+rm -f texmf/web2c/texmf.cnf.orig
+rm -f texmf/texdoctk/texdocrc-win32.defaults
+rm -f texmf/ptex/platex/base/.cvsignore
+rm -f texmf-dist/doc/latex/newlfm/*.bat
+rm -f texmf-dist/doc/generic/t2/etc/rumkidx/*.bat
+rm -f texmf-dist/tex/plain/cyrplain/makefmts.bat
 
 install -d -m755 texmf-var/fonts/map/{dvipdfm,dvips,pdftex}/updmap
 
@@ -227,6 +237,7 @@
 rm -rf texmf-dist/fonts/pk && mkdir texmf-dist/fonts/pk
 rm -rf texmf/doc/man
 rm -rf texmf-dist/doc/man
+rm -rf texmf-dist/scripts/context/stubs/mswin
 
 # We want these but in the right place
 mv texmf/doc/info/tds.info .
@@ -243,21 +254,17 @@
 popd
 
 # fix the bloody permissions - Grrrr
-for toplevel in texmf texmf-dist texmf-var; do
-  for directory in `find ${toplevel} -type d -print`; do
-    chmod 755 ${directory}
-  done
-  for file in `find ${toplevel} -type f -print`; do
-    if [ ! -x ${file} ]; then
-      chmod 644 ${file}
-    else
-      chmod 755 ${file}
-    fi
-  done
-done
-
+chmod 644 \
+  texmf-dist/scripts/oberdiek/pdfatfi.pl texmf-dist/doc/generic/enctex/unimap.py \
+  texmf-dist/doc/latex/minitoc/{emk,fmk,imk,pmk,rmk,tmk,xmk} texmf-dist/doc/latex/multibib/bibtexall \
+  texmf-dist/doc/generic/pstricks-add/examples/{dataI.dat,dataII.dat}
+chmod 755 texmf-var/{tex,dvipdfm,dvipdfm/config,dvips,dvips/config} texmf-var/tex \
+  texmf-var/tex/{plain,plain/config,context,context/config,generic,generic/config} \
+  
 # fix the ruby scripts
-for ruby in `find texmf-dist/scripts/context/ruby/ -name *.rb`; do
+for ruby in `find texmf-dist/scripts/context/ruby/ -name *.rb` \
+	    texmf-dist/scripts/context/stubs/unix/* \
+	    ; do
   if [ `head -1 $ruby |grep -c "^#!"` -eq 1 ]; then
     chmod 755 ${ruby}
   else
@@ -277,16 +284,6 @@
 ln -s ../../../scripts/hyphen/sh/bahyph.sh .
 popd
 
-# there should be no executable documentation files, and no shell bangs
-for toplevel in texmf texmf-dist; do
-  for file in `find ${toplevel}/doc -type f`; do
-    chmod 644 ${file}
-    if [ `head -1 ${file} |grep -c "^#!"` -eq 1 ]; then
-      %{__sed} -i '0,/^#!/s//##/' ${file}
-    fi
-  done
-done
-
 # these files owned by binary texlive package
 rm -f texmf/web2c/pdfetex-pl.pool
 rm -f texmf/web2c/pdfetex.pool
@@ -424,6 +421,9 @@
 %post doc
 [ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
 
+%post japanese
+[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
+
 %preun
 if [ "$1" = 0 ]; then
   [ -x /sbin/install-info ] && /sbin/install-info --delete %{_infodir}/tds.info.gz %{_infodir}/dir || :
@@ -505,12 +505,6 @@
 %{_texmf_main}/web2c/*.cfg
 %config(noreplace) %{_texmf_conf}/web2c/*.cnf
 %{_texmf_main}/web2c/*.pool
-# Japanese pTeX
-%if %{enable_japanese}
-%dir %{_texmf_main}/ptex
-%{_texmf_main}/jbibtex
-%{_texmf_main}/ptex/plain
-%endif
 # var
 %config(noreplace) %{_texmf_var}/xdvi/XDvi
 %config(noreplace) %{_texmf_var}/web2c/mktex.cnf
@@ -550,10 +544,17 @@
 # conf
 %dir %{_texmf_conf}
 %dir %{_texmf_conf}/web2c
-%config(noreplace) %{_texmf_conf}/web2c/mktex.cnf
 # texmf-var
 %{_texmf_var}/default.ls-R
 
+%files japanese
+%defattr(-,root,root,-)
+%dir %{_texmf_main}/ptex
+%{_texmf_main}/jbibtex
+%{_texmf_main}/ptex/plain
+%{_texmf_main}/ptex/platex
+%{_texmf_main}/ptex/platex209
+
 %files afm
 %defattr(-,root,root,-)
 %{_texmf_main}/fonts/afm/
@@ -604,17 +605,20 @@
 %{_texmf_main}/tex/platex/
 %{_texmf_main}/tex/xelatex/
 %{_texmf_main}/context/data/latex-scite.properties
-# Japanese pTeX
-%if %{enable_japanese}
-%{_texmf_main}/ptex/platex
-%{_texmf_main}/ptex/platex209
-%endif
 
 %files doc
 %defattr(-,root,root,-)
 %doc %{_texmf_main}/doc/
 
 %changelog
+* Mon Jan 28 2008 Jindrich Novy <jnovy at redhat.com> - 2007-10
+- BR: texinfo-tex
+- package Japanese separately -> texlive-texmf-japanese
+- prevent packaging patch backups
+- correct directory/file permissions in less wasteful way to
+  increase build speed
+- run only brp-compress
+
 * Fri Jan 25 2008 Jindrich Novy <jnovy at redhat.com> - 2007-9
 - remove $TEXMFMAIN/tex/texinfo to not to clash with texinfo (#226488)
 


--- texlive.2007.ls-R-japanese DELETED ---




More information about the fedora-extras-commits mailing list