rpms/senamirmir-washra-fonts/devel senamirmir-washra-fonts-fontconfig.conf, NONE, 1.1 import.log, 1.1, 1.2 senamirmir-washra-fonts.spec, 1.2, 1.3

[nim]

Author: nim

Update of /cvs/extras/rpms/senamirmir-washra-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6030/devel

Modified Files:
	import.log senamirmir-washra-fonts.spec 
Added Files:
	senamirmir-washra-fonts-fontconfig.conf 
Log Message:
fixup washra bold/semibold naming


--- NEW FILE senamirmir-washra-fonts-fontconfig.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
  <match target="scan">
    <test name="family">
      <string>Ethiopic WashRa Bold</string>
    </test>
    <test name="style">
      <string>Bold</string>
    </test>
    <edit name="family">
      <string>Ethiopic WashRa</string>
    </edit>
    <edit name="weight">
      <int>700</int>
    </edit>
  </match>
  <alias binding="same">
    <family>Ethiopic WashRa Bold</family>
    <accept>
      <family>Ethiopic WashRa</family>
    </accept>
  </alias>
  <match target="scan">
    <test name="family">
      <string>Ethiopic WashRa SemiBold</string>
    </test>
    <test name="style">
      <string>Bold</string>
    </test>
    <edit name="family">
      <string>Ethiopic WashRa</string>
    </edit>
    <edit name="style">
      <string>DemiBold</string>
    </edit>
    <edit name="weight">
      <int>600</int>
    </edit>
  </match>
  <alias binding="same">
    <family>Ethiopic WashRa SemiBold</family>
    <style>Bold</style>
    <accept>
      <family>Ethiopic WashRa</family>
      <style>DemiBold</style>
    </accept>
  </alias>
  <alias>
    <family>serif</family>
    <prefer>
      <family>Ethiopic WashRa</family>
    </prefer>
  </alias>
  <alias>
    <family>Ethiopic WashRa</family>
    <default>
      <family>serif</family>
    </default>
  </alias>
</fontconfig>


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/senamirmir-washra-fonts/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	10 Jun 2009 21:48:27 -0000	1.1
+++ import.log	13 Sep 2009 17:09:39 -0000	1.2
@@ -1 +1,2 @@
 senamirmir-washra-fonts-4_1-1_fc12:HEAD:senamirmir-washra-fonts-4.1-1.fc12.src.rpm:1244670473
+senamirmir-washra-fonts-4_1-3_fc12:HEAD:senamirmir-washra-fonts-4.1-3.fc12.src.rpm:1252861746


Index: senamirmir-washra-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/senamirmir-washra-fonts/devel/senamirmir-washra-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- senamirmir-washra-fonts.spec	27 Jul 2009 04:08:59 -0000	1.2
+++ senamirmir-washra-fonts.spec	13 Sep 2009 17:09:39 -0000	1.3
@@ -11,18 +11,21 @@ Eritrean languages (Amharic, Blin, Geʼe
 
 Name:    %{fontname}-fonts
 Version: 4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Fonts for the Geʼez (Ethiopic) script
 
 Group:   User Interface/X
 License: OFL
 URL:     http://www.senamirmir.org/projects/typography/typeface.html
 Source0: http://www.senamirmir.org/downloads/%{archivename}.zip
+# Problems reported upstream
+# https://www.redhat.com/archives/fedora-fonts-list/2009-June/msg00002.html
+Source1: %{name}-fontconfig.conf
 # We need upstream or someone who knows local Ethiopian usage to suggest a
-# classification we could relay to fontconfig. In the meanwhile, only two
+# classification we could relay to fontconfig. In the meanwhile, only three
 # font families classified
-Source1: %{name}-yigezu-bisrat-goffer-fontconfig.conf
-Source2: %{name}-yigezu-bisrat-gothic-fontconfig.conf
+Source2: %{name}-yigezu-bisrat-goffer-fontconfig.conf
+Source3: %{name}-yigezu-bisrat-gothic-fontconfig.conf
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -32,7 +35,7 @@ BuildRequires: fontpackages-devel
 %description
 %common_desc
 
-%_font_pkg washrab.ttf washrasb.ttf
+%_font_pkg -f %{fontconf}.conf washrab.ttf washrasb.ttf
 
 %package common
 Summary:  Common files of %{name}
@@ -181,11 +184,14 @@ install -m 0755 -d %{buildroot}%{_fontco
 
 # No info available to classify the other fonts
 install -m 0644 -p %{SOURCE1} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-yigezu-bisrat-goffer.conf
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}.conf
 install -m 0644 -p %{SOURCE2} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-yigezu-bisrat-goffer.conf
+install -m 0644 -p %{SOURCE3} \
         %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-yigezu-bisrat-gothic.conf
 
-for fconf in %{fontconf}-yigezu-bisrat-goffer.conf \
+for fconf in %{fontconf}.conf \
+             %{fontconf}-yigezu-bisrat-goffer.conf \
              %{fontconf}-yigezu-bisrat-gothic.conf ; do
   ln -s %{_fontconfig_templatedir}/$fconf \
         %{buildroot}%{_fontconfig_confdir}/$fconf
@@ -202,9 +208,13 @@ rm -fr %{buildroot}
 
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
+* Sun Sep 13 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 4.1-3
+— Fix WashRa Bold and SemiBold naming
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- 4.1-2
+— Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Tue Jun 2 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 4.1-1