From bdf5eea42818507fa85a21d26b022690b7855e162aa92937d704945fd6c5e238 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.com>
Date: Sun, 3 Apr 2016 15:26:17 +0000
Subject: [PATCH] Accepting request 383457 from
 home:MargueriteSu:branches:M17N:fonts

OBS-URL: https://build.opensuse.org/request/show/383457
OBS-URL: https://build.opensuse.org/package/show/M17N:fonts/google-noto-fonts?expand=0&rev=26
---
 ...oto-sans-cjk.conf => 59-noto-sans-cjk.conf | 42 ++++++++++---------
 generate-specfile.sh                          |  2 +-
 google-noto-fonts.changes                     |  6 +++
 google-noto-fonts.spec                        |  4 +-
 google-noto-fonts.spec.in                     |  2 +-
 5 files changed, 32 insertions(+), 24 deletions(-)
 rename 52-noto-sans-cjk.conf => 59-noto-sans-cjk.conf (91%)

diff --git a/52-noto-sans-cjk.conf b/59-noto-sans-cjk.conf
similarity index 91%
rename from 52-noto-sans-cjk.conf
rename to 59-noto-sans-cjk.conf
index 32b2515..a230493 100644
--- a/52-noto-sans-cjk.conf
+++ b/59-noto-sans-cjk.conf
@@ -3,26 +3,6 @@
 <!-- Noto Sans CJK Configure File -->
 <fontconfig>
   <!-- modified by i@marguerite.su-->
-  <match target="font">
-	<test qual="any" name="family" compare="contains">
-		<string>Noto Sans CJK</string>
-	</test>
-	<test qual="any" name="family" compare="contains">
-		<string>Noto Sans Mono CJK</string>
-	</test>
-	<edit name="lcdfilter">
-		<const>lcdlight</const>
-	</edit>
-	<edit name="hintstyle">
-		<const>hintslight</const>
-	</edit>
-	<edit name="rgba">
-		<const>vrgb</const>
-	</edit>
-	<edit name="weight">
-		<const>regular</const>
-	</edit>
-  </match>
   <!-- Simplified Chinese -->
   <match target="pattern">
 	<test qual="any" name="family" compare="eq">
@@ -231,6 +211,28 @@
         </edit>
   </match>
   <!-- Japanese -->
+  <match target="pattern">
+        <test qual="any" name="family" compare="eq">
+                <string>sans-serif</string>
+	</test>
+        <test name="lang" compare="eq">
+                <string>ja</string>
+        </test>
+        <edit name="family" mode="prepend">
+                <string>Noto Sans CJK JP</string>
+        </edit>
+  </match>
+  <match target="pattern">
+        <test qual="any" name="family" compare="eq">
+                <string>serif</string>
+	</test>
+        <test name="lang" compare="eq">
+                <string>ja</string>
+        </test>
+        <edit name="family" mode="prepend">
+                <string>Noto Sans CJK JP</string>
+        </edit>
+  </match>
   <match target="pattern">
         <test qual="any" name="family" compare="eq">
                 <string>monospace</string>
diff --git a/generate-specfile.sh b/generate-specfile.sh
index ade4de6..17acc85 100644
--- a/generate-specfile.sh
+++ b/generate-specfile.sh
@@ -75,7 +75,7 @@ for h in hinted; do
 	sed -i "s:@SUBPACKAGE_FILELISTS@:%dir %{_fontsconfdir}\n@SUBPACKAGE_FILELISTS@:" $pkg_name.spec
 	sed -i "s:@SUBPACKAGE_FILELISTS@:%dir %{_fontsconfddir}\n@SUBPACKAGE_FILELISTS@:" $pkg_name.spec
 	sed -i "s:@SUBPACKAGE_FILELISTS@:%files_fontsconf_availdir\n@SUBPACKAGE_FILELISTS@:" $pkg_name.spec
-	sed -i "s:@SUBPACKAGE_FILELISTS@:%files_fontsconf_file -l 52-noto-sans-cjk.conf\n@SUBPACKAGE_FILELISTS@:" $pkg_name.spec
+	sed -i "s:@SUBPACKAGE_FILELISTS@:%files_fontsconf_file -l 59-noto-sans-cjk.conf\n@SUBPACKAGE_FILELISTS@:" $pkg_name.spec
     else
         sed -i "s:@SUBPACKAGE_FILELISTS@:%{_ttfontsdir}/Noto$serif$script$ui-\*.?tf\n@SUBPACKAGE_FILELISTS@:" $pkg_name.spec
     fi
diff --git a/google-noto-fonts.changes b/google-noto-fonts.changes
index a4f77ac..8809633 100644
--- a/google-noto-fonts.changes
+++ b/google-noto-fonts.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Apr  3 14:22:24 UTC 2016 - i@marguerite.su
+
+- rename 52-noto-sans-cjk.conf to 59-noto-sans-cjk.conf.
+- get rid of sub-pixel rendering settings.
+
 -------------------------------------------------------------------
 Fri Mar 25 11:23:25 UTC 2016 - i@marguerite.su
 
diff --git a/google-noto-fonts.spec b/google-noto-fonts.spec
index fc9b5fe..ecddb01 100644
--- a/google-noto-fonts.spec
+++ b/google-noto-fonts.spec
@@ -33,7 +33,7 @@ Url:            https://github.com/googlei18n/noto-fonts
 Source0:        https://noto-website-2.storage.googleapis.com/pkgs/Noto-hinted.zip
 Source1:        https://noto-website-2.storage.googleapis.com/pkgs/NotoSansCJK.ttc.zip
 Source2:        generate-specfile.sh
-Source3:        52-noto-sans-cjk.conf
+Source3:        59-noto-sans-cjk.conf
 BuildRequires:  fontpackages-devel
 BuildRequires:  unzip
 %reconfigure_fonts_prereq
@@ -1683,7 +1683,7 @@ cp *.ttc   %{buildroot}%{_ttfontsdir}/
 %dir %{_fontsconfdir}
 %dir %{_fontsconfddir}
 %files_fontsconf_availdir
-%files_fontsconf_file -l 52-noto-sans-cjk.conf
+%files_fontsconf_file -l 59-noto-sans-cjk.conf
 
 %files -n noto-sans-coptic-fonts
 %defattr(0644,root,root,755)
diff --git a/google-noto-fonts.spec.in b/google-noto-fonts.spec.in
index 94b3c5e..f336fa0 100644
--- a/google-noto-fonts.spec.in
+++ b/google-noto-fonts.spec.in
@@ -32,7 +32,7 @@ Url:            https://github.com/googlei18n/noto-fonts
 Source0:        https://noto-website-2.storage.googleapis.com/pkgs/Noto-hinted.zip
 Source1:        https://noto-website-2.storage.googleapis.com/pkgs/NotoSansCJK.ttc.zip
 Source2:        generate-specfile.sh
-Source3:        52-noto-sans-cjk.conf
+Source3:        59-noto-sans-cjk.conf
 BuildRequires:  fontpackages-devel
 BuildRequires:  unzip
 %reconfigure_fonts_prereq