Fri Feb 26 03:17:07 UTC 2010

Author: pravins

Update of /cvs/pkgs/rpms/kacst-fonts/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16220

Modified Files:
	kacst-fonts.spec 
Added Files:
	67-kacst-art.conf 67-kacst-book.conf 67-kacst-decorative.conf 
	67-kacst-digital.conf 67-kacst-farsi.conf 67-kacst-letter.conf 
	67-kacst-naskh.conf 67-kacst-office.conf 67-kacst-one.conf 
	67-kacst-pen.conf 67-kacst-poster.conf 67-kacst-qurn.conf 
	67-kacst-screen.conf 67-kacst-title.conf 67-kacst-titlel.conf 
Log Message:
* Fri Feb 25 2010 Pravin Satpute <psatpute at redhat.com> - 2.0-6
- added .conf file for each subpackage
- resolves bug 567608

--- NEW FILE 67-kacst-art.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<match>
  <test name="lang" compare="contains">
    <string>ar</string>
  </test>
  <test name="family">
    <string>serif</string>
  </test>
  <edit name="family" mode="prepend" binding="same">
    <string>KacstArt</string>
  </edit>
</match>
<alias>
  <family>KacstArt</family>
  <default>
    <family>serif</family>
  </default>
</alias>
</fontconfig>



--- NEW FILE 67-kacst-book.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<match>
  <test name="lang" compare="contains">
    <string>ar</string>
  </test>
  <test name="family">
    <string>sans-serif</string>
  </test>
  <edit name="family" mode="prepend" binding="same">
    <string>KacstBook</string>
  </edit>
</match>
<alias>
  <family>KacstBook</family>
  <default>
    <family>sans-serif</family>
  </default>
</alias>
</fontconfig>



--- NEW FILE 67-kacst-decorative.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<match>
  <test name="lang" compare="contains">
    <string>ar</string>
  </test>
  <test name="family">
    <string>serif</string>
  </test>
  <edit name="family" mode="prepend" binding="same">
    <string>KacstDecorative</string>
  </edit>
</match>
<alias>
  <family>KacstDecorative</family>
  <default>
    <family>serif</family>
  </default>
</alias>
</fontconfig>



--- NEW FILE 67-kacst-digital.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<match>
  <test name="lang" compare="contains">
    <string>ar</string>
  </test>
  <test name="family">
    <string>sans-serif</string>
  </test>
  <edit name="family" mode="prepend" binding="same">
    <string>KacstDigital</string>
  </edit>
</match>
<alias>
  <family>KacstDigital</family>
  <default>
    <family>sans-serif</family>
  </default>
</alias>
</fontconfig>



--- NEW FILE 67-kacst-farsi.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<match>
  <test name="lang" compare="contains">
    <string>ar</string>
  </test>
  <test name="family">
    <string>sans-serif</string>
  </test>
  <edit name="family" mode="prepend" binding="same">
    <string>KacstFarsi</string>
  </edit>
</match>
<alias>
  <family>KacstFarsi</family>
  <default>
    <family>sans-serif</family>
  </default>
</alias>
</fontconfig>



--- NEW FILE 67-kacst-letter.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<match>
  <test name="lang" compare="contains">
    <string>ar</string>
  </test>
  <test name="family">
    <string>sans-serif</string>
  </test>
  <edit name="family" mode="prepend" binding="same">
    <string>KacstLetter</string>
  </edit>
</match>
<alias>
  <family>KacstLetter</family>
  <default>
    <family>sans-serif</family>
  </default>
</alias>
</fontconfig>



--- NEW FILE 67-kacst-naskh.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<match>
  <test name="lang" compare="contains">
    <string>ar</string>
  </test>
  <test name="family">
    <string>sans-serif</string>
  </test>
  <edit name="family" mode="prepend" binding="same">
    <string>KacstNaskh</string>
  </edit>
</match>
<alias>
  <family>KacstNaskh</family>
  <default>
    <family>sans-serif</family>
  </default>
</alias>
</fontconfig>



--- NEW FILE 67-kacst-office.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<match>
  <test name="lang" compare="contains">
    <string>ar</string>
  </test>
  <test name="family">
    <string>sans-serif</string>
  </test>
  <edit name="family" mode="prepend" binding="same">
    <string>KacstOffice</string>
  </edit>
</match>
<alias>
  <family>KacstOffice</family>
  <default>
    <family>sans-serif</family>
  </default>
</alias>
</fontconfig>



--- NEW FILE 67-kacst-one.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<match>
  <test name="lang" compare="contains">
    <string>ar</string>
  </test>
  <test name="family">
    <string>sans-serif</string>
  </test>
  <edit name="family" mode="prepend" binding="same">
    <string>KacstOne</string>
  </edit>
