From 8f622d30b205899d3024d41715bd3661203a42a3 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 24 Aug 2012 14:48:56 -0400
Subject: [PATCH] Move texlive-specific fonts to just be installed with
 texlive.

---
 comps-f18.xml.in | 7 +++----
 comps-f19.xml.in | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index b4be71f9..c63cd53b 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -971,6 +971,9 @@
       <packagereq type="default">docbook5-style-xsl</packagereq>
       <packagereq type="default">linuxdoc-tools</packagereq>
       <packagereq type="default">texlive</packagereq>
+      <packagereq type="default">tex-cm-lgc</packagereq>
+      <packagereq type="default">tex-kerkis</packagereq>
+      <packagereq type="default">tex-fonts-hebrew</packagereq>
       <packagereq type="default">xhtml1-dtds</packagereq>
       <packagereq type="default">xmlto</packagereq>
       <packagereq type="optional">abcm2ps</packagereq>
@@ -3569,8 +3572,6 @@
     <uservisible>true</uservisible>
     <langonly>el</langonly>
     <packagelist>
-      <packagereq type="conditional" requires="texlive">tex-cm-lgc</packagereq>
-      <packagereq type="conditional" requires="texlive">tex-kerkis</packagereq>
       <packagereq type="optional">ctan-kerkis-calligraphic-fonts</packagereq>
       <packagereq type="optional">ctan-kerkis-sans-fonts</packagereq>
       <packagereq type="optional">ctan-kerkis-serif-fonts</packagereq>
@@ -3723,7 +3724,6 @@
     <langonly>he</langonly>
     <packagelist>
       <packagereq type="mandatory">dejavu-sans-fonts</packagereq>
-      <packagereq type="conditional" requires="texlive">tex-fonts-hebrew</packagereq>
       <packagereq type="default">culmus-aharoni-clm-fonts</packagereq>
       <packagereq type="default">culmus-caladings-clm-fonts</packagereq>
       <packagereq type="default">culmus-david-clm-fonts</packagereq>
@@ -6213,7 +6213,6 @@
     <langonly>yi</langonly>
     <packagelist>
       <packagereq type="mandatory">dejavu-sans-fonts</packagereq>
-      <packagereq type="conditional" requires="texlive">tex-fonts-hebrew</packagereq>
       <packagereq type="default">culmus-aharoni-clm-fonts</packagereq>
       <packagereq type="default">culmus-caladings-clm-fonts</packagereq>
       <packagereq type="default">culmus-david-clm-fonts</packagereq>
diff --git a/comps-f19.xml.in b/comps-f19.xml.in
index c7debb71..c5c746e4 100644
--- a/comps-f19.xml.in
+++ b/comps-f19.xml.in
@@ -971,6 +971,9 @@
       <packagereq type="default">docbook5-style-xsl</packagereq>
       <packagereq type="default">linuxdoc-tools</packagereq>
       <packagereq type="default">texlive</packagereq>
+      <packagereq type="default">tex-cm-lgc</packagereq>
+      <packagereq type="default">tex-kerkis</packagereq>
+      <packagereq type="default">tex-fonts-hebrew</packagereq>
       <packagereq type="default">xhtml1-dtds</packagereq>
       <packagereq type="default">xmlto</packagereq>
       <packagereq type="optional">abcm2ps</packagereq>
@@ -3551,8 +3554,6 @@
     <uservisible>true</uservisible>
     <langonly>el</langonly>
     <packagelist>
-      <packagereq type="conditional" requires="texlive">tex-cm-lgc</packagereq>
-      <packagereq type="conditional" requires="texlive">tex-kerkis</packagereq>
       <packagereq type="optional">ctan-kerkis-calligraphic-fonts</packagereq>
       <packagereq type="optional">ctan-kerkis-sans-fonts</packagereq>
       <packagereq type="optional">ctan-kerkis-serif-fonts</packagereq>
@@ -3705,7 +3706,6 @@
     <langonly>he</langonly>
     <packagelist>
       <packagereq type="mandatory">dejavu-sans-fonts</packagereq>
-      <packagereq type="conditional" requires="texlive">tex-fonts-hebrew</packagereq>
       <packagereq type="default">culmus-aharoni-clm-fonts</packagereq>
       <packagereq type="default">culmus-caladings-clm-fonts</packagereq>
       <packagereq type="default">culmus-david-clm-fonts</packagereq>
@@ -6195,7 +6195,6 @@
     <langonly>yi</langonly>
     <packagelist>
       <packagereq type="mandatory">dejavu-sans-fonts</packagereq>
-      <packagereq type="conditional" requires="texlive">tex-fonts-hebrew</packagereq>
       <packagereq type="default">culmus-aharoni-clm-fonts</packagereq>
       <packagereq type="default">culmus-caladings-clm-fonts</packagereq>
       <packagereq type="default">culmus-david-clm-fonts</packagereq>