rpms/texlive-texmf/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 texlive-texmf.spec, 1.12, 1.13 texlive.2007.zip.list, 1.1, 1.2

Jindrich Novy (jnovy) fedora-extras-commits at redhat.com
Tue Feb 19 15:49:19 UTC 2008


Author: jnovy

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

Modified Files:
	.cvsignore sources texlive-texmf.spec texlive.2007.zip.list 
Log Message:
* Sun Feb 17 2008 Jindrich Novy <jnovy at redhat.com> - 2007-12
- package bigfoot, erroneously missing from the original
  TeX Live 2007 (#426507)
- remove references to cm-super fonts from map files to make
  dvips work correctly (#431182)
- package ConTeXt separately to texlive-texmf-context to get
  rid of the ruby dependency
- move from bz2 to lzma to save space
- move font stuff out of the dvips subpackage



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/texlive-texmf/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Dec 2007 11:01:59 -0000	1.2
+++ .cvsignore	19 Feb 2008 15:48:44 -0000	1.3
@@ -1,5 +1,5 @@
 dvipsk-jfontimage.tar.bz2
 platex209.tar.bz2
 ptex-texmf-2.5.tar.gz
-texlive.texmf-2007.tar.bz2
 texlive.texmf-var-2007.zip
+texlive.texmf-2007.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/texlive-texmf/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Dec 2007 11:01:59 -0000	1.2
+++ sources	19 Feb 2008 15:48:44 -0000	1.3
@@ -1,5 +1,5 @@
 b6548ab2546370a8eb88cc00d7529c82  dvipsk-jfontimage.tar.bz2
 c24f99d1fd399acecc2f3070c23f43f1  platex209.tar.bz2
 9eb48ecb66cfd626865222564545de1c  ptex-texmf-2.5.tar.gz
-110f0985202f3d5f14f3f71e43e66dc6  texlive.texmf-2007.tar.bz2
 97c26c0067177fb633616f8611561bc7  texlive.texmf-var-2007.zip
+8b55aac6ced3c248d17ab588ac3f276d  texlive.texmf-2007.tar.lzma


Index: texlive-texmf.spec
===================================================================
RCS file: /cvs/extras/rpms/texlive-texmf/devel/texlive-texmf.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- texlive-texmf.spec	5 Feb 2008 16:51:02 -0000	1.12
+++ texlive-texmf.spec	19 Feb 2008 15:48:44 -0000	1.13
@@ -8,10 +8,11 @@
 %{!?_texmf_local: %global _texmf_local %{_usr}/local/share/texmf}
 
 %define	ptex_texmf_ver 2.5
+%define	f8_packaging 0
 
 Name:		texlive-texmf
 Version:	2007
-Release:	11%{?dist}
+Release:	12%{?dist}
 Summary:	Architecture independent parts of the TeX formatting system
 
 Group:		Applications/Publishing
@@ -22,7 +23,7 @@
 # TeXLive styles to it so that no style present in teTeX will be missing in TeXLive.
 # it contains expanded packages from ftp://tug.org/texlive/Contents/inst/archive/
 # Scripts that are used for that are available at http://people.redhat.com/jnovy/files/texlive/scripts/
-Source0:	texlive.texmf-%{version}.tar.bz2
+Source0:	texlive.texmf-%{version}.tar.lzma
 # Source1 is http://www.tug.org/texlive/Contents/inst/archive/texmf-var.zip
 Source1:	texlive.texmf-var-%{version}.zip
 
@@ -58,7 +59,7 @@
 # Patch1000-: Japanese pTeX
 Patch1001: texlive-2007-texmf.cnf-ptex.patch
 
-BuildRequires:  sed >= 3.95 ghostscript
+BuildRequires:  sed >= 3.95 ghostscript lzma
 
 Requires:	texlive-texmf-errata = %{version}
 Requires:	xdg-utils
@@ -135,8 +136,19 @@
 %description japanese
 Architecture independent files for Japanese support in TeXLive.
 
+%package context
+Group:		Applications/Publishing
+Summary:	Texmf files needed for ConTeXt
+Requires:	texlive-texmf = %{version}-%{release}
+Requires:	texlive-texmf-errata-context = %{version}
+
+%description context
+This package contains the components of the TEXMF tree needed for the
+texlive-context package.
+
 %prep
-%setup -q -c
+%setup -q -c -T
+unlzma -c %{SOURCE0} | tar fx -
 
 mkdir texmf-var
 unzip -d texmf-var %{SOURCE1}
@@ -257,19 +269,28 @@
   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
+  texmf-var/tex/{plain,plain/config,context,context/config,generic,generic/config}
+
+# fix the ConTeXt ruby scripts
 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
+  if [ `head -1 ${ruby} | grep -c "^#!"` -eq 1 ]; then
     chmod 755 ${ruby}
   else
     chmod 644 ${ruby}
   fi
 done
 
+# fix references to nonexistent cm-super fonts
+for i in `find . -name *.map` ; do
+  if [ `grep -c cm-super ${i}` != 0 ]; then
+    mv ${i} ${i}.old
+    grep -v cm-super ${i}.old > ${i} || :
+    rm -f ${i}.old
+  fi
+done
+
 # fix empty documentation files
 echo "%%%" >> texmf-dist/doc/latex/mathpazo/mapppl.tex
 echo "%%%" >> texmf-dist/doc/latex/mathpazo/mapzplm.tex
@@ -376,12 +397,14 @@
 rm -rf %{buildroot}%{_texmf_main}/tex/generic/tex4ht
 rm -rf %{buildroot}%{_texmf_main}/tex4ht
 
+%if !%{f8_packaging}
 # remove preview, it's now packaged separately (#425805)
 rm -rf %{buildroot}%{_texmf_main}/tex/latex/preview/
 rm -rf %{buildroot}%{_texmf_main}/doc/latex/preview/
 
 # remove $TEXMFMAIN/tex/texinfo to not to clash with texinfo (#226488)
 rm -rf %{buildroot}%{_texmf_main}/tex/texinfo/
+%endif
 
 # create macro file for building texlive
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
@@ -422,6 +445,9 @@
 %post japanese
 [ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
 
+%post context
+[ -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 || :
@@ -443,26 +469,17 @@
 %postun doc
 [ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
 
+%postun japanese
+[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
+
+%postun context
+[ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
+
 %files
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/rpm/macros.texlive
 %doc texlive.%{version}.zip.list
 %{_texmf_main}/bibtex/
-%dir %{_texmf_main}/context
-%dir %{_texmf_main}/context/data
-%{_texmf_main}/context/config/
-%{_texmf_main}/context/data/*.gui
-%{_texmf_main}/context/data/*.ini
-%{_texmf_main}/context/data/*.xml
-%{_texmf_main}/context/data/*.rme
-%{_texmf_main}/context/data/*.dat
-%{_texmf_main}/context/data/*.vim
-%{_texmf_main}/context/data/contextnames.txt
-%{_texmf_main}/context/data/scite-ctx.readme
-%{_texmf_main}/context/data/context.properties
-%{_texmf_main}/context/data/cont-*.properties
-%{_texmf_main}/context/data/metafun-scite.properties
-%{_texmf_main}/context/data/scite-ctx.properties
 %dir %{_texmf_main}/fmtutil/
 %{_texmf_main}/makeindex/
 %{_texmf_main}/metafont/
@@ -472,7 +489,6 @@
 %{_texmf_main}/texconfig/
 %dir %{_texmf_main}/tex
 %{_texmf_main}/tex/amstex/
-%{_texmf_main}/tex/context/
 %{_texmf_main}/tex/csplain/
 %{_texmf_main}/tex/eplain/
 %{_texmf_main}/tex/fontinst/
@@ -487,6 +503,9 @@
 %{_texmf_main}/tex/lambda/base/*.def
 %{_texmf_main}/tex/lambda/base/*.sty
 %{_texmf_main}/tex/lambda/oinuit/
+%if %{f8_packaging}
+%{_texmf_main}/tex/texinfo/
+%endif
 %{_texmf_main}/tex/mex/
 %{_texmf_main}/tex/mltex/
 %{_texmf_main}/tex/plain/
@@ -553,6 +572,26 @@
 %{_texmf_main}/ptex/platex
 %{_texmf_main}/ptex/platex209
 
+%files context
+%defattr(-,root,root,-)
+%dir %{_texmf_main}/context
+%dir %{_texmf_main}/context/data
+%{_texmf_main}/context/config/
+%{_texmf_main}/context/data/*.gui
+%{_texmf_main}/context/data/*.ini
+%{_texmf_main}/context/data/*.xml
+%{_texmf_main}/context/data/*.rme
+%{_texmf_main}/context/data/*.dat
+%{_texmf_main}/context/data/*.vim
+%{_texmf_main}/context/data/cont-*.properties
+%{_texmf_main}/context/data/context.properties
+%{_texmf_main}/context/data/contextnames.txt
+%{_texmf_main}/context/data/latex-scite.properties
+%{_texmf_main}/context/data/metafun-scite.properties
+%{_texmf_main}/context/data/scite-ctx.properties
+%{_texmf_main}/context/data/scite-ctx.readme
+%{_texmf_main}/tex/context/
+
 %files afm
 %defattr(-,root,root,-)
 %{_texmf_main}/fonts/afm/
@@ -561,19 +600,14 @@
 %defattr(-,root,root,-)
 %{_texmf_main}/dvips/
 %{_texmf_var}/dvips/
-# these are what are also needed by fonts
-%dir %{_texmf_main}/fonts/enc
-%dir %{_texmf_main}/fonts/map
-%dir %{_texmf_main}/fonts
 %{_texmf_main}/fonts/enc/dvips/
 %{_texmf_main}/fonts/map/dvips/
-# not 100% positive this is right place
-%{_texmf_main}/fonts/enc/pdftex/
-%{_texmf_main}/fonts/map/pdftex/
-%{_texmf_main}/fonts/map/dvipdfm/
 
 %files fonts
 %defattr(-,root,root,-)
+%dir %{_texmf_main}/fonts/enc
+%dir %{_texmf_main}/fonts/map
+%dir %{_texmf_main}/fonts
 %{_texmf_main}/fonts/map/fontname/
 %{_texmf_main}/fonts/cmap/
 %{_texmf_main}/fonts/ofm/
@@ -595,6 +629,9 @@
 %{_texmf_main}/tex/generic/babel/hyphen.cfg
 %{_texmf_main}/tex/lambda/base/omarab.cfg
 %{_texmf_main}/tex/lambda/base/omlgc.cfg
+%{_texmf_main}/fonts/enc/pdftex/
+%{_texmf_main}/fonts/map/pdftex/
+%{_texmf_main}/fonts/map/dvipdfm/
 
 %files latex
 %defattr(-,root,root,-)
@@ -602,13 +639,22 @@
 %{_texmf_main}/tex/latex/
 %{_texmf_main}/tex/platex/
 %{_texmf_main}/tex/xelatex/
-%{_texmf_main}/context/data/latex-scite.properties
 
 %files doc
 %defattr(-,root,root,-)
 %doc %{_texmf_main}/doc/
 
 %changelog
+* Sun Feb 17 2008 Jindrich Novy <jnovy at redhat.com> - 2007-12
+- package bigfoot, erroneously missing from the original
+  TeX Live 2007 (#426507)
+- remove references to cm-super fonts from map files to make
+  dvips work correctly (#431182)
+- package ConTeXt separately to texlive-texmf-context to get
+  rid of the ruby dependency
+- move from bz2 to lzma to save space
+- move font stuff out of the dvips subpackage
+
 * Tue Feb 05 2008 Miroslav Lichvar <mlichvar at redhat.com> - 2007-11
 - don't require texinfo-tex, tex-preview (#431516)
 


Index: texlive.2007.zip.list
===================================================================
RCS file: /cvs/extras/rpms/texlive-texmf/devel/texlive.2007.zip.list,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- texlive.2007.zip.list	2 Dec 2007 11:01:59 -0000	1.1
+++ texlive.2007.zip.list	19 Feb 2008 15:48:44 -0000	1.2
@@ -36,6 +36,7 @@
 bibtex.zip
 bibtopic.zip
 bibunits.zip
+bigfoot.zip
 bin-aleph.zip
 bin-amstex.zip
 bin-cslatex.zip




More information about the fedora-extras-commits mailing list