- rel 9; fix libpng

[packages/texlive.git] / texlive.spec

diff --git a/texlive.spec b/texlive.spec
index efb56f03979e92e49612354170851fcefaf60040..b6954bfdc0c30a336f05622cdb04381fb023c976 100644 (file)
--- a/texlive.spec
+++ b/texlive.spec
@@ -33,7 +33,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:       5.1
+Release:       9
 Epoch:         1
 License:       distributable
 Group:         Applications/Publishing/TeX
@@ -82,6 +82,7 @@ Patch2:               %{name}-gcc44.patch
 Patch3:                %{name}-getline.patch
 Patch4:                %{name}-stdio.patch
 Patch5:                %{name}-aclocal.patch
+Patch6:                %{name}-libpng.patch
 URL:           http://www.tug.org/texlive/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -121,6 +122,7 @@ BuildRequires:      %{name}-fonts-cmsuper
 #BuildRequires:        %{name}-format-amstex
 #BuildRequires:        %{name}-format-cslatex
 BuildRequires: %{name}-format-eplain
+BuildRequires: %{name}-format-mex
 BuildRequires: %{name}-format-pdflatex
 BuildRequires: %{name}-latex
 BuildRequires: %{name}-latex-cyrillic
@@ -1561,6 +1563,7 @@ Summary(pl.UTF-8):        Podstawowe pliki makr AMS dla formatu Plain TeX
 Group:         Applications/Publishing/TeX
 Requires(post,postun): %{_bindir}/texhash
 Requires:      %{name}-fonts-ams = %{epoch}:%{version}-%{release}
+Requires:      %{name}-format-amstex = %{epoch}:%{version}-%{release}
 Requires:      %{name}-plain = %{epoch}:%{version}-%{release}
 Provides:      tetex-ams
 Obsoletes:     tetex-ams
@@ -2528,23 +2531,6 @@ Letter document class.
 %description latex-gbrief -l hu.UTF-8
 Levél dokumentumosztály.
 
-%package latex-jknappen
-Summary:       Miscellaneous packages by Joerg Knappen
-Summary(pl.UTF-8):     Różne pakiety autorstwa Joerga Knappena
-Group:         Applications/Publishing/TeX
-Requires(post,postun): %{_bindir}/texhash
-Requires:      %{name}-fonts-jknappen = %{epoch}:%{version}-%{release}
-Requires:      %{name}-latex = %{epoch}:%{version}-%{release}
-Obsoletes:     tetex-latex-jknappen
-
-%description latex-jknappen
-Miscellaneous macros, mostly for making use of extra fonts, by Joerg
-Knappen, including sgmlcmpt.
-
-%description latex-jknappen -l pl.UTF-8
-Różne makra, głównie do używania dodatkowych fontów autorstwa Joerga
-Knappena. Zawiera sgmlcmpt.
-
 %package latex-keystroke
 Summary:       Graphical representation of keys on keyboard
 Summary(hu.UTF-8):     A billentyűk grafikus megjelenítése
@@ -4763,8 +4749,11 @@ Summary: Miscellaneous packages by Joerg Knappen
 Summary(pl.UTF-8):     Różne pakiety autorstwa Joerga Knappena
 Group:         Fonts
 Requires:      %{name}-dirs-fonts = %{epoch}:%{version}-%{release}
+Requires:      %{name}-latex = %{epoch}:%{version}-%{release}
 Provides:      tetex-fonts-jknappen
 Obsoletes:     tetex-fonts-jknappen
+Obsoletes:     tetex-latex-jknappen
+Obsoletes:     texlive-latex-jknappen
 
 %description fonts-jknappen
 Miscellaneous macros, mostly for making use of extra fonts, by Joerg
@@ -5587,8 +5576,9 @@ lzma -dc %{SOURCE0} | tar xf - -C ..
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1 
-%patch5 -p1 
+%patch4 -p1
+%patch5 -p1
+%patch6 -p0
 CURDIR=$(pwd)
 
 cd utils/xindy/make-rules/alphabets
@@ -6565,12 +6555,6 @@ fi
 %postun latex-gbrief
 %texhash
 
-%post latex-jknappen
-%texhash
-
-%postun latex-jknappen
-%texhash
-
 %post latex-keystroke
 %texhash
 
@@ -7795,7 +7779,8 @@ fi
 
 %files jadetex
 %defattr(644,root,root,755)
-%doc %{texmfdist}/doc/jadetex/base/*
+%dir %{texmfdist}/doc/jadetex
+%doc %{texmfdist}/doc/jadetex/base
 %doc %{texmfdist}/source/jadetex/base/ChangeLog*
 %attr(755,root,root) %{_bindir}/jadetex
 %attr(755,root,root) %{_bindir}/pdfjadetex
@@ -8326,6 +8311,7 @@ fi
 %doc %{texmf}/doc/xindy
 %dir %{texmf}/xindy
 %dir %{texmf}/xindy/lang
+%dir %{texmf}/scripts/xindy
 %attr(755,root,root) %{texmf}/scripts/xindy/*
 %attr(755,root,root) %{_bindir}/tex2xindy
 %attr(755,root,root) %{_bindir}/xindy
@@ -8629,7 +8615,7 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/mex
 %{texmfdist}/tex/mex/config/mex.ini
-%{fmtdir}/tex/mex.fmt
+%{fmtdir}/pdftex/mex.fmt
 
 %files format-pdfmex
 %defattr(644,root,root,755)