Hello community,
here is the log from the commit of package google-noto-fonts for
openSUSE:Factory checked in at 2017-05-10 20:34:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/google-noto-fonts (Old)
and /work/SRC/openSUSE:Factory/.google-noto-fonts.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "google-noto-fonts"
Wed May 10 20:34:21 2017 rev:16 rq:492903 version:20161025
Changes:
--------
--- /work/SRC/openSUSE:Factory/google-noto-fonts/google-noto-fonts.changes
2017-03-05 17:57:41.141474581 +0100
+++ /work/SRC/openSUSE:Factory/.google-noto-fonts.new/google-noto-fonts.changes
2017-05-10 20:34:22.515506189 +0200
@@ -1,0 +2,6 @@
+Sat Apr 8 05:18:08 UTC 2017 - i...@marguerite.su
+
+- remove CJK from google-noto-fonts. they follow a different release
+ schedule and they need to be handled separately
+
+-------------------------------------------------------------------
Old:
----
NotoSansCJK.ttc.zip
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ google-noto-fonts.spec ++++++
--- /var/tmp/diff_new_pack.vkwjBa/_old 2017-05-10 20:34:32.822052072 +0200
+++ /var/tmp/diff_new_pack.vkwjBa/_new 2017-05-10 20:34:32.826051507 +0200
@@ -20,9 +20,7 @@
%define hmonth 10
%define hday 25
%define src_name NotoFonts
-
# DO NOT EDIT THIS SPECFILE DIRECTLY, edit google-noto-fonts.spec.in and run
generate-specfile.sh scriptZZ
-
Name: google-noto-fonts
Version: %{hyear}%{hmonth}%{hday}
Release: 0
@@ -31,11 +29,9 @@
Group: System/X11/Fonts
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
+Source1: generate-specfile.sh
BuildRequires: fontpackages-devel
BuildRequires: unzip
-%reconfigure_fonts_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -336,43 +332,6 @@
heights and stroke thicknesses) across languages. This package contains
Cherokee Sans Serif font, hinted.
-%package -n noto-sans-cjk-fonts
-Summary: Noto CJK Sans Serif Font
-Group: System/X11/Fonts
-Requires: google-noto-fonts-doc
-Obsoletes: noto-sans-cjk
-Provides: noto-sans-cjk
-Obsoletes: noto-sans-cjkjp
-Provides: noto-sans-cjkjp
-Obsoletes: noto-sans-cjkjp-fonts
-Provides: noto-sans-cjkjp-fonts
-Obsoletes: noto-sans-cjkkr
-Provides: noto-sans-cjkkr
-Obsoletes: noto-sans-cjkkr-fonts
-Provides: noto-sans-cjkkr-fonts
-Obsoletes: noto-sans-cjksc
-Provides: noto-sans-cjksc
-Obsoletes: noto-sans-cjksc-fonts
-Provides: noto-sans-cjksc-fonts
-Obsoletes: noto-sans-cjktc
-Provides: noto-sans-cjktc
-Obsoletes: noto-sans-cjktc-fonts
-Provides: noto-sans-cjktc-fonts
-Provides: scalable-font-ja
-Provides: scalable-font-ko
-Provides: scalable-font-zh-CN
-Provides: scalable-font-zh-HK
-Provides: scalable-font-zh-MO
-Provides: scalable-font-zh-SG
-Provides: scalable-font-zh-TW
-Provides: locale(zh_CN;zh_SG;zh_TW;zh_HK;zh_MO)
-%reconfigure_fonts_prereq
-
-%description -n noto-sans-cjk-fonts
-Noto's design goal is to achieve visual harmonization (e.g., compatible
-heights and stroke thicknesses) across languages. This package contains
-CJK Sans Serif font, hinted.
-
%package -n noto-sans-coptic-fonts
Summary: Noto Coptic Sans Serif Font
Group: System/X11/Fonts
@@ -933,7 +892,7 @@
Myanmar Sans Serif font, hinted.
%package -n noto-sans-newtailue-fonts
-Summary: Noto New TaiLue Sans Serif Font
+Summary: Noto New Tai Lue Sans Serif Font
Group: System/X11/Fonts
Requires: google-noto-fonts-doc
Obsoletes: noto-sans-newtailue
@@ -1011,7 +970,7 @@
OldPersian Sans Serif font, hinted.
%package -n noto-sans-oldsoutharabian-fonts
-Summary: Noto Old SouthArabian Sans Serif Font
+Summary: Noto Old South Arabian Sans Serif Font
Group: System/X11/Fonts
Requires: google-noto-fonts-doc
Obsoletes: noto-sans-oldsoutharabian
@@ -1660,21 +1619,16 @@
heights and stroke thicknesses) across languages. This package contains
Thai font, hinted.
-
-
%prep
-%setup -q -c -n %{name}-%{version}
-rm -f *Draft.*tf
-# use otc file for CJK
-rm -f NotoSans*CJK*.otf
-unzip -o %{S:1}
+%setup -q -c
+# remove cjk
+rm -rf *CJK*.?tf
%build
%install
mkdir -p %{buildroot}%{_ttfontsdir}
-cp *.ttf %{buildroot}%{_ttfontsdir}/
-cp *.ttc %{buildroot}%{_ttfontsdir}/
+cp *.?tf %{buildroot}%{_ttfontsdir}/
%reconfigure_fonts_scriptlets -n noto-coloremoji-fonts
@@ -1720,8 +1674,6 @@
%reconfigure_fonts_scriptlets -n noto-sans-cherokee-fonts
-%reconfigure_fonts_scriptlets -n noto-sans-cjk-fonts
-
%reconfigure_fonts_scriptlets -n noto-sans-coptic-fonts
%reconfigure_fonts_scriptlets -n noto-sans-cuneiform-fonts
@@ -2034,11 +1986,6 @@
%dir %{_ttfontsdir}
%{_ttfontsdir}/NotoSansCherokee-*.?tf
-%files -n noto-sans-cjk-fonts
-%defattr(0644,root,root,755)
-%dir %{_ttfontsdir}
-%{_ttfontsdir}/NotoSansCJK*.ttc
-
%files -n noto-sans-coptic-fonts
%defattr(0644,root,root,755)
%dir %{_ttfontsdir}
++++++ generate-specfile.sh ++++++
--- /var/tmp/diff_new_pack.vkwjBa/_old 2017-05-10 20:34:32.902040787 +0200
+++ /var/tmp/diff_new_pack.vkwjBa/_new 2017-05-10 20:34:32.902040787 +0200
@@ -6,87 +6,67 @@
unzip -o -d $pkg_name $a
done
-rm $pkg_name/LICENSE*.txt
-# remove draft fonts for now
-rm -f $pkg_name/*Draft.*tf
-# use otc file for CJK
-rm -f $pkg_name/NotoSans*CJK*.otf
+rm $pkg_name/LICENSE_OFL.txt
+# remove cjk
+rm $pkg_name/*CJK*.?tf
cp -f $pkg_name.spec.in $pkg_name.spec
-for h in hinted; do
- ls $pkg_name/ | sed -e 's:Noto::' -e 's:-.*\..tf::' -e 's:\..tf::' -e
's:\.ttc::' | sort -f | uniq | while read font; do
- ui=`(echo $font | grep -q UI) && echo UI`
- font=${font%%$ui}
- serif=`echo $font | sed 's:\(Sans\|Serif\).*:\1:'`
- script=`echo $font | sed "s:$serif\(.*\):\1:"`
- packagename="noto-$serif"
- if [ ! -z $script ]; then
- packagename="$packagename-$script"
- fi
- if [ ! -z $ui ]; then
- packagename="$packagename-$ui"
- fi
- packagename=`echo "$packagename" | tr [A-Z] [a-z]`
- if [ $serif == "Sans" ]; then
- serif_dsc="Sans Serif "
- else
- serif_dsc=""
- fi
- obsoletes=$packagename
- if [ "$script" == "CJK" ]; then
- for l in jp kr sc tc ; do
- obsoletes="$obsoletes noto-sans-cjk$l noto-sans-cjk$l-fonts "
- done
- for j in zh-CN zh-SG zh-TW zh-HK zh-MO ja ko ; do
- scalables="$scalables scalable-font-$j"
- done
- fi
- packagename="$packagename-fonts"
- if [ ! -z "$script" ]; then
- summary=`echo "Noto $script ${serif_dsc}Font" | sed
's:\([a-z]\)\([A-Z]\):\1 \2:g'`
- else
- summary=`echo "Noto $serif Font" | sed 's:\([a-z]\)\([A-Z]\):\1 \2:g'`
- fi
- sed -i "s/@SUBPACKAGE_HEADERS@/%package -n
$packagename\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
- sed -i "s/@SUBPACKAGE_HEADERS@/Summary:
$summary\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
- sed -i "s;@SUBPACKAGE_HEADERS@;Group:
System/X11/Fonts\n@SUBPACKAGE_HEADERS@;" $pkg_name.spec
- sed -i "s/@SUBPACKAGE_HEADERS@/Requires:
$pkg_name-doc\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
- for i in $obsoletes ; do
- sed -i "s/@SUBPACKAGE_HEADERS@/Obsoletes:
$i\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
- sed -i "s/@SUBPACKAGE_HEADERS@/Provides:
$i\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
- done
- if [ "$script" == "CJK" ]; then
- for i in $scalables ; do
- sed -i "s/@SUBPACKAGE_HEADERS@/Provides:
$i\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
- done
- sed -i "s/@SUBPACKAGE_HEADERS@/Provides:
locale(zh_CN;zh_SG;zh_TW;zh_HK;zh_MO)\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
- fi
- sed -i
"s/@SUBPACKAGE_HEADERS@/%reconfigure_fonts_prereq\n@SUBPACKAGE_HEADERS@/"
$pkg_name.spec
- sed -i "s/@SUBPACKAGE_HEADERS@/\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
- sed -i "s/@SUBPACKAGE_HEADERS@/%description -n
$packagename\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
- sed -i "s/@SUBPACKAGE_HEADERS@/Noto's design goal is to achieve visual
harmonization (e.g., compatible\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
- sed -i "s/@SUBPACKAGE_HEADERS@/heights and stroke thicknesses) across
languages. This package contains\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
- if [ ! -z "$script" ]; then
- sed -i "s/@SUBPACKAGE_HEADERS@/$script ${serif_dsc}font,
$h.\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
- else
- sed -i "s/@SUBPACKAGE_HEADERS@/$serif font, $h.\n@SUBPACKAGE_HEADERS@/"
$pkg_name.spec
- fi
- sed -i "s/@SUBPACKAGE_HEADERS@/\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
+ls $pkg_name/ | sed -e 's:Noto::' -e 's:-.*\..tf::' -e 's:\..tf::' -e
's:\.ttc::' | sort -f | uniq | while read font; do
+ ui=`(echo $font | grep -q UI) && echo UI`
+ font=${font%%$ui}
+ serif=`echo $font | sed 's:\(Sans\|Serif\).*:\1:'`
+ script=`echo $font | sed "s:$serif\(.*\):\1:"`
+ packagename="noto-$serif"
+ if [ ! -z $script ]; then
+ packagename="$packagename-$script"
+ fi
+ if [ ! -z $ui ]; then
+ packagename="$packagename-$ui"
+ fi
+ packagename=`echo "$packagename" | tr [A-Z] [a-z]`
+ if [ $serif == "Sans" ]; then
+ serif_dsc="Sans Serif "
+ else
+ serif_dsc=""
+ fi
+ obsoletes=$packagename
+ packagename="$packagename-fonts"
+ if [ ! -z "$script" ]; then
+ summary=`echo "Noto $script ${serif_dsc}Font" | sed
's:\([a-z]\)\([A-Z]\):\1 \2:g'`
+ else
+ summary=`echo "Noto $serif Font" | sed 's:\([a-z]\)\([A-Z]\):\1 \2:g'`
+ fi
+ sed -i "s/@SUBPACKAGE_HEADERS@/%package -n
$packagename\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
+ sed -i "s/@SUBPACKAGE_HEADERS@/Summary:
$summary\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
+ sed -i "s;@SUBPACKAGE_HEADERS@;Group:
System/X11/Fonts\n@SUBPACKAGE_HEADERS@;" $pkg_name.spec
+ sed -i "s/@SUBPACKAGE_HEADERS@/Requires:
$pkg_name-doc\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
+ for i in $obsoletes ; do
+ sed -i "s/@SUBPACKAGE_HEADERS@/Obsoletes: $i\n@SUBPACKAGE_HEADERS@/"
$pkg_name.spec
+ sed -i "s/@SUBPACKAGE_HEADERS@/Provides: $i\n@SUBPACKAGE_HEADERS@/"
$pkg_name.spec
+ done
+ sed -i
"s/@SUBPACKAGE_HEADERS@/%reconfigure_fonts_prereq\n@SUBPACKAGE_HEADERS@/"
$pkg_name.spec
+ sed -i "s/@SUBPACKAGE_HEADERS@/\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
+ sed -i "s/@SUBPACKAGE_HEADERS@/%description -n
$packagename\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
+ sed -i "s/@SUBPACKAGE_HEADERS@/Noto's design goal is to achieve visual
harmonization (e.g., compatible\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
+ sed -i "s/@SUBPACKAGE_HEADERS@/heights and stroke thicknesses) across
languages. This package contains\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
+ if [ ! -z "$script" ]; then
+ sed -i "s/@SUBPACKAGE_HEADERS@/$script ${serif_dsc}font,
hinted.\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
+ else
+ sed -i "s/@SUBPACKAGE_HEADERS@/$serif font,
hinted.\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
+ fi
+ sed -i "s/@SUBPACKAGE_HEADERS@/\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
- sed -i "s/@SUBPACKAGE_SCRIPTLETS@/%reconfigure_fonts_scriptlets -n
$packagename\n\n@SUBPACKAGE_SCRIPTLETS@/" $pkg_name.spec
+ sed -i "s/@SUBPACKAGE_SCRIPTLETS@/%reconfigure_fonts_scriptlets -n
$packagename\n\n@SUBPACKAGE_SCRIPTLETS@/" $pkg_name.spec
- sed -i "s/@SUBPACKAGE_FILELISTS@/%files -n
$packagename\n@SUBPACKAGE_FILELISTS@/" $pkg_name.spec
- sed -i
"s/@SUBPACKAGE_FILELISTS@/%defattr(0644,root,root,755)\n@SUBPACKAGE_FILELISTS@/"
$pkg_name.spec
- sed -i "s/@SUBPACKAGE_FILELISTS@/%dir
%{_ttfontsdir}\n@SUBPACKAGE_FILELISTS@/" $pkg_name.spec
- if [ $serif == "ColorEmoji" ]; then
- sed -i
"s:@SUBPACKAGE_FILELISTS@:%{_ttfontsdir}/Noto$serif$script$ui\*.?tf\n@SUBPACKAGE_FILELISTS@:"
$pkg_name.spec
- elif [ "$script" == "CJK" ]; then
- sed -i
"s:@SUBPACKAGE_FILELISTS@:%{_ttfontsdir}/Noto$serif$script$ui\*.ttc\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
- sed -i "s/@SUBPACKAGE_FILELISTS@/\n@SUBPACKAGE_FILELISTS@/" $pkg_name.spec
- done
+ sed -i "s/@SUBPACKAGE_FILELISTS@/%files -n
$packagename\n@SUBPACKAGE_FILELISTS@/" $pkg_name.spec
+ sed -i
"s/@SUBPACKAGE_FILELISTS@/%defattr(0644,root,root,755)\n@SUBPACKAGE_FILELISTS@/"
$pkg_name.spec
+ sed -i "s/@SUBPACKAGE_FILELISTS@/%dir
%{_ttfontsdir}\n@SUBPACKAGE_FILELISTS@/" $pkg_name.spec
+ if [ $serif == "ColorEmoji" ]; then
+ sed -i
"s:@SUBPACKAGE_FILELISTS@:%{_ttfontsdir}/Noto$serif$script$ui\*.?tf\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
+ sed -i "s/@SUBPACKAGE_FILELISTS@/\n@SUBPACKAGE_FILELISTS@/" $pkg_name.spec
done
sed -i 's/@SUBPACKAGE_HEADERS@//' $pkg_name.spec
++++++ google-noto-fonts.spec.in ++++++
--- /var/tmp/diff_new_pack.vkwjBa/_old 2017-05-10 20:34:32.942035144 +0200
+++ /var/tmp/diff_new_pack.vkwjBa/_new 2017-05-10 20:34:32.950034015 +0200
@@ -30,11 +30,9 @@
Group: System/X11/Fonts
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
+Source1: generate-specfile.sh
BuildRequires: fontpackages-devel
BuildRequires: unzip
-%reconfigure_fonts_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -53,17 +51,14 @@
%prep
%setup -q -c -n %{name}-%{version}
-rm -f *Draft.*tf
-# use otc file for CJK
-rm -f NotoSans*CJK*.otf
-unzip -o %{S:1}
+# remove cjk
+rm -rf *CJK*.?tf
%build
%install
mkdir -p %{buildroot}%{_ttfontsdir}
-cp *.ttf %{buildroot}%{_ttfontsdir}/
-cp *.ttc %{buildroot}%{_ttfontsdir}/
+cp *.?tf %{buildroot}%{_ttfontsdir}/
@SUBPACKAGE_SCRIPTLETS@
