- added P/O: passivetex in texlive-xmltex

[packages/texlive.git] / texlive.spec

diff --git a/texlive.spec b/texlive.spec
index 01bf8cd2f0e7dba8758141975059ee1fe3d288a7..dab6809604ca9419e76286048f3e64f623b421ff 100644 (file)
--- a/texlive.spec
+++ b/texlive.spec
@@ -13,7 +13,6 @@
 #   /usr/bin/texhash[77]: kpsewhich: not found
 # - drop ppc bconds once clisp is fixed on that architecture
 # - jadetex subpackage (from other-utils)
-# - maybe patch main config file (http://www.togaware.com/linux/survivor/TeX_Capacity.html)
 #
 # FHS TODO:
 # - merge rhconfig and texmfsysvar patches
@@ -45,7 +44,7 @@ Summary(pt_BR.UTF-8): Sistema de typesetting TeX e formatador de fontes MetaFont
 Summary(tr.UTF-8):     TeX dizgi sistemi ve MetaFont yazıtipi biçimlendiricisi
 Name:          texlive
 Version:       20080816
-Release:       4.1
+Release:       5.1
 Epoch:         1
 License:       distributable
 Group:         Applications/Publishing/TeX
@@ -58,7 +57,7 @@ Source5:      xdvi.desktop
 Source6:       xdvi.png
 Source10:      http://tug.ctan.org/get/macros/latex/contrib/floatflt.zip
 # Source10-md5:        5d9fe14d289aa81ebb6b4761169dd5f2
-Source11:      http://carme.pld-linux.org/~uzsolt/sources/texlive-fonts-larm.tar.bz2
+Source11:      http://carme.pld-linux.org/~uzsolt/sources/%{name}-fonts-larm.tar.bz2
 # Source11-md5:        df2fcc66f0c2e90785ca6c9b27dacd34
 Source50:      http://sunsite2.icm.edu.pl/pub/tex/systems/texlive/tlnet/2008/tlpkg/TeXLive/Splashscreen.pm
 # Source50-md5:        5cc49f49010f27fdb02dd7053797ba19
@@ -88,6 +87,7 @@ Source62:     http://sunsite2.icm.edu.pl/pub/tex/systems/texlive/tlnet/2008/tlpkg/Te
 # Source62-md5:        f0fa0f2fc7aacb1e9b40eb65891a24c8
 Patch0:                %{name}-am.patch
 Patch1:                %{name}-20080816-kpathsea-ar.patch
+Patch2:                %{name}-gcc44.patch
 URL:           http://www.tug.org/texlive/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -119,6 +119,7 @@ BuildRequires:      tetex-format-pdflatex
 BuildRequires: tetex-latex-cyrillic
 BuildRequires: tetex-tex-babel
 %else
+BuildRequires: %{name}-context
 BuildRequires: %{name}-csplain
 BuildRequires: %{name}-fonts-cmsuper
 #BuildRequires:        %{name}-format-amstex
@@ -138,9 +139,7 @@ BuildRequires:      %{name}-plain
 BuildRequires: %{name}-tex-babel
 BuildRequires: %{name}-tex-physe
 BuildRequires: %{name}-xetex
-BuildRequires: %{name}-xetex
 BuildRequires: %{name}-xmltex
-BuildRequires:         %{name}-context
 # fill with future texlive BR. guesses ones for now
 %endif
 BuildRequires: /usr/bin/latex
@@ -164,7 +163,7 @@ Requires:   texconfig = %{epoch}:%{version}-%{release}
 Requires:      textutils
 Suggests:      tmpwatch
 Provides:      tetex = %{epoch}:%{version}-%{release}
-Provides:      tetex-format-pdfetex
+Provides:      tetex-format-pdfetex = %{epoch}:%{version}-%{release}
 Obsoletes:     tetex
 Obsoletes:     tetex-afm
 Obsoletes:     tetex-doc
@@ -181,15 +180,10 @@ Obsoletes:        tetex-format-pdfetex
 Obsoletes:     tetex-latex-vnps
 Obsoletes:     tetex-latex-vnr
 Obsoletes:     tetex-oxdvi