</match>
<alias>
  <family>KacstOne</family>
  <default>
    <family>sans-serif</family>
  </default>
</alias>
</fontconfig>



--- NEW FILE 67-kacst-pen.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<match>
  <test name="lang" compare="contains">
    <string>ar</string>
  </test>
  <test name="family">
    <string>sans-serif</string>
  </test>
  <edit name="family" mode="prepend" binding="same">
    <string>kacstPen</string>
  </edit>
</match>
<alias>
  <family>kacstPen</family>
  <default>
    <family>sans-serif</family>
  </default>
</alias>
</fontconfig>



--- NEW FILE 67-kacst-poster.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<match>
  <test name="lang" compare="contains">
    <string>ar</string>
  </test>
  <test name="family">
    <string>sans-serif</string>
  </test>
  <edit name="family" mode="prepend" binding="same">
    <string>KacstPoster</string>
  </edit>
</match>
<alias>
  <family>KacstPoster</family>
  <default>
    <family>sans-serif</family>
  </default>
</alias>
</fontconfig>



--- NEW FILE 67-kacst-qurn.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<match>
  <test name="lang" compare="contains">
    <string>ar</string>
  </test>
  <test name="family">
    <string>sans-serif</string>
  </test>
  <edit name="family" mode="prepend" binding="same">
    <string>KacstQurn</string>
  </edit>
</match>
<alias>
  <family>KacstQurn</family>
  <default>
    <family>sans-serif</family>
  </default>
</alias>
</fontconfig>



--- NEW FILE 67-kacst-screen.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<match>
  <test name="lang" compare="contains">
    <string>ar</string>
  </test>
  <test name="family">
    <string>sans-serif</string>
  </test>
  <edit name="family" mode="prepend" binding="same">
    <string>KacstScreen</string>
  </edit>
</match>
<alias>
  <family>KacstScreen</family>
  <default>
    <family>sans-serif</family>
  </default>
</alias>
</fontconfig>



--- NEW FILE 67-kacst-title.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<match>
  <test name="lang" compare="contains">
    <string>ar</string>
  </test>
  <test name="family">
    <string>sans-serif</string>
  </test>
  <edit name="family" mode="prepend" binding="same">
    <string>KacstTitle</string>
  </edit>
</match>
<alias>
  <family>KacstTitle</family>
  <default>
    <family>sans-serif</family>
  </default>
</alias>
</fontconfig>



--- NEW FILE 67-kacst-titlel.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<match>
  <test name="lang" compare="contains">
    <string>ar</string>
  </test>
  <test name="family">
    <string>sans-serif</string>
  </test>
  <edit name="family" mode="prepend" binding="same">
    <string>KacstTitleL</string>
  </edit>
</match>
<alias>
  <family>KacstTitleL</family>
  <default>
    <family>sans-serif</family>
  </default>
</alias>
</fontconfig>



Index: kacst-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kacst-fonts/F-13/kacst-fonts.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- kacst-fonts.spec	25 Jul 2009 04:16:20 -0000	1.8
+++ kacst-fonts.spec	26 Feb 2010 03:17:07 -0000	1.9
@@ -1,5 +1,6 @@
 %define fontname kacst
 %define fontdir %{_datadir}/fonts/%{fontname}
+%define	fontconf	67-%{fontname}
 
 # Common description
 %define common_desc \
@@ -8,24 +9,40 @@ from the King Abdulaziz City for Science
 
 Name: %{fontname}-fonts
 Version: 2.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Source: http://downloads.sourceforge.net/sourceforge/arabeyes/%{fontname}_fonts_%{version}.tar.bz2
+Source1: %{fontconf}-art.conf
+Source2: %{fontconf}-book.conf
+Source3: %{fontconf}-decorative.conf
+Source4: %{fontconf}-digital.conf
+Source5: %{fontconf}-farsi.conf
+Source6: %{fontconf}-letter.conf
+Source7: %{fontconf}-naskh.conf
+Source8: %{fontconf}-office.conf
+Source9: %{fontconf}-one.conf
+Source10: %{fontconf}-pen.conf
+Source11: %{fontconf}-poster.conf
+Source12: %{fontconf}-qurn.conf
+Source13: %{fontconf}-screen.conf
+Source14: %{fontconf}-title.conf
+Source15: %{fontconf}-titlel.conf
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-BuildRequires:  dos2unix
-BuildRequires:  fontpackages-devel > 1.13
+BuildRequires:	dos2unix
+BuildRequires:	fontpackages-devel > 1.13
 Group: User Interface/X
 Obsoletes: fonts-arabic <= 2.1-2
 Summary: Fonts for arabic from arabeyes project 
-URL: http://www.arabeyes.org/resources.php
+URL: http://www.arabeyes.org/resources.php	
  
 %description
 %common_desc
 
 %package common
 Summary:  Common files for kacst-fonts
