rpms/VLGothic-fonts/devel VLGothic-fontconfig-monospace.conf, NONE, 1.1 VLGothic-fontconfig-proportional.conf, NONE, 1.1 VLGothic-fonts.spec, 1.16, 1.17 59-VLGothic-monospace.conf, 1.2, NONE 59-VLGothic-proportional.conf, 1.1, NONE

[Akira TAGOH]

Author: tagoh

Update of /cvs/pkgs/rpms/VLGothic-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2107

Modified Files:
	VLGothic-fonts.spec 
Added Files:
	VLGothic-fontconfig-monospace.conf 
	VLGothic-fontconfig-proportional.conf 
Removed Files:
	59-VLGothic-monospace.conf 59-VLGothic-proportional.conf 
Log Message:
* Thu Dec  4 2008 Akira TAGOH <tagoh(a)redhat.com&gt; - 20081203-1
- update to 20081203 release.
- clean up spec file.
- changed the priority prefix for fontconfig to 66 according to Fontconfig packaging
tips.


--- NEW FILE VLGothic-fontconfig-monospace.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
    <match target="font">
        <test name="family">
            <string>VL Gothic</string>
        </test>
        <edit name="hinting" mode="assign">
            <bool>false</bool>
        </edit>
    </match>
    
    <match target="pattern">
        <test name="family">
            <string>monospace</string>
        </test>
        <test name="lang" compare="contains">
            <string>jp</string>
        </test>
        <edit name="lang" mode="prepend"
binding="strong">
            <string>en</string>
        </edit>
    </match>

    <alias>
        <family>monospace</family>
        <prefer>
            <family>DejaVu Sans Mono</family>
            <family>VL Gothic</family>
        </prefer>
    </alias>
</fontconfig>


--- NEW FILE VLGothic-fontconfig-proportional.conf ---
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
    <match target="font">
        <test name="family">
            <string>VL PGothic</string>
        </test>
        <edit name="hinting" mode="assign">
            <bool>false</bool>
        </edit>
    </match>

    <match target="pattern">
        <test name="family">
            <string>sans-serif</string>
        </test>
        <test name="lang" compare="contains">
            <string>jp</string>
        </test>
        <edit name="lang" mode="prepend"
binding="strong">
            <string>en</string>
        </edit>
    </match>

    <alias>
        <family>sans-serif</family>
        <prefer>
            <family>DejaVu Sans</family>
            <family>VL PGothic</family>
        </prefer>
    </alias>
</fontconfig>


Index: VLGothic-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/VLGothic-fonts/devel/VLGothic-fonts.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- VLGothic-fonts.spec	29 Oct 2008 05:41:33 -0000	1.16
+++ VLGothic-fonts.spec	5 Dec 2008 03:13:31 -0000	1.17
@@ -1,9 +1,10 @@
 %define fontname VLGothic
 %define fontdir %{_datadir}/fonts/%{fontname}
 %define fontconfdir %{_sysconfdir}/fonts/conf.d
+%define priority 66
 
 Name: %{fontname}-fonts
-Version: 20081029
+Version: 20081203
 Release: 1%{?dist}
 Summary: Japanese TrueType font
 
@@ -11,8 +12,8 @@
 Group: User Interface/X
 URL: http://dicey.org/vlgothic
 Source0: http://vinelinux.org/~daisuke/vlgothic/%{fontname}-%{version}.tar.bz2
-Source1: 59-VLGothic-proportional.conf
-Source2: 59-VLGothic-monospace.conf
+Source1: %{fontname}-fontconfig-proportional.conf
+Source2: %{fontname}-fontconfig-monospace.conf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 # added for f9 can be dropped in f11:
@@ -52,37 +53,37 @@
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
-mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/fonts/conf.d
-install -p -m644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_sysconfdir}/fonts/conf.d
-install -p -m644 %{SOURCE2} ${RPM_BUILD_ROOT}/%{_sysconfdir}/fonts/conf.d
+install -m0755 -d $RPM_BUILD_ROOT%{fontconfdir}
+install -p -m644 %{SOURCE1}
${RPM_BUILD_ROOT}%{fontconfdir}/%{priority}-%{fontname}-proportional.conf
+install -p -m644 %{SOURCE2}
${RPM_BUILD_ROOT}%{fontconfdir}/%{priority}-%{fontname}-monospace.conf
 
-mkdir -p ${RPM_BUILD_ROOT}/%{fontdir}
-mkdir -p ${RPM_BUILD_ROOT}/%{fontdir}-proportional
+install -m0755 -d $RPM_BUILD_ROOT%{fontdir}
+install -m0755 -d $RPM_BUILD_ROOT%{fontdir}-proportional
 install -p -m644 VL-Gothic-Regular.ttf ${RPM_BUILD_ROOT}/%{fontdir}
 install -p -m644 VL-PGothic-Regular.ttf ${RPM_BUILD_ROOT}/%{fontdir}-proportional
 
 
 %post
 if [ -x %{_bindir}/fc-cache ]; then
-  %{_bindir}/fc-cache -f %{fontdir} || :
+  %{_bindir}/fc-cache %{fontdir} || :
 fi
 
 %postun
 if [ "$1" = "0" ]; then
   if [ -x %{_bindir}/fc-cache ]; then
-    %{_bindir}/fc-cache -f %{fontdir} || :
+    %{_bindir}/fc-cache %{fontdir} || :
   fi
 fi
 
 %post proportional
 if [ -x %{_bindir}/fc-cache ]; then
-  %{_bindir}/fc-cache -f %{fontdir}-proportional || :
+  %{_bindir}/fc-cache %{fontdir}-proportional || :
 fi
 
 %postun proportional
 if [ "$1" = "0" ]; then
   if [ -x %{_bindir}/fc-cache ]; then
-    %{_bindir}/fc-cache -f %{fontdir}-proportional || :
+    %{_bindir}/fc-cache %{fontdir}-proportional || :
   fi
 fi
 
@@ -92,20 +93,26 @@
 
 
 %files
-%defattr(-,root,root,-)
+%defattr(0644,root,root,0755)
 %doc README* LICENSE*
 %dir %{fontdir}
-%config(noreplace) %{_sysconfdir}/fonts/conf.d/59-VLGothic-monospace.conf
+%config(noreplace) %{fontconfdir}/%{priority}-%{fontname}-monospace.conf
 %{fontdir}/VL-Gothic-Regular.ttf
 
 %files proportional
+%defattr(0644,root,root,0755)
 %doc README* LICENSE*
 %dir %{fontdir}-proportional
-%config(noreplace) %{_sysconfdir}/fonts/conf.d/59-VLGothic-proportional.conf
+%config(noreplace) %{fontconfdir}/%{priority}-%{fontname}-proportional.conf
 %{fontdir}-proportional/VL-PGothic-Regular.ttf
 
 
 %changelog
+* Thu Dec  4 2008 Akira TAGOH <tagoh(a)redhat.com&gt; - 20081203-1
+- update to 20081203 release.
+- clean up spec file.
+- changed the priority prefix for fontconfig to 66 according to Fontconfig packaging
tips.
+
 * Wed Oct 29 2008 Akira TAGOH <tagoh(a)redhat.com&gt; - 20081029-1
 - update to 20081029 release.
 


--- 59-VLGothic-monospace.conf DELETED ---


--- 59-VLGothic-proportional.conf DELETED ---