[google-noto-fonts] Rename Chinese sub-packages

[Peng Wu]

commit 4e3f4e08e77796be8578295d2318af9ee3580abe
Author: Peng Wu <alexepico at gmail.com>
Date:   Wed Nov 19 17:21:13 2014 +0800

    Rename Chinese sub-packages

 ...> 65-0-google-noto-sans-simplified-chinese.conf |    0
 ... 65-0-google-noto-sans-traditional-chinese.conf |    0
 google-noto-fonts.spec                             |   41 ++++++++++---------
 ...oogle-noto-sans-simplified-chinese.metainfo.xml |    2 +-
 ...ogle-noto-sans-traditional-chinese.metainfo.xml |    2 +-
 5 files changed, 24 insertions(+), 21 deletions(-)
---
diff --git a/65-0-google-noto-sans-sc.conf b/65-0-google-noto-sans-simplified-chinese.conf
similarity index 100%
rename from 65-0-google-noto-sans-sc.conf
rename to 65-0-google-noto-sans-simplified-chinese.conf
diff --git a/65-0-google-noto-sans-tc.conf b/65-0-google-noto-sans-traditional-chinese.conf
similarity index 100%
rename from 65-0-google-noto-sans-tc.conf
rename to 65-0-google-noto-sans-traditional-chinese.conf
diff --git a/google-noto-fonts.spec b/google-noto-fonts.spec
index 38f2949..560b068 100644
--- a/google-noto-fonts.spec
+++ b/google-noto-fonts.spec
@@ -9,7 +9,7 @@ in Unicode.
 
 Name:           %{fontname}-fonts
 Version:        20141001
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Hinted and Non Hinted open type fonts for Unicode scripts
 Group:          User Interface/X
 License:        ASL 2.0
@@ -122,8 +122,8 @@ Source104:        %{fontconf}-sans-tai-le.conf
 Source105:        %{fontconf}-sans-tifinagh.conf
 Source106:        %{fontconf}-sans-yi.conf
 Source107:        %{fontconf}-sans-tagbanwa.conf
-Source108:        %{cjkfontconf}-sans-sc.conf
-Source109:        %{cjkfontconf}-sans-tc.conf
+Source108:        %{cjkfontconf}-sans-simplified-chinese.conf
+Source109:        %{cjkfontconf}-sans-traditional-chinese.conf
 
 
 # Add appstream metadata files
@@ -234,8 +234,8 @@ Source303:       %{fontname}-sans-tai-le.metainfo.xml
 Source304:       %{fontname}-sans-tifinagh.metainfo.xml
 Source305:       %{fontname}-sans-yi.metainfo.xml
 Source306:       %{fontname}-sans-tagbanwa.metainfo.xml
-Source307:       %{fontname}-sans-sc.metainfo.xml
-Source308:       %{fontname}-sans-tc.metainfo.xml
+Source307:       %{fontname}-sans-simplified-chinese.metainfo.xml
+Source308:       %{fontname}-sans-traditional-chinese.metainfo.xml
 
 
 BuildArch:      noarch
@@ -1561,28 +1561,28 @@ Non Hinted fonts for Tagbanwa script.
 %{_datadir}/appdata/%{fontname}-sans-tagbanwa.metainfo.xml
 %doc LICENSE
 
-%package -n %{fontname}-sans-sc-fonts
+%package -n %{fontname}-sans-simplified-chinese-fonts
 Summary:        Free sans-serif fonts for Simplified Chinese
 Requires:       fontpackages-filesystem
 
-%description -n %{fontname}-sans-sc-fonts
+%description -n %{fontname}-sans-simplified-chinese-fonts
 %common_desc
 Non Hinted fonts for Simplified Chinese.
 
-%_font_pkg -n sans-sc -f %{cjkfontconf}-sans-sc.conf NotoSansSC-*.otf
-%{_datadir}/appdata/%{fontname}-sans-sc.metainfo.xml
+%_font_pkg -n sans-simplified-chinese -f %{cjkfontconf}-sans-simplified-chinese.conf NotoSansSC-*.otf
+%{_datadir}/appdata/%{fontname}-sans-simplified-chinese.metainfo.xml
 %doc LICENSE
 
-%package -n %{fontname}-sans-tc-fonts
+%package -n %{fontname}-sans-traditional-chinese-fonts
 Summary:        Free sans-serif fonts for Traditional Chinese
 Requires:       fontpackages-filesystem
 
-%description -n %{fontname}-sans-tc-fonts
+%description -n %{fontname}-sans-traditional-chinese-fonts
 %common_desc
 Non Hinted fonts for Traditional Chinese.
 
