From 616bcf4c4a54734a33aae59c76deb54e83f99b02 Mon Sep 17 00:00:00 2001
From: Pravin Satpute <pravins@fedoraproject.org>
Date: Feb 19 2010 07:48:19 +0000
Subject: - updated .conf file priorities

- fixed bug 565385

---

diff --git a/62-culmus-aharoni-clm.conf b/62-culmus-aharoni-clm.conf
deleted file mode 100644
index 02bdbee..0000000
--- a/62-culmus-aharoni-clm.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-
-<!-- WINDOWS ALIASES -->
-	<alias>
-		<family>Guttman Aharoni</family>
-		<family>Guttman-Aharoni</family>
-		<accept><family>Aharoni CLM</family></accept>
-	</alias>
-
-<!-- CULMUS ALIASES -->
-	<alias>
-		<family>Aharoni</family>
-		<accept><family>Aharoni CLM</family></accept>
-	</alias>
-
-</fontconfig>
diff --git a/62-culmus-caladings-clm.conf b/62-culmus-caladings-clm.conf
deleted file mode 100644
index aa8c90f..0000000
--- a/62-culmus-caladings-clm.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-
-<!-- CULMUS ALIASES -->
-	<alias>	<family>Caladings</family>	<accept><family>Caladings CLM</family></accept>	</alias>
-
-</fontconfig>
diff --git a/62-culmus-david-clm.conf b/62-culmus-david-clm.conf
deleted file mode 100644
index da1eac5..0000000
--- a/62-culmus-david-clm.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-
-<!-- WINDOWS ALIASES -->
-
-	<!-- Guttman Adii is replaced with David Medium Italic -->
-	<match target="pattern" >
-		<test name="family" >
-			<string>Guttman Adii</string>
-		</test>
-		<edit mode="prepend" binding="same" name="family" >
-			<string>David CLM</string>
-		</edit>
-		<edit mode="prepend" binding="same" name="style" >
-			<string>Medium Italic</string>
-		</edit>
-	</match>
-
-	<alias>
-		<family>David Transparent</family>
-		<family>Guttman David</family>
-		<accept><family>David CLM</family></accept>
-	</alias>
-
-<!-- CULMUS ALIASES -->
-	<alias>	<family>David</family>		<accept><family>David CLM</family></accept>	</alias>
-        <alias> <family>David OT</family>       <accept><family>David CLM</family></accept>     </alias>
-
-<!-- MAC ALIASES -->
-	<alias>	<family>Raanana</family>	<accept><family>David CLM</family></accept>	</alias>
-</fontconfig>
diff --git a/62-culmus-drugulin-clm.conf b/62-culmus-drugulin-clm.conf
deleted file mode 100644
index 15ef122..0000000
--- a/62-culmus-drugulin-clm.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-
-<!-- WINDOWS ALIASES -->
-	<alias>
-		<family>Guttman Drogolin</family>
-		<family>Guttman Vilna</family>
-		<accept><family>Drugulin CLM</family></accept>
-	</alias>
-
-<!-- CULMUS ALIASES -->
-	<alias>	<family>Drugulin</family>	<accept><family>Drugulin CLM</family></accept>	</alias>
-
-</fontconfig>
diff --git a/62-culmus-ellinia-clm.conf b/62-culmus-ellinia-clm.conf
deleted file mode 100644
index 60a5fa6..0000000
--- a/62-culmus-ellinia-clm.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-
-<!-- CULMUS ALIASES -->
-	<alias>	<family>Ellinia</family>	<accept><family>Ellinia CLM</family></accept>	</alias>
-
-</fontconfig>
diff --git a/62-culmus-frank-ruehl-clm.conf b/62-culmus-frank-ruehl-clm.conf
deleted file mode 100644
index fd95e6f..0000000
--- a/62-culmus-frank-ruehl-clm.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-
-<!-- WINDOWS ALIASES -->
-	<alias>
-		<family>FrankRuehl</family>
-		<family>Guttman Frank</family>
-		<family>Guttman Frnew</family>
-		<accept><family>Frank Ruehl CLM</family></accept>
-	</alias>
-
-<!-- CULMUS ALIASES -->
-	<alias>	<family>Frank Ruehl</family>	<accept><family>Frank Ruehl CLM</family></accept></alias>
-
-<!-- MAC ALIASES -->
-	<alias>	<family>New Peninim MT</family>	<accept><family>Frank Ruehl CLM</family></accept></alias>
-
-</fontconfig>
diff --git a/62-culmus-miriam-clm.conf b/62-culmus-miriam-clm.conf
deleted file mode 100644
index 4950519..0000000
--- a/62-culmus-miriam-clm.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-
-<!-- WINDOWS ALIASES -->
-	<alias>
-		<family>Guttman Miryam</family>
-		<family>Levenim MT</family>
-		<family>Miriam</family>
-		<family>Miriam Transparent</family>
-		<accept><family>Miriam CLM</family></accept>
-	</alias>
-
-</fontconfig>
diff --git a/62-culmus-miriam-mono-clm.conf b/62-culmus-miriam-mono-clm.conf
deleted file mode 100644
index 4bba546..0000000
--- a/62-culmus-miriam-mono-clm.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-
-<!-- WINDOWS ALIASES -->
-	<alias>
-		<family>Fixed Miriam Transparent</family>
-		<family>Guttman Myamfix</family>
-		<family>Guttman-CourMir</family>
-		<family>Miriam Fixed</family>
-		<accept><family>Miriam Mono CLM</family></accept>
-	</alias>
-
-<!-- CULMUS ALIASES -->
-	<alias>	<family>Miriam Mono</family>	<accept><family>Miriam Mono CLM</family></accept></alias>
-
-</fontconfig>
diff --git a/62-culmus-nachlieli-clm.conf b/62-culmus-nachlieli-clm.conf
deleted file mode 100644
index 968a728..0000000
--- a/62-culmus-nachlieli-clm.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-
-<!-- CULMUS ALIASES -->
-	<alias>	<family>Nachlieli</family>	<accept><family>Nachlieli CLM</family></accept>	</alias>
-
-<!-- MAC ALIASES -->
-	<alias>	<family>ArialHB</family>	<accept><family>Nachlieli CLM</family></accept>	</alias>
-
-</fontconfig>
diff --git a/65-culmus-aharoni-clm.conf b/65-culmus-aharoni-clm.conf
new file mode 100644
index 0000000..8c84d4b
--- /dev/null
+++ b/65-culmus-aharoni-clm.conf
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+<!-- WINDOWS ALIASES -->
+<!-- font substitution -->
+	<alias binding="same">
+		<family>Guttman Aharoni</family>
+		<family>Guttman-Aharoni</family>
+		<accept><family>Aharoni CLM</family></accept>
+	</alias>
+
+<!-- CULMUS ALIASES -->
+	<alias binding="same">
+		<family>Aharoni</family>
+		<accept><family>Aharoni CLM</family></accept>
+	</alias>
+
+
+<!-- generic names -->
+	<alias>
+	  <family>Aharoni CLM</family>
+		  <default>
+		    <family>sans-serif</family>
+		  </default>
+	</alias>
+
+<!-- locale-specific overrides -->
+	<match>
+		  <test name="lang">
+		    <string>he-il</string>
+		  </test>
+		  <test name="family">
+		    <string>sans-serif</string>
+		  </test>
+		  <edit name="family" mode="prepend" binding="same">
+		    <string>Aharoni CLM</string>
+		  </edit>
+	</match>
+
+</fontconfig>
diff --git a/65-culmus-caladings-clm.conf b/65-culmus-caladings-clm.conf
new file mode 100644
index 0000000..7a0ab55
--- /dev/null
+++ b/65-culmus-caladings-clm.conf
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+<!-- CULMUS ALIASES -->
+	<alias>	<family>Caladings</family>	<accept><family>Caladings CLM</family></accept>	</alias>
+
+<!-- generic names -->
+	<alias>
+		  <family>Caladings CLM</family>
+		  <default>
+		    <family>fantacy</family>
+		  </default>
+	</alias>
+
+</fontconfig>
diff --git a/65-culmus-david-clm.conf b/65-culmus-david-clm.conf
new file mode 100644
index 0000000..38664ae
--- /dev/null
+++ b/65-culmus-david-clm.conf
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+<!-- WINDOWS ALIASES -->
+
+	<!-- Guttman Adii is replaced with David Medium Italic -->
+	<match target="pattern" >
+		<test name="family" >
+			<string>Guttman Adii</string>
+		</test>
+		<edit mode="prepend" binding="same" name="family" >
+			<string>David CLM</string>
+		</edit>
+		<edit mode="prepend" binding="same" name="style" >
+			<string>Medium Italic</string>
+		</edit>
+	</match>
+
+	<alias>
+		<family>David Transparent</family>
+		<family>Guttman David</family>
+		<accept><family>David CLM</family></accept>
+	</alias>
+
+<!-- CULMUS ALIASES -->
+	<alias>	<family>David</family>		<accept><family>David CLM</family></accept>	</alias>
+        <alias> <family>David OT</family>       <accept><family>David CLM</family></accept>     </alias>
+
+<!-- MAC ALIASES -->
+	<alias>	<family>Raanana</family>	<accept><family>David CLM</family></accept>	</alias>
+
+<!-- generic names -->
+	<alias>
+		  <family>David CLM</family>
+		  <default>
+		    <family>serif</family>
+		  </default>
+	</alias>
+
+<!-- locale-specific overrides -->
+	<match>
+		  <test name="lang">
+		    <string>he-il</string>
+		  </test>
+		  <test name="family">
+		    <string>serif</string>
+		  </test>
+		  <edit name="family" mode="prepend" binding="same">
+		    <string>David CLM</string>
+		  </edit>
+	</match>
+
+</fontconfig>
diff --git a/65-culmus-drugulin-clm.conf b/65-culmus-drugulin-clm.conf
new file mode 100644
index 0000000..d26f7f8
--- /dev/null
+++ b/65-culmus-drugulin-clm.conf
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+<!-- WINDOWS ALIASES -->
+	<alias>
+		<family>Guttman Drogolin</family>
+		<family>Guttman Vilna</family>
+		<accept><family>Drugulin CLM</family></accept>
+	</alias>
+
+<!-- CULMUS ALIASES -->
+	<alias>	<family>Drugulin</family>	<accept><family>Drugulin CLM</family></accept>	</alias>
+
+<!-- generic names -->
+	<alias>
+		  <family>Drugulin CLM</family>
+		  <default>
+		    <family>serif</family>
+		  </default>
+	</alias>
+
+<!-- locale-specific overrides -->
+	<match>
+		  <test name="lang">
+		    <string>he-il</string>
+		  </test>
+		  <test name="family">
+		    <string>serif</string>
+		  </test>
+		  <edit name="family" mode="prepend" binding="same">
+		    <string>Drugulin CLM</string>
+		  </edit>
+	</match>
+
+</fontconfig>
diff --git a/65-culmus-ellinia-clm.conf b/65-culmus-ellinia-clm.conf
new file mode 100644
index 0000000..d668b69
--- /dev/null
+++ b/65-culmus-ellinia-clm.conf
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+<!-- CULMUS ALIASES -->
+	<alias>	<family>Ellinia</family>	<accept><family>Ellinia CLM</family></accept>	</alias>
+
+<!-- generic names -->
+	<alias>
+		  <family>Ellinia CLM</family>
+		  <default>
+		    <family>sans-serif</family>
+		  </default>
+	</alias>
+
+<!-- locale-specific overrides -->
+	<match>
+		  <test name="lang">
+		    <string>he-il</string>
+		  </test>
+		  <test name="family">
+		    <string>sans-serif</string>
+		  </test>
+		  <edit name="family" mode="prepend" binding="same">
+		    <string>Ellinia CLM</string>
+		  </edit>
+	</match>
+
+</fontconfig>
diff --git a/65-culmus-frank-ruehl-clm.conf b/65-culmus-frank-ruehl-clm.conf
new file mode 100644
index 0000000..08cd922
--- /dev/null
+++ b/65-culmus-frank-ruehl-clm.conf
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+<!-- WINDOWS ALIASES -->
+	<alias>
+		<family>FrankRuehl</family>
+		<family>Guttman Frank</family>
+		<family>Guttman Frnew</family>
+		<accept><family>Frank Ruehl CLM</family></accept>
+	</alias>
+
+<!-- CULMUS ALIASES -->
+	<alias>	<family>Frank Ruehl</family>	<accept><family>Frank Ruehl CLM</family></accept></alias>
+
+<!-- MAC ALIASES -->
+	<alias>	<family>New Peninim MT</family>	<accept><family>Frank Ruehl CLM</family></accept></alias>
+
+<!-- generic names -->
+	<alias>
+		  <family>Frank Ruehl CLM</family>
+		  <default>
+		    <family>serif</family>
+		  </default>
+	</alias>
+
+<!-- locale-specific overrides -->
+	<match>
+		  <test name="lang">
+		    <string>he-il</string>
+		  </test>
+		  <test name="family">
+		    <string>serif</string>
+		  </test>
+		  <edit name="family" mode="prepend" binding="same">
+		    <string>Frank Ruehl CLM</string>
+		  </edit>
+	</match>
+
+</fontconfig>
diff --git a/65-culmus-miriam-clm.conf b/65-culmus-miriam-clm.conf
new file mode 100644
index 0000000..f124fad
--- /dev/null
+++ b/65-culmus-miriam-clm.conf
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+<!-- WINDOWS ALIASES -->
+	<alias>
+		<family>Guttman Miryam</family>
+		<family>Levenim MT</family>
+		<family>Miriam</family>
+		<family>Miriam Transparent</family>
+		<accept><family>Miriam CLM</family></accept>
+	</alias>
+
+<!-- generic names -->
+	<alias>
+		  <family>Miriam CLM</family>
+		  <default>
+		    <family>sans-serif</family>
+		  </default>
+	</alias>
+
+<!-- locale-specific overrides -->
+	<match>
+		  <test name="lang">
+		    <string>he-il</string>
+		  </test>
+		  <test name="family">
+		    <string>sans-serif</string>
+		  </test>
+		  <edit name="family" mode="prepend" binding="same">
+		    <string>Miriam CLM</string>
+		  </edit>
+	</match>
+
+</fontconfig>
diff --git a/65-culmus-miriam-mono-clm.conf b/65-culmus-miriam-mono-clm.conf
new file mode 100644
index 0000000..b6b37ed
--- /dev/null
+++ b/65-culmus-miriam-mono-clm.conf
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+<!-- WINDOWS ALIASES -->
+	<alias>
+		<family>Fixed Miriam Transparent</family>
+		<family>Guttman Myamfix</family>
+		<family>Guttman-CourMir</family>
+		<family>Miriam Fixed</family>
+		<accept><family>Miriam Mono CLM</family></accept>
+	</alias>
+
+<!-- CULMUS ALIASES -->
+	<alias>	<family>Miriam Mono</family>	<accept><family>Miriam Mono CLM</family></accept></alias>
+
+
+<!-- generic names -->
+	<alias>
+		  <family>Miriam Mono CLM</family>
+		  <default>
+		    <family>sans-serif</family>
+		  </default>
+	</alias>
+
+<!-- locale-specific overrides -->
+	<match>
+		  <test name="lang">
+		    <string>he-il</string>
+		  </test>
+		  <test name="family">
+		    <string>sans-serif</string>
+		  </test>
+		  <edit name="family" mode="prepend" binding="same">
+		    <string>Miriam Mono CLM</string>
+		  </edit>
+	</match>
+
+</fontconfig>
diff --git a/65-culmus-nachlieli-clm.conf b/65-culmus-nachlieli-clm.conf
new file mode 100644
index 0000000..2a9eeee
--- /dev/null
+++ b/65-culmus-nachlieli-clm.conf
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+<!-- CULMUS ALIASES -->
+	<alias>	<family>Nachlieli</family>	<accept><family>Nachlieli CLM</family></accept>	</alias>
+
+<!-- MAC ALIASES -->
+	<alias>	<family>ArialHB</family>	<accept><family>Nachlieli CLM</family></accept>	</alias>
+
+
+<!-- generic names -->
+	<alias>
+		  <family>Nachlieli CLM</family>
+		  <default>
+		    <family>sans-serif</family>
+		  </default>
+	</alias>
+
+<!-- locale-specific overrides -->
+	<match>
+		  <test name="lang">
+		    <string>he-il</string>
+		  </test>
+		  <test name="family">
+		    <string>sans-serif</string>
+		  </test>
+		  <edit name="family" mode="prepend" binding="same">
+		    <string>Nachlieli CLM</string>
+		  </edit>
+	</match>
+
+</fontconfig>
diff --git a/culmus-fonts.spec b/culmus-fonts.spec
index 46a74f5..63563cc 100644
--- a/culmus-fonts.spec
+++ b/culmus-fonts.spec
@@ -1,5 +1,5 @@
 %define fontname culmus
-%define fontconf 62-%{fontname}
+%define fontconf 65-%{fontname}
 
 %define common_desc \
 The culmus-fonts package contains fonts for the display of\
@@ -8,7 +8,7 @@ Hebrew from the Culmus project.
 
 Name:           %{fontname}-fonts
 Version:        0.104
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Fonts for Hebrew from Culmus project
 
 Group:          User Interface/X
@@ -250,6 +250,10 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Fri Feb 19 2010 Pravin Satpute <psatpute@redhat.com> - 0.104-2
+- updated .conf file priorities
+- fixed bug 565385
+
 * Fri Feb 12 2010 Pravin Satpute <psatpute@redhat.com> - 0.104-1
 - new upstream release