Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package google-noto-fonts for
openSUSE:Factory checked in at 2022-06-17 21:18:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/google-noto-fonts (Old)
and /work/SRC/openSUSE:Factory/.google-noto-fonts.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "google-noto-fonts"
Fri Jun 17 21:18:43 2022 rev:24 rq:982913 version:20220607
Changes:
--------
--- /work/SRC/openSUSE:Factory/google-noto-fonts/google-noto-fonts.changes
2022-06-03 14:15:48.949250172 +0200
+++
/work/SRC/openSUSE:Factory/.google-noto-fonts.new.1548/google-noto-fonts.changes
2022-06-17 21:18:59.618658866 +0200
@@ -1,0 +2,19 @@
+Wed Jun 15 06:57:10 UTC 2022 - Gordon Leung <[email protected]>
+
+feat: create new metapackage noto-fonts with all Noto Fonts except CJK and
Emoji
+
+-------------------------------------------------------------------
+Sun Jun 12 22:29:40 UTC 2022 - Gordon Leung <[email protected]> -
20220607
+
+update: 20220524 -> 20220607
+- Noto Sans and Noto Sans Myanmar have been updated
+
+fix(spec): add LICENSE to every package, remove redundant doc package
+- It is likely a legal requirement that the license must be included with the
package (rather than only recommends)
+- Using the %license macro and including the license in every subpackage is
the norm
+
+fix(sh): prevent redundant .svn files from being compressed into archive
+chore(spec): use install instead of mkdir and cp
+chore(sh): fix typo
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ google-noto-fonts.spec ++++++
++++ 3417 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/google-noto-fonts/google-noto-fonts.spec
++++ and
/work/SRC/openSUSE:Factory/.google-noto-fonts.new.1548/google-noto-fonts.spec
++++++ generate-fonts-and-specfile.sh ++++++
--- /var/tmp/diff_new_pack.0lW67N/_old 2022-06-17 21:19:05.226661907 +0200
+++ /var/tmp/diff_new_pack.0lW67N/_new 2022-06-17 21:19:05.230661909 +0200
@@ -2,9 +2,9 @@
pkg_name="google-noto-fonts"
font_dir="ttf"
-# Get only the otf fonts
+# Get only the hinted fonts
svn checkout https://github.com/googlefonts/noto-fonts/trunk/hinted/$font_dir
-tar -cvzf $font_dir.tar.gz $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
@@ -38,12 +38,8 @@
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')
- elif [ $packagename == "noto-arimo" ]; then
- OBSOLETES=($packagename 'google-arimo')
- elif [ $packagename == "noto-cousine" ]; then
- OBSOLETES=($packagename 'google-cousine')
- elif [ $packagename == "noto-tinos" ]; then
- OBSOLETES=($packagename 'google-tinos')
+ elif [ $packagename == "noto-arimo" ] || [ $packagename == "noto-cousine" ]
|| [ $packagename == "noto-tinos" ]; then
+ OBSOLETES=($packagename `echo "google-$serif-fonts" | tr [A-Z] [a-z]`)
else
OBSOLETES=($packagename)
fi
@@ -53,10 +49,10 @@
else
summary=`echo "Noto $serif Font" | sed 's:\([a-z]\)\([A-Z]\):\1 \2:g'`
fi
+ sed -i "s/@LIST_OF_SUBPACKAGES@/Requires:
$packagename\n@LIST_OF_SUBPACKAGES@/" $pkg_name.spec
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@/Recommends:
$pkg_name-doc\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
for i in "${OBSOLETES[@]}" ; do
sed -i "s/@SUBPACKAGE_HEADERS@/Obsoletes: $i <
%{version}\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
sed -i "s/@SUBPACKAGE_HEADERS@/Provides: $i =
%{version}\n@SUBPACKAGE_HEADERS@/" $pkg_name.spec
@@ -77,6 +73,7 @@
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@/%license LICENSE\n@SUBPACKAGE_FILELISTS@/"
$pkg_name.spec
sed -i "s/@SUBPACKAGE_FILELISTS@/%dir
%{_ttfontsdir}\n@SUBPACKAGE_FILELISTS@/" $pkg_name.spec
if [ $serif == "Arimo" ] || [ $serif == "Cousine" ] || [ $serif == "Tinos"
]; then
sed -i
"s:@SUBPACKAGE_FILELISTS@:%{_ttfontsdir}/$serif$script$ui-\*.?tf\n@SUBPACKAGE_FILELISTS@:"
$pkg_name.spec
@@ -86,8 +83,8 @@
sed -i "s/@SUBPACKAGE_FILELISTS@/\n@SUBPACKAGE_FILELISTS@/" $pkg_name.spec
done
+sed -i 's/@LIST_OF_SUBPACKAGES@//' $pkg_name.spec
sed -i 's/@SUBPACKAGE_HEADERS@//' $pkg_name.spec
sed -i 's/@SUBPACKAGE_SCRIPTLETS@//' $pkg_name.spec
sed -i 's/@SUBPACKAGE_FILELISTS@//' $pkg_name.spec
-
++++++ google-noto-fonts.spec.in ++++++
--- /var/tmp/diff_new_pack.0lW67N/_old 2022-06-17 21:19:05.270661931 +0200
+++ /var/tmp/diff_new_pack.0lW67N/_new 2022-06-17 21:19:05.274661933 +0200
@@ -17,8 +17,8 @@
%define hyear 2022
-%define hmonth 05
-%define hday 24
+%define hmonth 06
+%define hday 07
%define src_name NotoFonts
@@ -30,7 +30,7 @@
Summary: Noto Font Families
License: OFL-1.1
Group: System/X11/Fonts
-Url: https://github.com/googlefonts/noto-fonts
+URL: https://github.com/googlefonts/noto-fonts
# Generate Source0 via generate-fonts-and-specfile.sh
Source0: ttf.tar.gz
Source1: generate-fonts-and-specfile.sh
@@ -40,15 +40,19 @@
BuildArch: noarch
%description
-Noto's design goal is to achieve visual harmonization (e.g., compatible
heights and stroke
-thicknesses) across languages.
+Noto's design goal is to achieve visual harmonization (e.g., compatible
heights and stroke
+thicknesses) across languages.
-%package doc
-Summary: Noto Font Families License
-Group: Documentation/Other
+%package -n noto-fonts
+Summary: All Noto Fonts except CJK and Emoji
+Group: System/X11/Fonts
+@LIST_OF_SUBPACKAGES@
+
+%description -n noto-fonts
+Noto's design goal is to achieve visual harmonization (e.g., compatible
+heights and stroke thicknesses) across languages. This package contains
+most noto fonts except for CJK and Emoji.
-%description doc
-License for Google's Noto fonts.
@SUBPACKAGE_HEADERS@
%prep
@@ -58,7 +62,6 @@
%build
%install
-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 ttf/NotoSansTifinagh/NotoSansTifinagh[!\-]*
@@ -67,15 +70,13 @@
# Also they have inconsistent family names:
https://github.com/googlefonts/noto-fonts/issues/2315
rm -r ttf/NotoSansDisplay/
-cp ttf/*/*.ttf %{buildroot}%{_ttfontsdir}/
+install -Dm 644 -t %{buildroot}%{_ttfontsdir} ttf/*/*.ttf
@SUBPACKAGE_SCRIPTLETS@
-
-%files doc
+%files -n noto-fonts
%defattr(0644,root,root,755)
-%doc LICENSE
+%license LICENSE
@SUBPACKAGE_FILELISTS@
-
%changelog
++++++ ttf.tar.gz ++++++
/work/SRC/openSUSE:Factory/google-noto-fonts/ttf.tar.gz
/work/SRC/openSUSE:Factory/.google-noto-fonts.new.1548/ttf.tar.gz differ: char
13, line 1
