Accepting request 978222 from M17N:fonts

OBS-URL: https://build.opensuse.org/request/show/978222
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/google-noto-fonts?expand=0&rev=21

LICENSE

@@ -0,0 +1,94 @@
+Copyright 2018 The Noto Project Authors (github.com/googlei18n/noto-fonts)
+
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1.
+
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font
+creation efforts of academic and linguistic communities, and to
+provide a free and open framework in which fonts may be shared and
+improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply to
+any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software
+components as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to,
+deleting, or substituting -- in part or in whole -- any of the
+components of the Original Version, by changing formats or by porting
+the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed,
+modify, redistribute, and sell modified and unmodified copies of the
+Font Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components, in
+Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the
+corresponding Copyright Holder. This restriction only applies to the
+primary font name as presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created using
+the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

Noto-hinted.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:837b4a9352fce32ad7f298fbf155af1da5b6f3f8dbd995eb63fdd8e82117e4ae
-size 1159948133

generate-fonts-and-specfile.sh

@@ -1,21 +1,13 @@
 #!/bin/sh
 pkg_name="google-noto-fonts"
+font_dir="otf"
 
-for a in *.zip; do
+# Get only the otf fonts
-	mkdir -p $pkg_name
+svn checkout https://github.com/googlefonts/noto-fonts/trunk/unhinted/otf
-	unzip -o -d $pkg_name $a
+tar -cvzf otf.tar.gz otf
-done
-
-rm $pkg_name/LICENSE_OFL.txt
-# remove cjk
-rm $pkg_name/*CJK*.?tf
-# remove emoji
-rm $pkg_name/*Emoji*.ttf
-# remove README
-rm $pkg_name/README
 
 cp -f $pkg_name.spec.in $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 
+ls $font_dir/ | 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:'`
@@ -28,12 +20,21 @@ ls $pkg_name/ | sed -e 's:Noto::' -e 's:-.*\..tf::' -e 's:\..tf::' -e 's:\.ttc::
     packagename="$packagename-$ui"
   fi
   packagename=`echo "$packagename" | tr [A-Z] [a-z]`
+  # NotoSansDisplay is already provided by NotoSans
+  # Also they have inconsistent family names: https://github.com/googlefonts/noto-fonts/issues/2315
+  if [ $packagename == "noto-sans-display" ]; then
+    continue
+  fi
   if [ $serif == "Sans" ]; then
     serif_dsc="Sans Serif "
   else
     serif_dsc=""
   fi
-  obsoletes=$packagename
+  if [ $packagename == "noto-sans" ]; then
+    OBSOLETES=($packagename 'noto-sans-display' 'noto-sans-display-fonts')
+  else
+    OBSOLETES=($packagename)
+  fi
   packagename="$packagename-fonts"
   if [ ! -z "$script" ]; then
     summary=`echo "Noto $script ${serif_dsc}Font" | sed 's:\([a-z]\)\([A-Z]\):\1 \2:g'`
@@ -44,9 +45,9 @@ ls $pkg_name/ | sed -e 's:Noto::' -e 's:-.*\..tf::' -e 's:\..tf::' -e 's:\.ttc::
   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@/Recommends:     $pkg_name-doc\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
-  for i in $obsoletes ; do
+  for i in "${OBSOLETES[@]}" ; do
-    sed -i "s/@SUBPACKAGE_HEADERS@/Obsoletes:      $i\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
+    sed -i "s/@SUBPACKAGE_HEADERS@/Obsoletes:      $i < %{version}\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
-    sed -i "s/@SUBPACKAGE_HEADERS@/Provides:       $i\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
+    sed -i "s/@SUBPACKAGE_HEADERS@/Provides:       $i = %{version}\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
@@ -65,8 +66,8 @@ ls $pkg_name/ | sed -e 's:Noto::' -e 's:-.*\..tf::' -e 's:\..tf::' -e 's:\.ttc::
   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
+  if [ $serif == "Arimo" ] || [ $serif == "Cousine" ] || [ $serif == "Tinos" ]; then
-    sed -i "s:@SUBPACKAGE_FILELISTS@:%{_ttfontsdir}/Noto$serif$script$ui\*.?tf\n@SUBPACKAGE_FILELISTS@:" $pkg_name.spec
+    sed -i "s:@SUBPACKAGE_FILELISTS@:%{_ttfontsdir}/$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
@@ -77,4 +78,3 @@ sed -i 's/@SUBPACKAGE_HEADERS@//' $pkg_name.spec
 sed -i 's/@SUBPACKAGE_SCRIPTLETS@//' $pkg_name.spec
 sed -i 's/@SUBPACKAGE_FILELISTS@//' $pkg_name.spec
 
-rm -r $pkg_name

google-noto-fonts.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Thu May 19 15:10:51 UTC 2022 - Gordon Leung <pirateclip@protonmail.com>
+
+- Clarify sources
+
+-------------------------------------------------------------------
+Tue May 17 16:47:27 UTC 2022 - Gordon Leung <pirateclip@protonmail.com>
+
+- Fix unversioned obsoletes
+- Merge noto-sans-display-fonts into noto-sans-fonts
+  - Fixes inconsistent font family names see Github issue #2315
+- Bump version to 20220516
+  - Start using OTF fonts to be in-line with Noto CJK and Emoji
+  - No new fonts
+
+-------------------------------------------------------------------
+Sat May 14 06:51:21 UTC 2022 - Gordon Leung <pirateclip@protonmail.com>
+
+- Update URL and source for zips
+- Update to version 20220509
+  - 96 new fonts, details at https://pastebin.com/ycnpAn88
+
 -------------------------------------------------------------------
 Mon Jun  3 15:46:48 UTC 2019 - Fuminobu Takeyama <ftake@geeko.jp>
 

google-noto-fonts.spec.in

@@ -1,7 +1,7 @@
 #
 # spec file for package google-noto-fonts
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,12 +16,13 @@
 #
 
 
-%define hyear     2017
+%define hyear     2022
-%define hmonth    09
+%define hmonth    05
-%define hday      19
+%define hday      16
+
 %define src_name  NotoFonts
 
-# DO NOT EDIT THIS SPECFILE DIRECTLY, edit google-noto-fonts.spec.in and run generate-specfile.sh script
+# DO NOT EDIT THIS SPECFILE DIRECTLY, edit google-noto-fonts.spec.in and run generate-fonts-and-specfile.sh script
 
 Name:           google-noto-fonts
 Version:        %{hyear}%{hmonth}%{hday}
@@ -29,11 +30,12 @@ Release:        0
 Summary:        Noto Font Families
 License:        OFL-1.1
 Group:          System/X11/Fonts
-Url:            https://github.com/googlei18n/noto-fonts
+Url:            https://github.com/googlefonts/noto-fonts
-Source0:        https://noto-website-2.storage.googleapis.com/pkgs/Noto-hinted.zip
+# Generate Source0 via generate-fonts-and-specfile.sh
-Source1:        generate-specfile.sh
+Source0:        otf.tar.gz
+Source1:        generate-fonts-and-specfile.sh
+Source2:        LICENSE
 BuildRequires:  fontpackages-devel
-BuildRequires:  unzip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
@@ -49,25 +51,29 @@ Group:          Documentation/Other
 License for Google's Noto fonts.
 
 @SUBPACKAGE_HEADERS@
-
 %prep
-%setup -q -c -n %{name}-%{version}
+tar -xzf %{SOURCE0} -C .
-# remove cjk
+cp %{SOURCE2} .
-rm -rf *CJK*.?tf
-# remove emoji
-rm -rf *Emoji*.ttf
 
 %build
 
 %install
 mkdir -p %{buildroot}%{_ttfontsdir}
-cp *.?tf   %{buildroot}%{_ttfontsdir}/
+# Tifinagh fonts have duplicates in NotoSansTifinagh folder
+# https://github.com/googlefonts/noto-fonts/issues/2177 and https://github.com/googlefonts/noto-fonts/issues/2326
+rm otf/NotoSansTifinagh/NotoSansTifinagh[!\-]*
+
+# NotoSansDisplay is already provided by NotoSans
+# Also they have inconsistent family names: https://github.com/googlefonts/noto-fonts/issues/2315
+rm -r otf/NotoSansDisplay/
+
+cp otf/*/*.otf   %{buildroot}%{_ttfontsdir}/
 
 @SUBPACKAGE_SCRIPTLETS@
 
 %files doc
 %defattr(0644,root,root,755)
-%doc LICENSE*.txt
+%doc LICENSE
 
 @SUBPACKAGE_FILELISTS@
 

otf.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:864eb89d1c0467e00d4ce8999ae4c06719b2bd7c5c925ff992663bf43840a37c
+size 351664455