X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=texlive.spec;h=9c873d7757b3bf1d6606e297ddaeb5103fcae5f8;hb=8095f3122f88f2b0911eaa492d58219681156aa4;hp=fd687ff3e9f8698abeb024efc47a223924232923;hpb=3b23bb6d7df28997e0e2c1e7b90ac268120768ad;p=packages%2Ftexlive.git

diff --git a/texlive.spec b/texlive.spec
index fd687ff..9c873d7 100644
--- 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:	8
 Epoch:		1
 License:	distributable
 Group:		Applications/Publishing/TeX
@@ -1562,6 +1562,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
@@ -2529,23 +2530,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
@@ -4764,8 +4748,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
@@ -5588,8 +5575,8 @@ lzma -dc %{SOURCE0} | tar xf - -C ..
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1 
-%patch5 -p1 
+%patch4 -p1
+%patch5 -p1
 CURDIR=$(pwd)
 
 cd utils/xindy/make-rules/alphabets
@@ -6566,12 +6553,6 @@ fi
 %postun latex-gbrief
 %texhash
 
-%post latex-jknappen
-%texhash
-
-%postun latex-jknappen
-%texhash
-
 %post latex-keystroke
 %texhash
 
@@ -7796,7 +7777,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
@@ -8327,6 +8309,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