From 64a7fe257cd18cfbafa28e5659ccb973e3db98cd Mon Sep 17 00:00:00 2001 From: Sergey Cherevko Date: Wed, 21 Feb 2024 17:14:20 +0300 Subject: [PATCH] fixup! [INF-951] adapted the spec file for 8 --- SPECS/google-croscore-fonts.spec | 91 +++++++++++--------------------- 1 file changed, 31 insertions(+), 60 deletions(-) diff --git a/SPECS/google-croscore-fonts.spec b/SPECS/google-croscore-fonts.spec index 3046eb3..9bf7312 100644 --- a/SPECS/google-croscore-fonts.spec +++ b/SPECS/google-croscore-fonts.spec @@ -2,11 +2,11 @@ BuildArch: noarch Name: google-croscore-fonts Version: 1.31.0 -Release: 15%{?dist} +Release: 15%{?dist}.1 License: ASL 2.0 Summary: The width-compatible fonts for improved on-screen readability -Source0: http://gsdview.appspot.com/chromeos-localmirror/distfiles/croscorefonts-%{version}.tar.bz2 +Source0: http://gsdview.appspot.com/chromeos-localmirror/distfiles/croscorefonts-%{version}.tar.bz2 Source1: 62-google-arimo-fonts.conf Source2: 62-google-cousine-fonts.conf Source3: 62-google-tinos-fonts.conf @@ -21,6 +21,9 @@ Source8: LICENSE-2.0.txt Source10: org.fedoraproject.google-arimo-fonts.metainfo.xml Source11: org.fedoraproject.google-cousine-fonts.metainfo.xml Source12: org.fedoraproject.google-tinos-fonts.metainfo.xml + +Requires: fontpackages-filesystem + %description This package contains a collections of fonts that offers improved on-screen readability characteristics and the pan-European WGL character set and solves @@ -30,6 +33,7 @@ portability across platforms. %package -n google-arimo-fonts Summary: The croscore Arimo family fonts +Requires: fontpackages-filesystem Provides: google-croscore-arimo-fonts = %{version}-%{release} Obsoletes: google-croscore-arimo-fonts < %{version}-%{release} @@ -47,6 +51,7 @@ address document portability across platforms. %package -n google-cousine-fonts Summary: The croscore Cousine family fonts +Requires: fontpackages-filesystem Provides: google-croscore-cousine-fonts = %{version}-%{release} Obsoletes: google-croscore-cousine-fonts < %{version}-%{release} @@ -64,6 +69,7 @@ address document portability across platforms. %package -n google-tinos-fonts Summary: The croscore Tinos family fonts +Requires: fontpackages-filesystem Provides: google-croscore-tinos-fonts = %{version}-%{release} Obsoletes: google-croscore-tinos-fonts < %{version}-%{release} @@ -78,10 +84,8 @@ on-screen readability characteristics and the pan-European WGL character set and solves the needs of developers looking for width-compatible fonts to address document portability across platforms. - - %prep -%setup -q -n croscorefonts-%{version} +%autosetup -n croscorefonts-%{version} cp -p %{SOURCE8} . %build @@ -89,78 +93,45 @@ cp -p %{SOURCE8} . %install install -m 0755 -d %{buildroot}/etc/fonts/conf.d/ -ln -sf ../../../usr/share/fontconfig/conf.avail/30-0-google-arimo-fonts.conf %{buildroot}/etc/fonts/conf.d/30-0-google-arimo-fonts.conf -ln -sf ../../../usr/share/fontconfig/conf.avail/62-google-arimo-fonts.conf %{buildroot}/etc/fonts/conf.d/62-google-arimo-fonts.conf - -ln -sf ../../../usr/share/fontconfig/conf.avail/30-0-google-cousine-fonts.conf %{buildroot}/etc/fonts/conf.d/30-0-google-cousine-fonts.conf -ln -sf ../../../usr/share/fontconfig/conf.avail/62-google-cousine-fonts.conf %{buildroot}/etc/fonts/conf.d/62-google-cousine-fonts.conf - -ln -sf ../../../usr/share/fontconfig/conf.avail/30-0-google-tinos-fonts.conf %{buildroot}/etc/fonts/conf.d/30-0-google-tinos-fonts.conf -ln -sf ../../../usr/share/fontconfig/conf.avail/62-google-tinos-fonts.conf %{buildroot}/etc/fonts/conf.d/62-google-tinos-fonts.conf - install -m 0755 -d %{buildroot}/usr/share/fontconfig/conf.avail/ -install -m 0644 -t %{buildroot}/usr/share/fontconfig/conf.avail/ %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} - install -m 0755 -d %{buildroot}/usr/share/fonts/ install -m 0755 -d %{buildroot}/usr/share/fonts/google-arimo-fonts/ -install -m 0644 -t %{buildroot}/usr/share/fonts/google-arimo-fonts/ Arimo-Bold.ttf Arimo-BoldItalic.ttf Arimo-Italic.ttf Arimo-Regular.ttf - install -m 0755 -d %{buildroot}/usr/share/fonts/google-cousine-fonts/ -install -m 0644 -t %{buildroot}/usr/share/fonts/google-cousine-fonts/ Cousine-Bold.ttf Cousine-BoldItalic.ttf Cousine-Italic.ttf Cousine-Regular.ttf - install -m 0755 -d %{buildroot}/usr/share/fonts/google-tinos-fonts/ -install -m 0644 -t %{buildroot}/usr/share/fonts/google-tinos-fonts/ Tinos-Bold.ttf Tinos-BoldItalic.ttf Tinos-Italic.ttf Tinos-Regular.ttf - -install -m 0755 -d %{buildroot}/usr/share/licenses/ -install -m 0755 -d %{buildroot}/usr/share/licenses/google-arimo-fonts/ -install -m 0644 -t %{buildroot}/usr/share/licenses/google-arimo-fonts/ %{SOURCE8} -install -m 0755 -d %{buildroot}/usr/share/licenses/google-cousine-fonts/ -install -m 0644 -t %{buildroot}/usr/share/licenses/google-cousine-fonts/ %{SOURCE8} -install -m 0755 -d %{buildroot}/usr/share/licenses/google-tinos-fonts/ -install -m 0644 -t %{buildroot}/usr/share/licenses/google-tinos-fonts/ %{SOURCE8} - install -m 0755 -d %{buildroot}/usr/share/metainfo/ -install -m 0644 -t %{buildroot}/usr/share/metainfo/ %{SOURCE10} -install -m 0644 -t %{buildroot}/usr/share/metainfo/ %{SOURCE11} -install -m 0644 -t %{buildroot}/usr/share/metainfo/ %{SOURCE12} +install -m 0644 -t %{buildroot}/usr/share/fontconfig/conf.avail/ %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} +ln -sr %{buildroot}%{_datadir}/fontconfig/conf.avail/* %{buildroot}%{_sysconfdir}/fonts/conf.d/ + +install -m 0644 Arimo-*.ttf %{buildroot}/usr/share/fonts/google-arimo-fonts/ +install -m 0644 Cousine-*.ttf %{buildroot}/usr/share/fonts/google-cousine-fonts/ +install -m 0644 Tinos-*.ttf %{buildroot}/usr/share/fonts/google-tinos-fonts/ +install -m 0644 -t %{buildroot}/usr/share/metainfo/ %{SOURCE10} %{SOURCE11} %{SOURCE12} %files -n google-arimo-fonts -%{_sysconfdir}/fonts/conf.d/30-0-google-arimo-fonts.conf -%{_sysconfdir}/fonts/conf.d/62-google-arimo-fonts.conf -%{_datadir}/fontconfig/conf.avail/30-0-google-arimo-fonts.conf -%{_datadir}/fontconfig/conf.avail/62-google-arimo-fonts.conf -%{_datadir}/fonts/google-arimo-fonts/Arimo-Bold.ttf -%{_datadir}/fonts/google-arimo-fonts/Arimo-BoldItalic.ttf -%{_datadir}/fonts/google-arimo-fonts/Arimo-Italic.ttf -%{_datadir}/fonts/google-arimo-fonts/Arimo-Regular.ttf -%{_datadir}/licenses/google-arimo-fonts/* +%config %{_sysconfdir}/fonts/conf.d/*-google-arimo-fonts.conf +%{_datadir}/fontconfig/conf.avail/*google-arimo-fonts.conf +%{_datadir}/fonts/google-arimo-fonts/*.ttf +%license LICENSE-2.0.txt %{_datadir}/metainfo/org.fedoraproject.google-arimo-fonts.metainfo.xml %files -n google-cousine-fonts -%{_sysconfdir}/fonts/conf.d/30-0-google-cousine-fonts.conf -%{_sysconfdir}/fonts/conf.d/62-google-cousine-fonts.conf -%{_datadir}/fontconfig/conf.avail/30-0-google-cousine-fonts.conf -%{_datadir}/fontconfig/conf.avail/62-google-cousine-fonts.conf -%{_datadir}/fonts/google-cousine-fonts/Cousine-Bold.ttf -%{_datadir}/fonts/google-cousine-fonts/Cousine-BoldItalic.ttf -%{_datadir}/fonts/google-cousine-fonts/Cousine-Italic.ttf -%{_datadir}/fonts/google-cousine-fonts/Cousine-Regular.ttf -%{_datadir}/licenses/google-cousine-fonts/* +%config %{_sysconfdir}/fonts/conf.d/*-google-cousine-fonts.conf +%{_datadir}/fontconfig/conf.avail/*-google-cousine-fonts.conf +%{_datadir}/fonts/google-cousine-fonts/*.ttf +%license LICENSE-2.0.txt %{_datadir}/metainfo/org.fedoraproject.google-cousine-fonts.metainfo.xml %files -n google-tinos-fonts -%{_sysconfdir}/fonts/conf.d/30-0-google-tinos-fonts.conf -%{_sysconfdir}/fonts/conf.d/62-google-tinos-fonts.conf -%{_datadir}/fontconfig/conf.avail/30-0-google-tinos-fonts.conf -%{_datadir}/fontconfig/conf.avail/62-google-tinos-fonts.conf -%{_datadir}/fonts/google-tinos-fonts/Tinos-Bold.ttf -%{_datadir}/fonts/google-tinos-fonts/Tinos-BoldItalic.ttf -%{_datadir}/fonts/google-tinos-fonts/Tinos-Italic.ttf -%{_datadir}/fonts/google-tinos-fonts/Tinos-Regular.ttf -%{_datadir}/licenses/google-tinos-fonts/* +%config %{_sysconfdir}/fonts/conf.d/*-google-tinos-fonts.conf +%{_datadir}/fontconfig/conf.avail/*-google-tinos-fonts.conf +%{_datadir}/fonts/google-tinos-fonts/*.ttf +%license LICENSE-2.0.txt %{_datadir}/metainfo/org.fedoraproject.google-tinos-fonts.metainfo.xml %changelog +* Wed Feb 21 2024 Sergey Cherevko - 1.31.0-15.1 +- Bump version + * Tue Feb 20 2024 Sergey Cherevko - 1.31.0-15 - Rebuilt for MSVSphere 8.9