rpms/VLGothic-fonts/devel 59-VLGothic-monospace.conf, 1.1, 1.2 59-VLGothic-sans.conf, 1.1, 1.2 VLGothic-fonts.spec, 1.8, 1.9

[Ryo Dairiki (ryo)]

Author: ryo

Update of /cvs/pkgs/rpms/VLGothic-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3013

Modified Files:
	59-VLGothic-monospace.conf 59-VLGothic-sans.conf 
	VLGothic-fonts.spec 
Log Message:
make it remove the old config file


Index: 59-VLGothic-monospace.conf
===================================================================
RCS file: /cvs/pkgs/rpms/VLGothic-fonts/devel/59-VLGothic-monospace.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 59-VLGothic-monospace.conf	18 Oct 2007 14:28:57 -0000	1.1
+++ 59-VLGothic-monospace.conf	28 Oct 2007 07:50:21 -0000	1.2
@@ -9,20 +9,24 @@
             <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>
-
-    <match target="pattern">
-        <test name="family">
-            <string>monospace</string>
-        </test>
-        <edit name="family" mode="prepend" binding="strong">
-            <string>DejaVu Sans Mono</string>
-        </edit>
-    </match>
 </fontconfig>


Index: 59-VLGothic-sans.conf
===================================================================
RCS file: /cvs/pkgs/rpms/VLGothic-fonts/devel/59-VLGothic-sans.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 59-VLGothic-sans.conf	18 Oct 2007 14:28:57 -0000	1.1
+++ 59-VLGothic-sans.conf	28 Oct 2007 07:50:21 -0000	1.2
@@ -10,19 +10,23 @@
         </edit>
     </match>
 
-    <alias>
-        <family>sans-serif</family>
-        <prefer>
-            <family>VL PGothic</family>
-        </prefer>
-    </alias>
-
     <match target="pattern">
         <test name="family">
             <string>sans-serif</string>
         </test>
-        <edit name="family" mode="prepend" binding="strong">
-            <string>DejaVu Sans</string>
+        <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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- VLGothic-fonts.spec	18 Oct 2007 14:28:57 -0000	1.8
+++ VLGothic-fonts.spec	28 Oct 2007 07:50:21 -0000	1.9
@@ -1,6 +1,6 @@
 Name: VLGothic-fonts
 Version: 20071015
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: VLGothic the Japanese TrueType font
 
 License: mplus and BSD
@@ -35,6 +35,7 @@
 Summary: Sans glyphs of VLGothic-fonts
 Group: User Interface/X
 Requires: %{name}-docs = %{version}-%{release}
+Obsoletes: VLGothic < %{version}-%{release}
 
 %description sans
 The VLGothic-fonts-sans package contains sans glyphs of VLGothic fonts.
@@ -43,6 +44,7 @@
 Summary: Monospace glyphs of VLGothic-fonts
 Group: User Interface/X
 Requires: %{name}-docs = %{version}-%{release}
+Obsoletes: VLGothic < %{version}-%{release}
 
 %description monospace
 The VLGothic-fonts-monospace package contains monospace glyphs of VLGothic fonts.
@@ -61,9 +63,14 @@
 install -p -m644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_sysconfdir}/fonts/conf.d
 install -p -m644 %{SOURCE2} ${RPM_BUILD_ROOT}/%{_sysconfdir}/fonts/conf.d
 
-mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/fonts/japanese/TrueType
-mv *.ttf ${RPM_BUILD_ROOT}/%{_datadir}/fonts/japanese/TrueType
+mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/fonts/VLGothic
+mv *.ttf ${RPM_BUILD_ROOT}/%{_datadir}/fonts/VLGothic
 
+%post sans
+rm -f /etc/fonts/conf.d/59-VLGothic.conf
+
+%post monospace
+rm -f /etc/fonts/conf.d/59-VLGothic.conf
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -73,16 +80,14 @@
 %defattr(-,root,root,-)
 
 %files monospace
-%dir %{_datadir}/fonts/japanese/
-%dir %{_datadir}/fonts/japanese/TrueType
+%dir %{_datadir}/fonts/VLGothic
 %config %{_sysconfdir}/fonts/conf.d/59-VLGothic-monospace.conf
-%{_datadir}/fonts/japanese/TrueType/VL-Gothic-Regular.ttf
+%{_datadir}/fonts/VLGothic/VL-Gothic-Regular.ttf
 
 %files sans
-%dir %{_datadir}/fonts/japanese/
-%dir %{_datadir}/fonts/japanese/TrueType
+%dir %{_datadir}/fonts/VLGothic
 %config %{_sysconfdir}/fonts/conf.d/59-VLGothic-sans.conf
-%{_datadir}/fonts/japanese/TrueType/VL-PGothic-Regular.ttf
+%{_datadir}/fonts/VLGothic/VL-PGothic-Regular.ttf
 
 %files docs
 %defattr(-,root,root,-)
@@ -90,9 +95,14 @@
 
 
 %changelog
+* Thu Oct 18 2007 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 20071015-2
+- Rename the font directory.
+- Fix font selection problem in Flash 9.
+- Make it remove the old configuration files on updating.
+
 * Thu Oct 18 2007 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 20071015-1
 - Update to 20071015
-- Make it separated into subpackages 
+- Make it separated into subpackages
 
 * Sat Sep 09 2007 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 20070901-1
 - Update to 20070901