- rel 9; fix libpng

[packages/texlive.git] / texlive.spec

diff --git a/texlive.spec b/texlive.spec
index b75bb983c52e67ca2360ed37ff3c97743f4df523..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:       6
+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
@@ -4752,7 +4753,7 @@ Requires: %{name}-latex = %{epoch}:%{version}-%{release}
 Provides:      tetex-fonts-jknappen
 Obsoletes:     tetex-fonts-jknappen
 Obsoletes:     tetex-latex-jknappen
-Obsoletes:     %{name}-latex-jknappen
+Obsoletes:     texlive-latex-jknappen
 
 %description fonts-jknappen
 Miscellaneous macros, mostly for making use of extra fonts, by Joerg
@@ -5575,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
@@ -7777,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
@@ -8308,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