-Obsoletes:     tetex-oxdvi
-Obsoletes:     tetex-plain-dvips
 Obsoletes:     tetex-plain-dvips
 Obsoletes:     tetex-plain-mathtime
-Obsoletes:     tetex-plain-mathtime
-Obsoletes:     tetex-plain-misc
 Obsoletes:     tetex-plain-misc
 Obsoletes:     tetex-plain-plnfss
-Obsoletes:     tetex-plain-plnfss
 Obsoletes:     tetex-tex-hyphen
 Obsoletes:     tetex-tex-vietnam
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -258,9 +252,9 @@ TeXbook' başlıklı kitabında anlatılmaktadır.
 %package other-utils
 Summary:       Other utilities
 Group:         Applications/Publishing/TeX
-Obsoletes:     tetex-format-cyrtexinfo
+Provides:      jadetex = %{epoch}:%{version}-%{release}
 Obsoletes:     jadetex
-Provides:      jadetex
+Obsoletes:     tetex-format-cyrtexinfo
 
 %description other-utils
 Other utilities.
@@ -777,7 +771,7 @@ Summary(pl.UTF-8):  Zestaw narzędzi MetaPost
 Group:         Applications/Publishing/TeX
 Requires(post,postun): %{_bindir}/texhash
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-Obsoletes:     tetex-matapost
+Obsoletes:     tetex-metapost
 
 %description metapost
 MetaPost.
@@ -808,6 +802,7 @@ Summary(pl.UTF-8):  Konwerter MetaPost do PDF
 Group:         Applications/Publishing/TeX
 Requires(post,postun): %{_bindir}/texhash
 Requires:      %{name}-metapost = %{epoch}:%{version}-%{release}
+Obsoletes:     tetex-mptopdf
 
 %description mptopdf
 MetaPost to PDF converter.
@@ -1424,7 +1419,10 @@ Summary: PostScript Utilities
 Summary(hu.UTF-8):     PostScript eszközök
 Summary(pl.UTF-8):     Narzędzia do PostScriptu
 Group:         Applications/Printing
+Provides:      psutils
 Obsoletes:     psutils
+Obsoletes:     texlive-epsutils
+Obsoletes:     texlive-filters
 
 %description psutils
 This archive contains some utilities for manipulating PostScript
@@ -1487,9 +1485,10 @@ Requires(post,postun):   %{_bindir}/texhash
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Provides:      tetex-format-plain
 Provides:      tetex-plain
+Obsoletes:     tetex-cyrplain
+Obsoletes:     tetex-format-cyrplain
 Obsoletes:     tetex-format-plain
 Obsoletes:     tetex-plain
-Obsoletes:     tetex-cyrplain
 
 %description plain
 Plain TeX format basic files.
@@ -1521,6 +1520,7 @@ Summary(pl.UTF-8):        Format MeX Plain
 Group:         Applications/Publishing/TeX
 Requires(post,postun): %{_bindir}/texhash
 Requires:      texlive-mex = %{epoch}:%{version}-%{release}
+Obsoletes:     tetex-format-mex
 
 %description format-mex
 MeX Plain Format.
@@ -1584,7 +1584,7 @@ Summary(pl.UTF-8):        Makra AMS dla formatu Plain TeX
 Group:         Applications/Publishing/TeX
 Requires(post,postun): %{_bindir}/texhash
 Requires:      %{name}-amstex = %{epoch}:%{version}-%{release}
-Obsoletes:     tetex-ams
+Obsoletes:     tetex-format-amstex
 Obsoletes:     tetex-format-cyramstex
 
 %description format-amstex
@@ -1648,8 +1648,8 @@ Group:            Applications/Publishing/TeX
 Requires(post,postun): %{_bindir}/texhash
 Requires:      %{name}-fonts-cs = %{epoch}:%{version}-%{release}
 Requires:      %{name}-plain = %{epoch}:%{version}-%{release}