-Group:  User Interface/X
+Group:	User Interface/X
 Requires: fontpackages-filesystem
 
 %description common
@@ -41,7 +58,7 @@ Obsoletes: %{name} < 2.0-3
 %description -n %{fontname}-book-fonts
 This package contains book type fonts for the display of Arabic 
 
-%_font_pkg -n book KacstBook.ttf
+%_font_pkg -n book -f  %{fontconf}-book* KacstBook.ttf
 
 %package -n %{fontname}-digital-fonts
 Summary: Fonts for arabic from arabeyes project 
@@ -53,7 +70,7 @@ Obsoletes: %{name} < 2.0-3
 %description -n %{fontname}-digital-fonts
 This package contains digital type fonts for the display of Arabic 
 
-%_font_pkg -n digital KacstDigital.ttf
+%_font_pkg -n digital -f %{fontconf}-digital* KacstDigital.ttf
 
 %package -n %{fontname}-letter-fonts
 Summary: Fonts for arabic from arabeyes project 
@@ -65,7 +82,7 @@ Obsoletes: %{name} < 2.0-3
 %description -n %{fontname}-letter-fonts
 This package contains book kacst fonts for the display of Arabic 
 
-%_font_pkg -n letter KacstLetter.ttf
+%_font_pkg -n letter -f %{fontconf}-letter* KacstLetter.ttf
 
 %package -n %{fontname}-office-fonts
 Summary: Fonts for arabic from arabeyes project 
@@ -77,7 +94,7 @@ Obsoletes: %{name} < 2.0-3
 %description -n %{fontname}-office-fonts
 This package contains office type fonts for the display of Arabic 
 
-%_font_pkg -n office KacstOffice.ttf
+%_font_pkg -n office -f %{fontconf}-office* KacstOffice.ttf
 
 %package -n %{fontname}-pen-fonts
 Summary: Fonts for arabic from arabeyes project 
@@ -89,7 +106,7 @@ Obsoletes: %{name} < 2.0-3
 %description -n %{fontname}-pen-fonts
 This package contains pen type fonts for the display of Arabic 
 
-%_font_pkg -n pen kacstPen.ttf
+%_font_pkg -n pen -f %{fontconf}-pen* kacstPen.ttf
 
 %package -n %{fontname}-qurn-fonts
 Summary: Fonts for arabic from arabeyes project 
@@ -101,7 +118,7 @@ Obsoletes: %{name} < 2.0-3
 %description -n %{fontname}-qurn-fonts
 This package contains qurn type fonts for the display of Arabic 
 
-%_font_pkg -n qurn KacstQurn.ttf
+%_font_pkg -n qurn -f %{fontconf}-qurn* KacstQurn.ttf
 
 %package -n %{fontname}-titlel-fonts
 Summary: Fonts for arabic from arabeyes project 
@@ -113,7 +130,7 @@ Obsoletes: %{name} < 2.0-3
 %description -n %{fontname}-titlel-fonts
 This package contains title large type fonts for the display of Arabic 
 
-%_font_pkg -n titlel KacstTitleL.ttf
+%_font_pkg -n titlel -f %{fontconf}-titlel.conf KacstTitleL.ttf
 
 %package -n %{fontname}-art-fonts
 Summary: Fonts for arabic from arabeyes project 
@@ -125,7 +142,7 @@ Obsoletes: %{name} < 2.0-3
 %description -n %{fontname}-art-fonts
 This package contains art type fonts for the display of Arabic 
 
-%_font_pkg -n art KacstArt.ttf
+%_font_pkg -n art -f %{fontconf}-art* KacstArt.ttf
 
 %package -n %{fontname}-decorative-fonts
 Summary: Fonts for arabic from arabeyes project 
@@ -137,7 +154,7 @@ Obsoletes: %{name} < 2.0-3
 %description -n %{fontname}-decorative-fonts
 This package contains decorative type fonts for the display of Arabic 
 
-%_font_pkg -n decorative KacstDecorative.ttf
+%_font_pkg -n decorative -f %{fontconf}-decorative* KacstDecorative.ttf
 
 %package -n %{fontname}-farsi-fonts
 Summary: Fonts for arabic from arabeyes project 
@@ -149,7 +166,7 @@ Obsoletes: %{name} < 2.0-3
 %description -n %{fontname}-farsi-fonts
 This package contains farsi type fonts for the display of Arabic 
 
-%_font_pkg -n farsi KacstFarsi.ttf
+%_font_pkg -n farsi -f %{fontconf}-farsi* KacstFarsi.ttf
 
 %package -n %{fontname}-naskh-fonts
 Summary: Fonts for arabic from arabeyes project 
@@ -161,7 +178,7 @@ Obsoletes: %{name} < 2.0-3
 %description -n %{fontname}-naskh-fonts
 This package contains naskh type fonts for the display of Arabic 
 