-%_font_pkg -n sans-tc -f %{cjkfontconf}-sans-tc.conf NotoSansTC-*.otf
-%{_datadir}/appdata/%{fontname}-sans-tc.metainfo.xml
+%_font_pkg -n sans-traditional-chinese -f %{cjkfontconf}-sans-traditional-chinese.conf NotoSansTC-*.otf
+%{_datadir}/appdata/%{fontname}-sans-traditional-chinese.metainfo.xml
 %doc LICENSE
 
 %prep
@@ -1823,9 +1823,9 @@ install -m 0644 -p %{SOURCE106} \
 install -m 0644 -p %{SOURCE107} \
         %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-sans-tagbanwa.conf
 install -m 0644 -p %{SOURCE108} \
-        %{buildroot}%{_fontconfig_templatedir}/%{cjkfontconf}-sans-sc.conf
+        %{buildroot}%{_fontconfig_templatedir}/%{cjkfontconf}-sans-simplified-chinese.conf
 install -m 0644 -p %{SOURCE109} \
-        %{buildroot}%{_fontconfig_templatedir}/%{cjkfontconf}-sans-tc.conf
+        %{buildroot}%{_fontconfig_templatedir}/%{cjkfontconf}-sans-traditional-chinese.conf
 
 for fconf in %{fontconf}-sans.conf \
              %{fontconf}-sans-armenian.conf \
@@ -1933,8 +1933,8 @@ for fconf in %{fontconf}-sans.conf \
              %{fontconf}-sans-tifinagh.conf \
              %{fontconf}-sans-yi.conf \
              %{fontconf}-sans-tagbanwa.conf \
-             %{cjkfontconf}-sans-sc.conf \
-             %{cjkfontconf}-sans-tc.conf ; do
+             %{cjkfontconf}-sans-simplified-chinese.conf \
+             %{cjkfontconf}-sans-traditional-chinese.conf ; do
   ln -s %{_fontconfig_templatedir}/$fconf \
         %{buildroot}%{_fontconfig_confdir}/$fconf
 done
@@ -2155,12 +2155,15 @@ install -Dm 0644 -p %{SOURCE305} \
 install -Dm 0644 -p %{SOURCE306} \
         %{buildroot}%{_datadir}/appdata/%{fontname}-sans-tagbanwa.metainfo.xml
 install -Dm 0644 -p %{SOURCE307} \
-        %{buildroot}%{_datadir}/appdata/%{fontname}-sans-sc.metainfo.xml
+        %{buildroot}%{_datadir}/appdata/%{fontname}-sans-simplified-chinese.metainfo.xml
 install -Dm 0644 -p %{SOURCE308} \
-        %{buildroot}%{_datadir}/appdata/%{fontname}-sans-tc.metainfo.xml
+        %{buildroot}%{_datadir}/appdata/%{fontname}-sans-traditional-chinese.metainfo.xml
 
 
 %changelog
+* Wed Nov 19 2014 Peng Wu <pwu at redhat.com> - 20141001-5
+- Rename Chinese sub-packages
+
 * Wed Nov 12 2014 Peng Wu <pwu at redhat.com> - 20141001-4
 - Add Chinese fonts
 
diff --git a/google-noto-sans-sc.metainfo.xml b/google-noto-sans-simplified-chinese.metainfo.xml
similarity index 82%
rename from google-noto-sans-sc.metainfo.xml
rename to google-noto-sans-simplified-chinese.metainfo.xml
index 7e2088f..c7335d7 100644
--- a/google-noto-sans-sc.metainfo.xml
+++ b/google-noto-sans-simplified-chinese.metainfo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2014 Parag Nemade <pnemade AT redhat DOT com> -->
 <component type="font">
-  <id>google-noto-sans-sc</id>
+  <id>google-noto-sans-simplified-chinese</id>
   <metadata_license>CC-BY-3.0</metadata_license>
   <extends>google-noto</extends>
 </component>
diff --git a/google-noto-sans-tc.metainfo.xml b/google-noto-sans-traditional-chinese.metainfo.xml
similarity index 82%
rename from google-noto-sans-tc.metainfo.xml
rename to google-noto-sans-traditional-chinese.metainfo.xml
index 2e71a2a..8368e7b 100644
--- a/google-noto-sans-tc.metainfo.xml
+++ b/google-noto-sans-traditional-chinese.metainfo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2014 Parag Nemade <pnemade AT redhat DOT com> -->
 <component type="font">
-  <id>google-noto-sans-tc</id>
+  <id>google-noto-sans-traditional-chinese</id>
   <metadata_license>CC-BY-3.0</metadata_license>
   <extends>google-noto</extends>
 </component>