Hello community, here is the log from the commit of package google-noto-fonts for openSUSE:Factory checked in at 2016-03-16 10:25:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/google-noto-fonts (Old) and /work/SRC/openSUSE:Factory/.google-noto-fonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "google-noto-fonts" Changes: -------- --- /work/SRC/openSUSE:Factory/google-noto-fonts/google-noto-fonts.changes 2016-01-09 23:13:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.google-noto-fonts.new/google-noto-fonts.changes 2016-03-16 10:25:48.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Mar 9 14:22:02 UTC 2016 - fcrozat@suse.com + +- Add NotoSansCJK.ttc.zip and ship all CJK fonts in a single ttc + file and an single subpackage, this will save a lot of disk + space. +- Specify file permissions in defattr, some zip files are shipping + files with incorrect permissions. + +------------------------------------------------------------------- New: ---- NotoSansCJK.ttc.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ google-noto-fonts.spec ++++++ ++++ 826 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/google-noto-fonts/google-noto-fonts.spec ++++ and /work/SRC/openSUSE:Factory/.google-noto-fonts.new/google-noto-fonts.spec ++++++ generate-specfile.sh ++++++ --- /var/tmp/diff_new_pack.oL6DlB/_old 2016-03-16 10:25:57.000000000 +0100 +++ /var/tmp/diff_new_pack.oL6DlB/_new 2016-03-16 10:25:57.000000000 +0100 @@ -3,16 +3,18 @@ for a in *.zip; do mkdir -p $pkg_name - unzip -d $pkg_name $a + 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 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::' | sort | uniq | while read font; do + ls $pkg_name/ | sed -e 's:Noto::' -e 's:-.*\..tf::' -e 's:\..tf::' -e 's:\.ttc::' | sort | uniq | while read font; do serif=`echo $font | sed 's:\(Sans\|Serif\).*:\1:'` ui=`(echo $font | grep -q UI) && echo UI` script=`echo $font | sed "s:$serif\(.*\)$ui:\1:"` @@ -28,6 +30,11 @@ serif_dsc="Sans Serif" 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 + fi packagename="$packagename-fonts" summary=`echo "Noto $script $serif_dsc Font" | sed 's:\([a-z]\)\([A-Z]\):\1 \2:'` @@ -48,12 +55,14 @@ 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(-,root,root)\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 + 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 ++++++ google-noto-fonts.spec.in ++++++ --- /var/tmp/diff_new_pack.oL6DlB/_old 2016-03-16 10:25:57.000000000 +0100 +++ /var/tmp/diff_new_pack.oL6DlB/_new 2016-03-16 10:25:57.000000000 +0100 @@ -30,6 +30,7 @@ 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 BuildRequires: fontpackages-devel BuildRequires: unzip @@ -53,13 +54,16 @@ %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} %build %install mkdir -p %{buildroot}%{_ttfontsdir} cp *.ttf %{buildroot}%{_ttfontsdir}/ -cp *.otf %{buildroot}%{_ttfontsdir}/ +cp *.ttc %{buildroot}%{_ttfontsdir}/ @SUBPACKAGE_SCRIPTLETS@