-Obsoletes:     tetex-cslatex
 Provides:      tetex-cslatex
+Obsoletes:     tetex-cslatex
 
 %description cslatex
 CSLaTeX format basic files.
@@ -1663,7 +1663,7 @@ Summary(pl.UTF-8):        Format CSLaTeX
 Group:         Applications/Publishing/TeX
 Requires(post,postun): %{_bindir}/texhash
 Requires:      %{name}-cslatex = %{epoch}:%{version}-%{release}
-Obsoletes:     tetex-cslatex
+Obsoletes:     tetex-format-cslatex
 
 %description format-cslatex
 CSLaTeX format.
@@ -1677,6 +1677,7 @@ Summary(pl.UTF-8):        Format PDF CSLaTeX
 Group:         Applications/Publishing/TeX
 Requires(post,postun): %{_bindir}/texhash
 Requires:      %{name}-cslatex = %{epoch}:%{version}-%{release}
+Obsoletes:     tetex-format-pdfcslatex
 
 %description format-pdfcslatex
 PDF CSLaTeX format.
@@ -1692,8 +1693,8 @@ Summary(pl.UTF-8):        Podstawowe pliki dla formatu EPlain
 Group:         Applications/Publishing/TeX
 Requires(post,postun): %{_bindir}/texhash
 Requires:      %{name}-plain = %{epoch}:%{version}-%{release}
-Obsoletes:     tetex-etex
 Obsoletes:     tetex-eplain
+Obsoletes:     tetex-etex
 
 %description eplain
 EPlain format basic files.
@@ -1707,6 +1708,7 @@ Summary(pl.UTF-8):        Format EPlain
 Group:         Applications/Publishing/TeX
 Requires(post,postun): %{_bindir}/texhash
 Requires:      %{name}-eplain = %{epoch}:%{version}-%{release}
+Obsoletes:     tetex-format-eplain
 
 %description format-eplain
 EPlain format.
@@ -1946,6 +1948,7 @@ Group:            Applications/Publishing/TeX
 Requires(post,postun): /usr/bin/texhash
 Requires:      %{name}-latex = %{epoch}:%{version}-%{release}
 Obsoletes:     tetex-algorith
+Obsoletes:     tetex-latex-algorithms
 
 %description latex-algorithms
 Defines a floating algorithm environment designed to work with the
@@ -2146,6 +2149,8 @@ Summary(pl.UTF-8):        Duńskie warianty standardowych stylów BibTeXa
 Group:         Applications/Publishing/TeX
 Requires(post,postun): /usr/bin/texhash
 Requires:      %{name}-latex-bibtex = %{epoch}:%{version}-%{release}
+Obsoletes:     tetex-latex-bibtex-dk
+
 
 %description latex-bibtex-dk
 Dk-bib is a translation of the four standard BibTeX style files
@@ -2616,6 +2621,7 @@ Group:            Applications/Publishing/TeX
 Requires(post,postun): /usr/bin/texhash
 Requires:      %{name}-fonts-lm = %{epoch}:%{version}-%{release}
 Requires:      %{name}-latex = %{epoch}:%{version}-%{release}
+Obsoletes:     tetex-latex-lm
 
 %description latex-lm
 Latin Modern family of fonts, based on the Computer Modern fonts
@@ -2657,6 +2663,7 @@ Summary(pl.UTF-8):        Numery linii dla paragrafów
 Group:         Applications/Publishing/TeX
 Requires(post,postun): /usr/bin/texhash
 Requires:      %{name}-latex = %{epoch}:%{version}-%{release}
+Obsoletes:     tetex-latex-lineno
 
 %description latex-lineno
 The LaTeX package lineno.sty provides line numbers on paragraphs.
@@ -2868,11 +2875,9 @@ Summary: Mathematical packages
 Summary(hu.UTF-8):     Matematikai csomagok
 Group:         Applications/Publishing/TeX
 Requires(post,postun): %{_bindir}/texhash
