From bf1730bb3868cac69b5cd0cda98827d777097a1c Mon Sep 17 00:00:00 2001 From: Nicolas Mailhot Date: Feb 21 2020 09:55:30 +0000 Subject: Convert to fonts-rpm-macros use --- diff --git a/.gitignore b/.gitignore index 7fa9eab..6af982c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ GFS_BODONI_OT.zip +/GFS_Bodoni.zip diff --git a/60-gfs-bodoni-fonts.xml b/60-gfs-bodoni-fonts.xml new file mode 100644 index 0000000..6ab2578 --- /dev/null +++ b/60-gfs-bodoni-fonts.xml @@ -0,0 +1,12 @@ + + + + + + GFS Bodoni + + serif + + + + diff --git a/gfs-bodoni-fonts-fontconfig.conf b/gfs-bodoni-fonts-fontconfig.conf deleted file mode 100644 index 1c4a63e..0000000 --- a/gfs-bodoni-fonts-fontconfig.conf +++ /dev/null @@ -1,16 +0,0 @@ - - - - - serif - - GFS Bodoni - - - - GFS Bodoni - - serif - - - diff --git a/gfs-bodoni-fonts.spec b/gfs-bodoni-fonts.spec index 231d588..435716f 100644 --- a/gfs-bodoni-fonts.spec +++ b/gfs-bodoni-fonts.spec @@ -1,148 +1,62 @@ -%global fontname gfs-bodoni -%global fontconf 60-%{fontname}.conf - -%global archivename GFS_BODONI_OT - -Name: %{fontname}-fonts +# SPDX-License-Identifier: MIT Version: 20070415 -Release: 27%{?dist} -Summary: GFS Bodoni fonts - -License: OFL -URL: http://www.greekfontsociety.gr/pages/en_typefaces20th.html -Source0: http://www.greekfontsociety.gr/%{archivename}.zip -Source1: %{name}-fontconfig.conf -Source2: %{fontname}.metainfo.xml - -BuildArch: noarch -BuildRequires: fontpackages-devel -Requires: fontpackages-filesystem - -%description +Release: 28%{?dist} +URL: http://www.greekfontsociety-gfs.gr/typefaces/20th_21st_century + +%global foundry GFS +%global fontlicense OFL +%global fontlicenses OFL.txt +%global fontdocs *.txt *.rtf +%global fontdocsex %{fontlicenses} + +%global fontfamily Bodoni +%global fontsummary GFS Bodoni, a 20th century Greek font family +%global fonts *.otf +%global fontconfngs %{SOURCE10} +%global fontdescription %{expand: Bodoni’s Greek types were the base for the first experimental font by Greek Font Society, GFS Bodoni (1992-1993), which was designed by Takis Katsoulidis, and digitised by George Matthiopoulos. The typeface is accompanied by a -matching latin alphabet. +matching latin alphabet.} +%global archivename %{lua:t=string.gsub(rpm.expand("%{foundry} %{fontfamily}"), "[%p%s]+", "_");print(t)} + +Source0: http://www.greekfontsociety-gfs.gr/_assets/fonts/%{archivename}.zip +Source10: 60-%{fontpkgname}.xml + +%fontpkg + +%package doc +Summary: %{name} optional documentation files +BuildArch: noarch +%description doc +This package provides optional documentation files shipped with %{name}. %prep %setup -q -c -T -unzip -j -L -q %{SOURCE0} -chmod 0644 *.txt -for txt in *.txt ; do - fold -s $txt > $txt.new - sed -i 's/\r//' $txt.new - touch -r $txt $txt.new - mv $txt.new $txt -done - +unzip -j -q %{SOURCE0} +%linuxtext *.txt %build - +%fontbuild %install -install -m 0755 -d %{buildroot}%{_fontdir} -install -m 0644 -p *.otf %{buildroot}%{_fontdir} - -install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ - %{buildroot}%{_fontconfig_confdir} +%fontinstall -install -m 0644 -p %{SOURCE1} \ - %{buildroot}%{_fontconfig_templatedir}/%{fontconf} -ln -s %{_fontconfig_templatedir}/%{fontconf} \ - %{buildroot}%{_fontconfig_confdir}/%{fontconf} +%check +%fontcheck -# Add AppStream metadata -install -Dm 0644 -p %{SOURCE2} \ - %{buildroot}%{_datadir}/appdata/%{fontname}.metainfo.xml +%fontfiles -%_font_pkg -f %{fontconf} *.otf -%doc *.txt *.pdf -%{_datadir}/appdata/%{fontname}.metainfo.xml +%files doc +%license OFL.txt +%doc *.pdf %changelog -* Tue Jan 28 2020 Fedora Release Engineering - 20070415-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 20070415-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 20070415-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 20070415-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 20070415-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 20070415-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 20070415-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 03 2016 Fedora Release Engineering - 20070415-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 20070415-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Oct 16 2014 Parag Nemade - 20070415-18 -- Add metainfo file to show this font in gnome-software - -* Sat Jun 07 2014 Fedora Release Engineering - 20070415-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Aug 03 2013 Fedora Release Engineering - 20070415-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 20070415-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Jul 19 2012 Fedora Release Engineering - 20070415-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jan 13 2012 Fedora Release Engineering - 20070415-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Feb 08 2011 Fedora Release Engineering - 20070415-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Jul 24 2009 Fedora Release Engineering - 20070415-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Feb 24 2009 Fedora Release Engineering - 20070415-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Feb 16 2009 Nicolas Mailhot -- 20070415-9 -— prepare for F11 mass rebuild, new rpm and new fontpackages - -* Sun Nov 23 2008 Nicolas Mailhot -- 20070415-8 -ᛤ ‘rpm-fonts’ renamed to “fontpackages” - -* Fri Nov 14 2008 Nicolas Mailhot -- 20070415-7 -▤ Rebuild using new « rpm-fonts » - -* Fri Jul 11 2008 Nicolas Mailhot -- 20070415-6 -⌖ Fedora 10 alpha general package cleanup - -* Wed Apr 30 2008 Nicolas Mailhot -- 20070415-5 -⥁ Yet another prep fix® - -* Mon Mar 17 2008 Nicolas Mailhot -- 20070415-4 -⚰ RIP OSX zip metadata. You won't be missed. - -* Sun Feb 17 2008 Nicolas Mailhot -☺ 20070415-2 -⌂ Update URL +* Sat Feb 15 2020 Nicolas Mailhot +- 20070415-28 +✅ Convert to fonts-rpm-macros use -* Sun Nov 25 2007 Nicolas Mailhot -☺ 20070415-1 -✓ initial packaging +* Sun Nov 25 2007 Nicolas Mailhot +- 20070415-1 +✅ Initial packaging diff --git a/gfs-bodoni.metainfo.xml b/gfs-bodoni.metainfo.xml deleted file mode 100644 index d4d6ee7..0000000 --- a/gfs-bodoni.metainfo.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - gfs-bodoni - CC-BY-3.0 - GFS Bodoni - GFS Bodoni fonts - -

- Bodoni’s Greek types were the base for the first experimental font by Greek - Font Society, GFS Bodoni (1992-1993), which was designed by Takis Katsoulidis, - and digitised by George Matthiopoulos. The typeface is accompanied by a - matching latin alphabet. -

- - pnemade_at_redhat_dot_com - http://www.greekfontsociety.gr/pages/en_typefaces20th.html - - diff --git a/sources b/sources index 0dcb1c6..7146f21 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -25b4e0ea7a9c02c87b99f1a7f95cf250 GFS_BODONI_OT.zip +SHA512 (GFS_Bodoni.zip) = 4b205e749967687d61f99885d758f3f9ee6bbbf0eabfa4c4b01e30fe8c064cc5322e3208e1af29ee628802e6e464653d4da1634b00b4995e025841c8d6519c9a