diff --git a/generate-fonts-and-specfile.sh b/generate-fonts-and-specfile.sh
index 4b32c0b..26e7207 100644
--- a/generate-fonts-and-specfile.sh
+++ b/generate-fonts-and-specfile.sh
@@ -1,10 +1,10 @@
#!/bin/sh
pkg_name="google-noto-fonts"
-font_dir="otf"
+font_dir="ttf"
# Get only the otf fonts
-svn checkout https://github.com/googlefonts/noto-fonts/trunk/unhinted/otf
-tar -cvzf otf.tar.gz otf
+svn checkout https://github.com/googlefonts/noto-fonts/trunk/hinted/$font_dir
+tar -cvzf $font_dir.tar.gz $font_dir
cp -f $pkg_name.spec.in $pkg_name.spec
ls $font_dir/ | sed -e 's:Noto::' -e 's:-.*\..tf::' -e 's:\..tf::' -e 's:\.ttc::' | sort -f | uniq | while read font; do
@@ -32,6 +32,12 @@ ls $font_dir/ | sed -e 's:Noto::' -e 's:-.*\..tf::' -e 's:\..tf::' -e 's:\.ttc::
fi
if [ $packagename == "noto-sans" ]; then
OBSOLETES=($packagename 'noto-sans-display' 'noto-sans-display-fonts')
+ elif [ $packagename == "noto-serif-tibetan" ]; then
+ OBSOLETES=($packagename 'noto-sans-tibetan' 'noto-sans-tibetan-fonts')
+ elif [ $packagename == "noto-sans-syriac" ]; then
+ OBSOLETES=($packagename 'noto-sans-syriacwestern' 'noto-sans-syriacwestern-fonts' 'noto-sans-syriacestrangela' 'noto-sans-syriacestrangela-fonts' 'noto-sans-syriaceastern' 'noto-sans-syriaceastern-fonts')
+ elif [ $packagename == "noto-sans-mono" ]; then
+ OBSOLETES=($packagename 'noto-mono' 'noto-mono-fonts')
else
OBSOLETES=($packagename)
fi
diff --git a/google-noto-fonts.changes b/google-noto-fonts.changes
index 008811f..3336fe9 100644
--- a/google-noto-fonts.changes
+++ b/google-noto-fonts.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Thu May 26 23:07:18 UTC 2022 - Gordon Leung <pirateclip@protonmail.com>
+
+- Switch back to hinted ttf as unhinted otf causes blurring (boo#1199938)
+
+-------------------------------------------------------------------
+Tue May 24 23:19:22 UTC 2022 - Gordon Leung <pirateclip@protonmail.com>
+
+- Add obsoletes and provides for:
+ - noto-mono-fonts: Got merged into noto-sans-mono-fonts
+ - noto-sans-syriac* variants: Got merged into noto-sans-syriac-fonts
+ - noto-sans-tibetan-fonts: Got renamed to noto-serif-tibetan-fonts
+- Update to version 20220524
+ - Updated Noto Sans Myanmar and Noto Sans Tangsa Fonts
+
-------------------------------------------------------------------
Thu May 19 15:10:51 UTC 2022 - Gordon Leung <pirateclip@protonmail.com>
diff --git a/google-noto-fonts.spec b/google-noto-fonts.spec
index 7ad6ee9..9df7d60 100644
--- a/google-noto-fonts.spec
+++ b/google-noto-fonts.spec
@@ -18,7 +18,7 @@
%define hyear 2022
%define hmonth 05
-%define hday 16
+%define hday 24
%define src_name NotoFonts
@@ -32,7 +32,7 @@ License: OFL-1.1
Group: System/X11/Fonts
URL: https://github.com/googlefonts/noto-fonts
# Generate Source0 via generate-fonts-and-specfile.sh
-Source0: otf.tar.gz
+Source0: ttf.tar.gz
Source1: generate-fonts-and-specfile.sh
Source2: LICENSE
BuildRequires: fontpackages-devel
@@ -1399,6 +1399,10 @@ Group: System/X11/Fonts
Recommends: google-noto-fonts-doc
Obsoletes: noto-sans-mono < %{version}
Provides: noto-sans-mono = %{version}
+Obsoletes: noto-mono < %{version}
+Provides: noto-mono = %{version}
+Obsoletes: noto-mono-fonts < %{version}
+Provides: noto-mono-fonts = %{version}
%reconfigure_fonts_prereq
%description -n noto-sans-mono-fonts
@@ -2023,6 +2027,18 @@ Group: System/X11/Fonts
Recommends: google-noto-fonts-doc
Obsoletes: noto-sans-syriac < %{version}
Provides: noto-sans-syriac = %{version}
+Obsoletes: noto-sans-syriacwestern < %{version}
+Provides: noto-sans-syriacwestern = %{version}
+Obsoletes: noto-sans-syriacwestern-fonts < %{version}
+Provides: noto-sans-syriacwestern-fonts = %{version}
+Obsoletes: noto-sans-syriacestrangela < %{version}
+Provides: noto-sans-syriacestrangela = %{version}
+Obsoletes: noto-sans-syriacestrangela-fonts < %{version}
+Provides: noto-sans-syriacestrangela-fonts = %{version}
+Obsoletes: noto-sans-syriaceastern < %{version}
+Provides: noto-sans-syriaceastern = %{version}
+Obsoletes: noto-sans-syriaceastern-fonts < %{version}
+Provides: noto-sans-syriaceastern-fonts = %{version}
%reconfigure_fonts_prereq
%description -n noto-sans-syriac-fonts
@@ -2894,6 +2910,10 @@ Group: System/X11/Fonts
Recommends: google-noto-fonts-doc
Obsoletes: noto-serif-tibetan < %{version}
Provides: noto-serif-tibetan = %{version}
+Obsoletes: noto-sans-tibetan < %{version}
+Provides: noto-sans-tibetan = %{version}
+Obsoletes: noto-sans-tibetan-fonts < %{version}
+Provides: noto-sans-tibetan-fonts = %{version}
%reconfigure_fonts_prereq
%description -n noto-serif-tibetan-fonts
@@ -2976,13 +2996,13 @@ cp %{SOURCE2} .
mkdir -p %{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[!\-]*
+rm ttf/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/
+rm -r ttf/NotoSansDisplay/
-cp otf/*/*.otf %{buildroot}%{_ttfontsdir}/
+cp ttf/*/*.ttf %{buildroot}%{_ttfontsdir}/
%reconfigure_fonts_scriptlets -n noto-arimo-fonts
diff --git a/google-noto-fonts.spec.in b/google-noto-fonts.spec.in
index 90b473d..166eb4d 100644
--- a/google-noto-fonts.spec.in
+++ b/google-noto-fonts.spec.in
@@ -18,7 +18,7 @@
%define hyear 2022
%define hmonth 05
-%define hday 16
+%define hday 24
%define src_name NotoFonts
@@ -32,7 +32,7 @@ License: OFL-1.1
Group: System/X11/Fonts
Url: https://github.com/googlefonts/noto-fonts
# Generate Source0 via generate-fonts-and-specfile.sh
-Source0: otf.tar.gz
+Source0: ttf.tar.gz
Source1: generate-fonts-and-specfile.sh
Source2: LICENSE
BuildRequires: fontpackages-devel
@@ -61,13 +61,13 @@ cp %{SOURCE2} .
mkdir -p %{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[!\-]*
+rm ttf/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/
+rm -r ttf/NotoSansDisplay/
-cp otf/*/*.otf %{buildroot}%{_ttfontsdir}/
+cp ttf/*/*.ttf %{buildroot}%{_ttfontsdir}/
@SUBPACKAGE_SCRIPTLETS@
diff --git a/otf.tar.gz b/otf.tar.gz
deleted file mode 100644
index dbffa73..0000000
--- a/otf.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:864eb89d1c0467e00d4ce8999ae4c06719b2bd7c5c925ff992663bf43840a37c
-size 351664455
diff --git a/ttf.tar.gz b/ttf.tar.gz
new file mode 100644
index 0000000..7070d6c
--- /dev/null
+++ b/ttf.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8304dc403dcabc41b2f8619b0169cb05f524f6529dfd9bafe5c4854b4cb30f35
+size 472361436