-Requires:      %{name}-latex = %{epoch}:%{version}-%{release}
-# gnuplottex needs gnuplot
-Requires:      gnuplot
 Requires:      %{name}-fonts-bbm = %{epoch}:%{version}-%{release}
 Requires:      %{name}-fonts-stmaryrd = %{epoch}:%{version}-%{release}
+Requires:      %{name}-latex = %{epoch}:%{version}-%{release}
 Requires:      %{name}-latex-ams = %{epoch}:%{version}-%{release}
 Requires:      %{name}-latex-carlisle = %{epoch}:%{version}-%{release}
 Requires:      %{name}-latex-psnfss = %{epoch}:%{version}-%{release}
@@ -2881,6 +2886,8 @@ Requires: %{name}-latex-wasysym = %{epoch}:%{version}-%{release}
 Requires:      %{name}-tex-pstricks = %{epoch}:%{version}-%{release}
 Requires:      %{name}-tex-xkeyval = %{epoch}:%{version}-%{release}
 Requires:      %{name}-tex-xypic = %{epoch}:%{version}-%{release}
+# gnuplottex needs gnuplot
+Requires:      gnuplot
 
 %description latex-math
 This package contains:
@@ -3095,8 +3102,6 @@ Ez a csomag a következőket tartalmazza:
 Summary:       Chemical packages
 Summary(hu.UTF-8):     Kémiai csomagok
 Group:         Applications/Publishing/TeX
-Group:         Applications/Publishing/TeX
-Requires(post,postun): %{_bindir}/texhash
 Requires(post,postun): %{_bindir}/texhash
 Requires:      %{name}-latex = %{epoch}:%{version}-%{release}
 Suggests:      %{name}-latex-lewis
@@ -3190,6 +3195,7 @@ Summary(pl.UTF-8):        Interfejs do rozszerzeń mikrotypograficznych pdfTeXa
 Group:         Applications/Publishing/TeX
 Requires(post,postun): /usr/bin/texhash
 Requires:      %{name}-latex = %{epoch}:%{version}-%{release}