-%_font_pkg -n naskh KacstNaskh.ttf
+%_font_pkg -n naskh -f %{fontconf}-naskh* KacstNaskh.ttf
 
 %package -n %{fontname}-one-fonts
 Summary: Fonts for arabic from arabeyes project 
@@ -173,7 +190,7 @@ Obsoletes: %{name} < 2.0-3
 %description -n %{fontname}-one-fonts
 This package contains one type fonts for the display of Arabic 
 
-%_font_pkg -n one KacstOne.ttf
+%_font_pkg -n one -f %{fontconf}-one* KacstOne.ttf
 
 %package -n %{fontname}-poster-fonts
 Summary: Fonts for arabic from arabeyes project 
@@ -185,7 +202,7 @@ Obsoletes: %{name} < 2.0-3
 %description -n %{fontname}-poster-fonts
 This package contains poster type fonts for the display of Arabic 
 
-%_font_pkg -n poster KacstPoster.ttf
+%_font_pkg -n poster -f %{fontconf}-poster* KacstPoster.ttf
 
 %package -n %{fontname}-screen-fonts
 Summary: Fonts for arabic from arabeyes project 
@@ -197,7 +214,7 @@ Obsoletes: %{name} < 2.0-3
 %description -n %{fontname}-screen-fonts
 This package contains screen type fonts for the display of Arabic 
 
-%_font_pkg -n screen KacstScreen.ttf
+%_font_pkg -n screen -f %{fontconf}-screen* KacstScreen.ttf
 
 %package -n %{fontname}-title-fonts
 Summary: Fonts for arabic from arabeyes project 
@@ -209,9 +226,8 @@ Obsoletes: %{name} < 2.0-3
 %description -n %{fontname}-title-fonts
 This package contains title type fonts for the display of Arabic 
 
-%_font_pkg -n title KacstTitle.ttf
+%_font_pkg -n title -f %{fontconf}-title.conf KacstTitle.ttf
 
-#%{_fontdir} is shared by following packages since they all are for malayalam script only
 
 %prep
 %setup -q -n KacstArabicFonts-%{version}
@@ -226,6 +242,60 @@ rm -rf %{buildroot} 
 install -m 0755 -d %{buildroot}%{fontdir}
 install -m 0644 -p *.ttf %{buildroot}%{fontdir}
 
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+		%{buildroot}%{_fontconfig_confdir}
+
+install -m 0644 -p %{SOURCE1} \
+	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-art.conf
+install -m 0644 -p %{SOURCE2} \
+	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-book.conf
+install -m 0644 -p %{SOURCE3} \
+	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-decorative.conf
+install -m 0644 -p %{SOURCE4} \
+	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-digital.conf
+install -m 0644 -p %{SOURCE5} \
+	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-farsi.conf
+install -m 0644 -p %{SOURCE6} \
+	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-letter.conf
+install -m 0644 -p %{SOURCE7} \
+	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-naskh.conf
+install -m 0644 -p %{SOURCE8} \
+	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-office.conf
+install -m 0644 -p %{SOURCE9} \
+	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-one.conf
+install -m 0644 -p %{SOURCE10} \
+	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-pen.conf
+install -m 0644 -p %{SOURCE11} \
+	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-poster.conf
+install -m 0644 -p %{SOURCE12} \
+	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-qurn.conf
+install -m 0644 -p %{SOURCE13} \
+	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-screen.conf
+install -m 0644 -p %{SOURCE14} \
+	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-title.conf
+install -m 0644 -p %{SOURCE15} \
+	%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-titlel.conf
+
+for fconf in %{fontconf}-art.conf \
+		%{fontconf}-book.conf \
+		%{fontconf}-decorative.conf \
+		%{fontconf}-digital.conf \
+		%{fontconf}-farsi.conf \
+		%{fontconf}-letter.conf \
+		%{fontconf}-naskh.conf \
+		%{fontconf}-office.conf \
+		%{fontconf}-one.conf \
+		%{fontconf}-pen.conf \
+		%{fontconf}-poster.conf \
+		%{fontconf}-qurn.conf \
+		%{fontconf}-screen.conf \
+		%{fontconf}-title.conf \
+		%{fontconf}-titlel.conf ; do
+  ln -s %{_fontconfig_templatedir}/$fconf \
+	%{buildroot}%{_fontconfig_confdir}/$fconf
+done
+
+
 %clean
 rm -rf %{buildroot}
 
@@ -235,6 +305,10 @@ rm -rf %{buildroot}
 %dir %{fontdir}
 
 %changelog
+* Fri Feb 25 2010 Pravin Satpute <psatpute at redhat.com> - 2.0-6
+- added .conf file for each subpackage
+- resolves bug 567608
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

