rpms/texlive-texmf/devel texlive-texmf.spec,1.30,1.31

[Jindrich Novy]

Author: jnovy

Update of /cvs/pkgs/rpms/texlive-texmf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28692

Modified Files:
	texlive-texmf.spec 
Log Message:
* Tue Dec 16 2008 Jindrich Novy <jnovy at redhat.com> - 2007-27
- remove binaries from splitindex (#476636)
- add unowned dirs into the filelist (#474027)
- fix patch to brp-compress script (#468179)
- remove F8 related chunks from spec



Index: texlive-texmf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texlive-texmf/devel/texlive-texmf.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- texlive-texmf.spec	14 Oct 2008 11:34:35 -0000	1.30
+++ texlive-texmf.spec	16 Dec 2008 13:46:02 -0000	1.31
@@ -8,11 +8,10 @@
 %{!?_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:	26%{?dist}
+Release:	27%{?dist}
 Summary:	Architecture independent parts of the TeX formatting system
 
 Group:		Applications/Publishing
@@ -43,7 +42,7 @@
 %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}
+%define __os_install_post /usr/lib/rpm/brp-compress %{nil}
 
 # Source1000-: Japanese pTeX
 Source1000: ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/ptex-texmf-%{ptex_texmf_ver}.tar.gz
@@ -130,11 +129,7 @@
 Summary:	Texmf files needed for texlive-latex
 Requires:	texlive-texmf = %{version}-%{release}
 Requires:	texlive-texmf-errata-latex = %{version}
-%if !%{f8_packaging}
 Requires:	tex-preview
-%else
-Requires:	tetex-preview
-%endif
 
 %description latex
 This package contains the components of the TEXMF tree needed for the
@@ -406,10 +401,8 @@
 touch %{buildroot}%{_texmf_vendor}/ls-R
 touch %{buildroot}%{_texmf_conf}/ls-R
 
-%if !%{f8_packaging}
 # remove xdvi files, now packaged separately
 rm -rf %{buildroot}%{_texmf_var}/xdvi
-%endif
 
 # remove dvipdfmx files
 rm %{buildroot}%{_texmf_main}/dvipdfm/{dvipdfmx.cfg,EUC-UCS2,README,UniKSCms-UCS2-H,UniKSCms-UCS2-V}
@@ -421,10 +414,13 @@
 rm -rf %{buildroot}%{_texmf_main}/tex/latex/preview/
 rm -rf %{buildroot}%{_texmf_main}/doc/latex/preview/
 
-%if !%{f8_packaging}
+# remove binaries from splitindex (#476636)
+rm -rf %{buildroot}%{_texmf_main}/doc/latex/splitindex/*i386* \
+%{buildroot}%{_texmf_main}/doc/latex/splitindex/*.exe \
+%{buildroot}%{_texmf_main}/doc/latex/splitindex/*.class
+
 # 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
@@ -581,6 +577,7 @@
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/rpm/macros.texlive
 %doc texlive.%{version}.zip.list
+%dir %{_texmf_main}/bibtex
 %{_texmf_main}/bibtex/bib/
 %{_texmf_main}/bibtex/csf/
 %dir %{_texmf_main}/bibtex/bst
@@ -626,9 +623,6 @@
 %{_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/
@@ -668,23 +662,23 @@
 %{_texmf_main}/web2c/pdftex.pool
 %{_texmf_main}/web2c/tex.pool
 # var
-%if %{f8_packaging}
-%dir %{_texmf_var}/xdvi
-%config(noreplace) %{_texmf_var}/xdvi/XDvi
-%endif
 %config(noreplace) %{_texmf_var}/web2c/mktex.cnf
-%{_texmf_var}/tex/generic/
-%{_texmf_var}/tex/plain/
+%dir %{_texmf_var}/tex/
+%{_texmf_var}/tex/generic
+%{_texmf_var}/tex/plain
 %dir %{_texmf_var}/fonts
 %dir %{_texmf_var}/fonts/map
 %dir %{_texmf_var}/fonts/map/dvipdfm
 %dir %{_texmf_var}/fonts/map/dvipdfm/updmap
+%dir %{_texmf_var}/fonts/map/dvips
+%dir %{_texmf_var}/fonts/map/pdftex
 %ghost %{_texmf_var}/fonts/map/dvipdfm/updmap/*
 %dir %{_texmf_var}/fonts/map/dvips/updmap
 %ghost %{_texmf_var}/fonts/map/dvips/updmap/*
 %dir %{_texmf_var}/fonts/map/pdftex/updmap
 %ghost %{_texmf_var}/fonts/map/pdftex/updmap/*
-%{_texmf_var}/dvipdfm/
+%{_texmf_var}/dvipdfm
+%{_texmf_var}/web2c
 # info
 %{_infodir}/tds.info.*
 # ls-R
@@ -775,9 +769,9 @@
 
 %files fonts
 %defattr(-,root,root,-)
+%dir %{_texmf_main}/fonts
 %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/
@@ -829,6 +823,12 @@
 %doc %{_texmf_main}/doc/
 
 %changelog
+* Tue Dec 16 2008 Jindrich Novy <jnovy at redhat.com> - 2007-27
+- remove binaries from splitindex (#476636)
+- add unowned dirs into the filelist (#474027)
+- fix patch to brp-compress script (#468179)
+- remove F8 related chunks from spec
+
 * Mon Oct 13 2008 Jindrich Novy <jnovy at redhat.com> - 2007-26
 - increase limits in texmf.cnf so that PostgreSQL documentation build
   passes (#460982)