+Obsoletes:     tetex-latex-microtype
 
 %description latex-microtype
 The `microtype' package provides a LaTeX interface to pdfTeX's
@@ -4236,8 +4242,8 @@ Summary(pl.UTF-8):        Różne pliki TeXowe służące do składu dokumentów w jęz
 Group:         Applications/Publishing/TeX
 Requires(post,postun): %{_bindir}/texhash
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-Obsoletes:     tetex-tex-spanishb
 Obsoletes:     tetex-tex-spanish
+Obsoletes:     tetex-tex-spanishb
 
 %description tex-spanish
 Various TeX related files for typesetting documents written in
@@ -4318,6 +4324,8 @@ Summary(pl.UTF-8):        Wsparcie dla języka wietnamskiego
 Group:         Applications/Publishing/TeX
 Requires(post,postun): %{_bindir}/texhash
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+Obsoletes:     tetex-latex-urwvn
+Obsoletes:     tetex-latex-vietnam
 Obsoletes:     tetex-tex-vietnam
 
 %description latex-vietnam
@@ -4333,6 +4341,7 @@ Group:            Applications/Publishing/TeX
 Requires(post,postun): %{_bindir}/texhash
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      %{name}-fonts-xypic = %{epoch}:%{version}-%{release}
+Obsoletes:     tetex-tex-xypic
 Obsoletes:     tetex-xypic
 
 %description tex-xypic
@@ -4352,6 +4361,7 @@ Summary(pl.UTF-8):        Rozszerzenie do pakietu keyval
 Group:         Applications/Publishing/TeX
 Requires(post,postun): /usr/bin/texhash
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+Obsoletes:     tetex-tex-xkeyval
 
 %description tex-xkeyval
 Extension to keyval package.
@@ -4901,10 +4911,10 @@ Requires:       %{name}-dirs-fonts = %{epoch}:%{version}-%{release}
 Obsoletes:     tetex-fonts-cbgreek
 Obsoletes:     tetex-fonts-dstroke
 Obsoletes:     tetex-fonts-pazo
-Obsoletes:     tetex-qfonts
 Obsoletes:     tetex-fonts-type1-dstroke
 Obsoletes:     tetex-fonts-type1-qfonts
 Obsoletes:     tetex-fonts-type1-tt2001
+Obsoletes:     tetex-qfonts
 
 %description fonts-other
 Other fonts.
@@ -5504,6 +5514,8 @@ Egy szűrő, amely .tex fájlokból szűri ki a TeX parancsokat.
 Summary:       Various DVI utils
 Summary(hu.UTF-8):     Vegyes DVI eszközök
 Group:         Applications/Publishing/TeX
+Provides:      dvi2tty
+Obsoletes:     dvi2tty
 
 %description dviutils
 This package contains various DVI utils.
@@ -5514,6 +5526,7 @@ Ez a csomag mindenféle DVI eszközt tartalmaz.
 %package epsutils
 Summary:       Various EPS utils
 Group:         Applications/Publishing/TeX
+Conflicts:     psutils
 
 %description epsutils
 Various EPS (Encapsulated PostScript) utils.
@@ -5557,9 +5570,11 @@ fonts.
 %package xmltex
 Summary:       TeX package for processing XML files
 Group:         Applications/Publishing/TeX
-Obsoletes:     xmltex
-Provides:      xmltex
 Requires(post,postun): /usr/bin/texhash
+Provides:      passivetex
+Provides:      xmltex
+Obsoletes:     passivetex
+Obsoletes:     xmltex
 
 %description xmltex
 XMLTeX is a non-validating, namespace-aware XML parser written in TeX.
@@ -5571,6 +5586,7 @@ It allows TeX to directly process XML files.
 lzma -dc %{SOURCE0} | tar xf - -C ..
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 CURDIR=$(pwd)
 
 cd utils/xindy/make-rules/alphabets
@@ -5596,6 +5612,7 @@ cd texk/kpathsea
 %{__sed} -i 's@^TEXMFSYSVAR =.*@TEXMFSYSVAR = %{_localstatedir}@' texmf.cnf
 %{__sed} -i 's@^TEXMFSYSCONFIG =.*@TEXMFSYSCONFIG = %{_sysconfdir}/%{name}@' texmf.cnf
 %{__sed} -i 's@^TEXMFVAR =.*@TEXMFVAR = %{_localstatedir}@' texmf.cnf
+%{__sed} -i 's@^trie_size.*@trie_size = 1262000@' texmf.cnf
 cd ../..
 
 %ifarch ppc ppc64
@@ -5879,8 +5896,17 @@ for format in \
        xetex \
        xelatex \
        xmltex; do
-       fmtutil --fmtdir $RPM_BUILD_ROOT%{fmtdir} --byfmt=${format} 
+%if %{with bootstrap}
+       install -d $RPM_BUILD_ROOT%{fmtdir}/${format}
+       touch $RPM_BUILD_ROOT%{fmtdir}/${format}/${format}.fmt
+       touch $RPM_BUILD_ROOT%{fmtdir}/pdftex/${format}.fmt
+%else
+       fmtutil --fmtdir $RPM_BUILD_ROOT%{fmtdir} --byfmt=${format}
+%endif
 done
+%if %{with bootstrap}
+touch $RPM_BUILD_ROOT%{fmtdir}/xetex/xelatex.fmt
+%endif
 # We don't need the log files
 rm -f $(find $RPM_BUILD_ROOT%{fmtdir} -name "*.log")
 
@@ -7460,6 +7486,7 @@ fi
 %attr(1777,root,root) %dir %{_localstatedir}/fonts/map
 %attr(1777,root,root) %dir %{fmtdir}
 
+%dir %{fmtdir}/tex
 %dir %{texmfdist}
 %dir %{texmfdist}/doc
 %dir %{texmfdist}/doc/generic
@@ -7478,6 +7505,7 @@ fi
 %dir %{texmfdist}/tex/latex/base
 %dir %{texmfdist}/scripts
 %dir %{texmfdist}/source
+%dir %{texmfdist}/source/latex
 %dir %{texmfdist}/source/generic
 %dir %{texmf}
 %dir %{texmf}/doc
@@ -7601,9 +7629,7 @@ fi
 %{_mandir}/man1/weave.1*
 %{_mandir}/man5/fmtutil.cnf.5*
 %{_mandir}/man5/updmap.cfg.5*
-
 %{fmtdir}/pdftex/pdfetex.fmt
-%dir %{fmtdir}/tex
 %{fmtdir}/tex/tex.fmt
 
 %files other-utils
@@ -7758,6 +7784,7 @@ fi
 %dir %{texmfdist}/fonts/map/dvips
 %dir %{texmfdist}/fonts/map/dvips/vntex
 %dir %{texmfdist}/fonts/map/fontname
+%dir %{texmfdist}/fonts/map/public
 %dir %{texmfdist}/fonts/map/vtex
 %dir %{texmfdist}/fonts/ofm
 %dir %{texmfdist}/fonts/ofm/public
@@ -7782,9 +7809,7 @@ fi
 %dir %{texmfdist}/fonts/vf
 %dir %{texmfdist}/fonts/vf/public
 %dir %{texmfdist}/fonts/vf/vntex
-%dir %{texmfdist}/source
 %dir %{texmfdist}/source/fonts
-%dir %{texmfdist}/source/latex
 %dir %{texmf}/fonts
 %dir %{texmf}/fonts/opentype
 %dir %{texmf}/fonts/opentype/public
@@ -8139,7 +8164,7 @@ fi
 
 %files tex-kastrup
 %defattr(644,root,root,755)
-%doc %{texmfdist}/doc/generic/kastrup/binhex.pdf
+%doc %{texmfdist}/doc/generic/kastrup
 %{texmfdist}/source/generic/kastrup
 %{texmfdist}/tex/generic/kastrup
 
@@ -8261,6 +8286,7 @@ fi
 %{texmf}/texconfig/v
 %{texmf}/texconfig/x
 
+%if !%{with bootstrap}
 %files -n xindy
 %defattr(644,root,root,755)
 %doc %{texmf}/doc/xindy
@@ -8456,6 +8482,7 @@ fi
 %files -n xindy-vietnamese
 %defattr(644,root,root,755)
 %{texmf}/xindy/lang/vietnamese/
+%endif
 
 %files -n xdvi
 %defattr(644,root,root,755)
@@ -8583,8 +8610,6 @@ fi
 
 %files amstex
 %defattr(644,root,root,755)
-%dir %{texmfdist}/tex/amstex
-%{texmfdist}/tex/amstex/base
 %{texmfdist}/tex/amstex/config
 %{texmfdist}/tex/plain/amsfonts
 
@@ -9275,7 +9300,6 @@ fi
 %{texmf}/tex/latex/dvipdfm
 %{fmtdir}/pdftex/latex.fmt
 %{fmtdir}/pdftex/mllatex.fmt
-%{fmtdir}/pdftex/pdflatex.fmt
 
 %files latex-12many
 %defattr(644,root,root,755)
@@ -10350,8 +10374,6 @@ fi
 
 %files latex-math-sources
 %defattr(644,root,root,755)
-%dir %{texmfdist}/source
-%dir %{texmfdist}/source/latex
 %{texmfdist}/source/latex/bez123
 %{texmfdist}/source/latex/binomexp
 %{texmfdist}/source/latex/cmll
@@ -10658,8 +10680,6 @@ fi
 
 %files latex-sources
 %defattr(644,root,root,755)
-%dir %{texmfdist}/source
-%dir %{texmfdist}/source/latex
 %{texmfdist}/source/latex/acronym
 %{texmfdist}/source/latex/adrlist
 %{texmfdist}/source/latex/altfont
@@ -12140,7 +12160,6 @@ fi
 %files latex-psnfss
 %defattr(644,root,root,755)
 %doc %{texmfdist}/doc/latex/psnfss
-%dir %{texmfdist}/source/latex
 %{texmfdist}/fonts/map/dvips/psnfss
 %{texmfdist}/source/latex/psnfss
 %{texmfdist}/source/latex/latex-tds
@@ -12220,6 +12239,7 @@ fi
 %files format-pdflatex
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/pdflatex
+%{fmtdir}/pdftex/pdflatex.fmt
 %{_mandir}/man1/pdflatex.1*
 
 %files tex-babel
@@ -13465,7 +13485,7 @@ fi
 %{texmfdist}/fonts/tfm/public/velthuis
 %{texmfdist}/fonts/type1/public/velthuis
 
-%{texmfdist}/fonts/enc/dvips/vntex
+%{texmfdist}/fonts/enc/dvips/vntex/*
 
 %{texmfdist}/fonts/afm/vntex/vntopia
 %{texmfdist}/fonts/tfm/vntex/vntopia
@@ -13767,6 +13787,7 @@ fi
 %dir %{texmfdist}/scripts/dviasm
 %dir %{texmf}/fonts/cmap
 %doc %{texmf}/fonts/cmap/README
+%attr(755,root,root) %{_bindir}/disdvi
 %attr(755,root,root) %{_bindir}/dt2dv
 %attr(755,root,root) %{_bindir}/dv2dt
 %attr(755,root,root) %{_bindir}/dvi2tty
@@ -13794,52 +13815,45 @@ fi
 %{texmf}/fonts/cmap/dvipdfmx
 %{texmf}/fonts/map/dvipdfmx
 
-%files epsutils
+%files psutils
 %defattr(644,root,root,755)
+%dir %{texmf}/scripts/ps2eps
+%doc %{texmfdist}/doc/epspdf
 %attr(755,root,root) %{_bindir}/epsffit
 %attr(755,root,root) %{_bindir}/epspdf
 %attr(755,root,root) %{_bindir}/epspdftk
-%attr(755,root,root) %{_bindir}/pst2pdf
-%doc %{texmfdist}/doc/epspdf
-%{_mandir}/man1/epsffit*
-%{texmfdist}/scripts/epspdf
-
-%files filters
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/fix*
-%{_mandir}/man1/fix*
-
-%files psutils
-%defattr(644,root,root,755)
-%dir %{texmf}/scripts/ps2eps
 %attr(755,root,root) %{_bindir}/extractres
+%attr(755,root,root) %{_bindir}/fix*
 %attr(755,root,root) %{_bindir}/getafm
 %attr(755,root,root) %{_bindir}/includeres
+%attr(755,root,root) %{_bindir}/ps2eps
 %attr(755,root,root) %{_bindir}/psbook
 %attr(755,root,root) %{_bindir}/psmerge
 %attr(755,root,root) %{_bindir}/psnup
 %attr(755,root,root) %{_bindir}/psresize
 %attr(755,root,root) %{_bindir}/psselect
-%attr(755,root,root) %{_bindir}/ps2eps
+%attr(755,root,root) %{_bindir}/pst2pdf
 %attr(755,root,root) %{_bindir}/pstops
 %attr(755,root,root) %{_bindir}/showchar
 %attr(755,root,root) %{texmf}/scripts/ps2eps/ps2eps*
+%{_mandir}/man1/epsffit*
 %{_mandir}/man1/extractres*
+%{_mandir}/man1/fix*
 %{_mandir}/man1/getafm*
 %{_mandir}/man1/includeres*
+%{_mandir}/man1/ps2eps.1*
 %{_mandir}/man1/psbook*
 %{_mandir}/man1/psmerge*
 %{_mandir}/man1/psnup*
 %{_mandir}/man1/psresize*
 %{_mandir}/man1/psselect*
 %{_mandir}/man1/pstops*
-%{_mandir}/man1/ps2eps.1*
+%{texmfdist}/scripts/epspdf
 %{texmf}/dvips/psutils
 
 %files uncategorized-utils
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/devnag
-%attr(755,root,root) %{_bindir}/disdvi
 
 %files tex4ht
 %defattr(644,root,root,755)