From facd3f0db2ffa7a09042caeb04e7d1d4c54a69bd Mon Sep 17 00:00:00 2001 From: Frank Arnold Date: Wed, 1 Mar 2006 07:42:42 +0000 Subject: [PATCH 01/66] Setup of module linux-libertine-fonts --- .cvsignore | 0 Makefile | 21 +++++++++++++++++++++ sources | 0 3 files changed, 21 insertions(+) create mode 100644 .cvsignore create mode 100644 Makefile create mode 100644 sources diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..36ed6da --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: linux-libertine-fonts +# $Id$ +NAME := linux-libertine-fonts +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 04dece1c238ce5d59580d5af7a94c7fcf318bc6d Mon Sep 17 00:00:00 2001 From: Frank Arnold Date: Wed, 1 Mar 2006 07:45:42 +0000 Subject: [PATCH 02/66] auto-import linux-libertine-fonts-2.0.4-2 on branch devel from linux-libertine-fonts-2.0.4-2.src.rpm --- .cvsignore | 1 + linux-libertine-fonts.spec | 96 ++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 98 insertions(+) create mode 100644 linux-libertine-fonts.spec diff --git a/.cvsignore b/.cvsignore index e69de29..942fafd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +LinLibertineSRC-2.0.4-6.tgz diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec new file mode 100644 index 0000000..5538539 --- /dev/null +++ b/linux-libertine-fonts.spec @@ -0,0 +1,96 @@ +%define archivename LinLibertineSRC +%define fontdir %{_datadir}/fonts/linux-libertine + +Name: linux-libertine-fonts +Version: 2.0.4 +Release: 2%{?dist} +Summary: Linux Libertine Open Fonts +Group: User Interface/X +License: GPL +URL: http://linuxlibertine.sf.net +Source: http://dl.sf.net/linuxlibertine/%{archivename}-%{version}-6.tgz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch +BuildRequires: fontforge + +%description +The Linux Libertine Open Fonts are a TrueType font family for practical +use in documents. They were created to provide a free alternative to +proprietary standard fonts. + + +%prep +%setup -q -n %{archivename} + + +%build +fontforge -script "-" *.sfd < 2.0.4-2 +- Named back to linux-libertine-fonts + +* Wed Feb 13 2006 Frank Arnold 2.0.4-1 +- Updated to 2.0.4 +- Removed handling of fonts.cache-2 + +* Wed Feb 01 2006 Frank Arnold 2.0.1-3 +- Nuked separate fontforge build script, now in %%build section + +* Tue Jan 31 2006 Frank Arnold 2.0.1-2 +- Fixed the following issues addressed by Ignacio Vazquez-Abrams +- Package renaming to font-linux-libertine +- Generate fonts from sources +- Sample sheets for each font in PDF format + +* Mon Jan 30 2006 Frank Arnold 2.0.1-1 +- Initial RPM release +- Spec derived from other font packages diff --git a/sources b/sources index e69de29..a2dafc3 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +d0fcc8c7b01f5b587592840a3f7564a0 LinLibertineSRC-2.0.4-6.tgz From 0924d9dd6e4ec8dccd6c6b0d8fe7b27ccb96ccb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 27 Aug 2006 20:38:58 +0000 Subject: [PATCH 03/66] http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild --- needs.rebuild | 1 + 1 file changed, 1 insertion(+) create mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild new file mode 100644 index 0000000..815fd29 --- /dev/null +++ b/needs.rebuild @@ -0,0 +1 @@ +http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 7dd178534c863cfdd8358d364863f1935d1062e2 Mon Sep 17 00:00:00 2001 From: Frank Arnold Date: Tue, 29 Aug 2006 20:46:05 +0000 Subject: [PATCH 04/66] - Updated to 2.1.0 --- .cvsignore | 2 +- linux-libertine-fonts.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 942fafd..55023b1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -LinLibertineSRC-2.0.4-6.tgz +LinLibertineSRC-2.1.0.tgz diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index 5538539..e113800 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -2,13 +2,13 @@ %define fontdir %{_datadir}/fonts/linux-libertine Name: linux-libertine-fonts -Version: 2.0.4 -Release: 2%{?dist} +Version: 2.1.0 +Release: 1%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X License: GPL URL: http://linuxlibertine.sf.net -Source: http://dl.sf.net/linuxlibertine/%{archivename}-%{version}-6.tgz +Source: http://dl.sf.net/linuxlibertine/%{archivename}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: fontforge @@ -68,13 +68,16 @@ fi %files %defattr(644,root,root,755) -%doc BUGS ChangeLog.txt README gpl.txt *.pdf +%doc Bugs ChangeLog.txt Readme gpl.txt *.pdf %dir %{fontdir} %{fontdir}/*.ttf %ghost %{fontdir}/fonts.cache-1 %changelog +* Tue Aug 29 2006 Frank Arnold 2.1.0-1 +- Updated to 2.1.0 + * Tue Feb 28 2006 Frank Arnold 2.0.4-2 - Named back to linux-libertine-fonts diff --git a/sources b/sources index a2dafc3..8a42179 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d0fcc8c7b01f5b587592840a3f7564a0 LinLibertineSRC-2.0.4-6.tgz +d177bee2f49a05dd07cdf908e8937641 LinLibertineSRC-2.1.0.tgz From a54bcc6cdec888fc7b134b0d15ef2fde37b0e677 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 20 Sep 2006 00:01:34 +0000 Subject: [PATCH 05/66] Update to 2.9.1 Rebuild for fc6 --- linux-libertine-fonts.spec | 7 +++++-- needs.rebuild | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) delete mode 100644 needs.rebuild diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index e113800..e7439b3 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -2,7 +2,7 @@ %define fontdir %{_datadir}/fonts/linux-libertine Name: linux-libertine-fonts -Version: 2.1.0 +Version: 2.1.9 Release: 1%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X @@ -68,13 +68,16 @@ fi %files %defattr(644,root,root,755) -%doc Bugs ChangeLog.txt Readme gpl.txt *.pdf +%doc Bugs ChangeLog.txt Readme *.pdf %dir %{fontdir} %{fontdir}/*.ttf %ghost %{fontdir}/fonts.cache-1 %changelog +* Tue Sep 19 2006 Kevin Fenzi 2.1.9-1 +- Update to 2.9.1 + * Tue Aug 29 2006 Frank Arnold 2.1.0-1 - Updated to 2.1.0 diff --git a/needs.rebuild b/needs.rebuild deleted file mode 100644 index 815fd29..0000000 --- a/needs.rebuild +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 32a8d264d3ba7e21a5ee8776d676871c88466ba7 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 20 Sep 2006 00:06:46 +0000 Subject: [PATCH 06/66] Upload proper 2.9.1 sources and rebuild --- .cvsignore | 2 +- linux-libertine-fonts.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 55023b1..3c7890a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -LinLibertineSRC-2.1.0.tgz +LinLibertineSRC-2.1.9.tgz diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index e7439b3..b1634de 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -3,7 +3,7 @@ Name: linux-libertine-fonts Version: 2.1.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X License: GPL @@ -75,6 +75,9 @@ fi %changelog +* Tue Sep 19 2006 Kevin Fenzi 2.1.9-2 +- Upload proper 2.9.1 sources and rebuild + * Tue Sep 19 2006 Kevin Fenzi 2.1.9-1 - Update to 2.9.1 diff --git a/sources b/sources index 8a42179..d07009f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d177bee2f49a05dd07cdf908e8937641 LinLibertineSRC-2.1.0.tgz +18a516945e3b2e40bb34bacad3453b20 LinLibertineSRC-2.1.9.tgz From b74f082379edaff80f4beab53b62e8adec6d2840 Mon Sep 17 00:00:00 2001 From: Frank Arnold Date: Sun, 1 Oct 2006 09:43:23 +0000 Subject: [PATCH 07/66] - Updated to 2.2.0 - Removed ghosted cache file as it's no longer stored in tree - Disabled generation of PDF files because fontforge will segfault - Added OFL to License field --- .cvsignore | 2 +- linux-libertine-fonts.spec | 27 ++++++++++++++------------- sources | 2 +- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3c7890a..0dfd9d1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -LinLibertineSRC-2.1.9.tgz +LinLibertineSRC-2.2.0.tgz diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index b1634de..97ba720 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -2,11 +2,11 @@ %define fontdir %{_datadir}/fonts/linux-libertine Name: linux-libertine-fonts -Version: 2.1.9 -Release: 2%{?dist} +Version: 2.2.0 +Release: 1%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X -License: GPL +License: OFL/GPL URL: http://linuxlibertine.sf.net Source: http://dl.sf.net/linuxlibertine/%{archivename}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -29,8 +29,8 @@ i = 1 while ( i < \$argc ) Open (\$argv[i], 1) Generate (\$fontname + ".ttf") - PrintSetup (5) - PrintFont (0, 0, "", \$fontname + "-sample.pdf") +# PrintSetup (5) +# PrintFont (0, 0, "", \$fontname + "-sample.pdf") Close() i++ endloop @@ -43,10 +43,6 @@ rm -rf $RPM_BUILD_ROOT install -d -m 0755 $RPM_BUILD_ROOT%{fontdir} install -p -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir} -# "touch" all files we've got flagged as %ghost but which are not -# present in the RPM_BUILD_ROOT when RPM looks for files -touch $RPM_BUILD_ROOT%{fontdir}/fonts.cache-1 - %clean rm -rf $RPM_BUILD_ROOT @@ -68,18 +64,23 @@ fi %files %defattr(644,root,root,755) -%doc Bugs ChangeLog.txt Readme *.pdf +%doc Bugs Readme *.txt %dir %{fontdir} %{fontdir}/*.ttf -%ghost %{fontdir}/fonts.cache-1 %changelog +* Tue Oct 01 2006 Frank Arnold 2.2.0-1 +- Updated to 2.2.0 +- Removed ghosted cache file as it's no longer stored in tree +- Disabled generation of PDF files because fontforge will segfault +- Added OFL to License field + * Tue Sep 19 2006 Kevin Fenzi 2.1.9-2 -- Upload proper 2.9.1 sources and rebuild +- Upload proper 2.1.9 sources and rebuild * Tue Sep 19 2006 Kevin Fenzi 2.1.9-1 -- Update to 2.9.1 +- Update to 2.1.9 * Tue Aug 29 2006 Frank Arnold 2.1.0-1 - Updated to 2.1.0 diff --git a/sources b/sources index d07009f..e44ddee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -18a516945e3b2e40bb34bacad3453b20 LinLibertineSRC-2.1.9.tgz +7262729601f8e308a5a4c51b54a34057 LinLibertineSRC-2.2.0.tgz From cb4fb10cc6504e69c9916dca197a053b71fac4e4 Mon Sep 17 00:00:00 2001 From: Frank Arnold Date: Sat, 17 Mar 2007 07:22:24 +0000 Subject: [PATCH 08/66] - Updated to 2.4.9 - Reenabled generation of PDF files --- .cvsignore | 2 +- linux-libertine-fonts.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0dfd9d1..c508da1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -LinLibertineSRC-2.2.0.tgz +LinLibertineSRC-2.4.9.tgz diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index 97ba720..7c32e9c 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -2,7 +2,7 @@ %define fontdir %{_datadir}/fonts/linux-libertine Name: linux-libertine-fonts -Version: 2.2.0 +Version: 2.4.9 Release: 1%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X @@ -29,8 +29,8 @@ i = 1 while ( i < \$argc ) Open (\$argv[i], 1) Generate (\$fontname + ".ttf") -# PrintSetup (5) -# PrintFont (0, 0, "", \$fontname + "-sample.pdf") + PrintSetup (5) + PrintFont (0, 0, "", \$fontname + "-sample.pdf") Close() i++ endloop @@ -64,12 +64,16 @@ fi %files %defattr(644,root,root,755) -%doc Bugs Readme *.txt +%doc Bugs Readme *.txt *.pdf %dir %{fontdir} %{fontdir}/*.ttf %changelog +* Sat Mar 17 2007 Frank Arnold 2.4.9-1 +- Updated to 2.4.9 +- Reenabled generation of PDF files + * Tue Oct 01 2006 Frank Arnold 2.2.0-1 - Updated to 2.2.0 - Removed ghosted cache file as it's no longer stored in tree diff --git a/sources b/sources index e44ddee..db9f097 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7262729601f8e308a5a4c51b54a34057 LinLibertineSRC-2.2.0.tgz +aa55aa7c3c6925f3fb7b07ba0e89d6ad LinLibertineSRC-2.4.9.tgz From 4c9bc0bcaed9f96ceed4ffe258f6f3fb7b900a06 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 17 Sep 2007 22:43:08 +0000 Subject: [PATCH 09/66] Updated to 2.6.9 Update License tag --- .cvsignore | 2 +- linux-libertine-fonts.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index c508da1..7c92d71 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -LinLibertineSRC-2.4.9.tgz +LinLibertineSRC-2.6.tgz diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index 7c32e9c..f88a192 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -2,13 +2,13 @@ %define fontdir %{_datadir}/fonts/linux-libertine Name: linux-libertine-fonts -Version: 2.4.9 +Version: 2.6.9 Release: 1%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X -License: OFL/GPL +License: GPL+ with exceptions or OFL URL: http://linuxlibertine.sf.net -Source: http://dl.sf.net/linuxlibertine/%{archivename}-%{version}.tgz +Source: http://dl.sf.net/linuxlibertine/%{archivename}-2.6.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: fontforge @@ -70,6 +70,10 @@ fi %changelog +* Sun Sep 16 2007 Kevin Fenzi - 2.6.9-1 +- Updated to 2.6.9 +- Update License tag + * Sat Mar 17 2007 Frank Arnold 2.4.9-1 - Updated to 2.4.9 - Reenabled generation of PDF files diff --git a/sources b/sources index db9f097..6d13952 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aa55aa7c3c6925f3fb7b07ba0e89d6ad LinLibertineSRC-2.4.9.tgz +449c862d3e46b1c187d2bbbce5d79b77 LinLibertineSRC-2.6.tgz From 2d98b3cead69ec1d4d3fc769ccf2ed67c9fde326 Mon Sep 17 00:00:00 2001 From: Frank Arnold Date: Sun, 3 Feb 2008 12:43:04 +0000 Subject: [PATCH 10/66] - Updated to 2.7.9 - Drop generated PDF files to save space --- .cvsignore | 2 +- linux-libertine-fonts.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7c92d71..31278ae 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -LinLibertineSRC-2.6.tgz +LinLibertineSRC-2.7.tgz diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index f88a192..d6057f6 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -2,13 +2,13 @@ %define fontdir %{_datadir}/fonts/linux-libertine Name: linux-libertine-fonts -Version: 2.6.9 +Version: 2.7.9 Release: 1%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X -License: GPL+ with exceptions or OFL +License: GPLv2+ with exceptions or OFL URL: http://linuxlibertine.sf.net -Source: http://dl.sf.net/linuxlibertine/%{archivename}-2.6.tgz +Source: http://dl.sf.net/linuxlibertine/%{archivename}-2.7.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: fontforge @@ -21,6 +21,7 @@ proprietary standard fonts. %prep %setup -q -n %{archivename} +sed -i -e 's/\r//' OFL.txt %build @@ -29,8 +30,6 @@ i = 1 while ( i < \$argc ) Open (\$argv[i], 1) Generate (\$fontname + ".ttf") - PrintSetup (5) - PrintFont (0, 0, "", \$fontname + "-sample.pdf") Close() i++ endloop @@ -64,12 +63,16 @@ fi %files %defattr(644,root,root,755) -%doc Bugs Readme *.txt *.pdf +%doc Bugs Readme *.txt %dir %{fontdir} %{fontdir}/*.ttf %changelog +* Sun Feb 03 2008 Frank Arnold 2.7.9-1 +- Updated to 2.7.9 +- Drop generated PDF files to save space + * Sun Sep 16 2007 Kevin Fenzi - 2.6.9-1 - Updated to 2.6.9 - Update License tag diff --git a/sources b/sources index 6d13952..0c1d2a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -449c862d3e46b1c187d2bbbce5d79b77 LinLibertineSRC-2.6.tgz +9a34ee20358d3c5aae7d46ed15e43d73 LinLibertineSRC-2.7.tgz From 818d1f7088a08a3e88282035e33c8b162d07ac3f Mon Sep 17 00:00:00 2001 From: nim Date: Wed, 3 Sep 2008 21:23:24 +0000 Subject: [PATCH 11/66] rebuild with pre-F10-freeze fontforge --- import.log | 1 + linux-libertine-fonts.spec | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 import.log diff --git a/import.log b/import.log new file mode 100644 index 0000000..5ed822d --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +linux-libertine-fonts-2_7_9-2_fc10:HEAD:linux-libertine-fonts-2.7.9-2.fc10.src.rpm:1220476988 diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index d6057f6..7dea2c2 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -3,7 +3,7 @@ Name: linux-libertine-fonts Version: 2.7.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X License: GPLv2+ with exceptions or OFL @@ -69,6 +69,10 @@ fi %changelog +* Wed Sep 3 2008 Nicolas Mailhot +- 2.7.9-2 +⚙ Rebuild with pre-F10-freeze fontforge + * Sun Feb 03 2008 Frank Arnold 2.7.9-1 - Updated to 2.7.9 - Drop generated PDF files to save space From fd837aceb00a9e5c1d0d5497e095b411452747f3 Mon Sep 17 00:00:00 2001 From: Frank Arnold Date: Fri, 21 Nov 2008 13:14:38 +0000 Subject: [PATCH 12/66] - Updated to 4.1.8 - Modified build procedure according to GENERATING.txt --- .cvsignore | 2 +- linux-libertine-fonts.spec | 38 ++++++++++++++++++++++++++------------ sources | 2 +- 3 files changed, 28 insertions(+), 14 deletions(-) diff --git a/.cvsignore b/.cvsignore index 31278ae..63869c2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -LinLibertineSRC-2.7.tgz +LinLibertineSRC-4.1.8.tgz diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index 7dea2c2..94dfe05 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -1,18 +1,20 @@ %define archivename LinLibertineSRC %define fontdir %{_datadir}/fonts/linux-libertine + Name: linux-libertine-fonts -Version: 2.7.9 -Release: 2%{?dist} +Version: 4.1.8 +Release: 1%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X License: GPLv2+ with exceptions or OFL URL: http://linuxlibertine.sf.net -Source: http://dl.sf.net/linuxlibertine/%{archivename}-2.7.tgz +Source: http://dl.sf.net/linuxlibertine/%{archivename}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: fontforge + %description The Linux Libertine Open Fonts are a TrueType font family for practical use in documents. They were created to provide a free alternative to @@ -27,9 +29,18 @@ sed -i -e 's/\r//' OFL.txt %build fontforge -script "-" *.sfd < 4.1.8-1 +- Updated to 4.1.8 +- Modified build procedure according to GENERATING.txt + * Wed Sep 3 2008 Nicolas Mailhot - 2.7.9-2 ⚙ Rebuild with pre-F10-freeze fontforge diff --git a/sources b/sources index 0c1d2a9..b1a184e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9a34ee20358d3c5aae7d46ed15e43d73 LinLibertineSRC-2.7.tgz +e7357378dc803cf6a2823cae032caf24 LinLibertineSRC-4.1.8.tgz From 68f91285bd31b11a1b23b9531fb3ebd5bd906a2a Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 20:32:48 +0000 Subject: [PATCH 13/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- linux-libertine-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index 94dfe05..edb7e13 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -4,7 +4,7 @@ Name: linux-libertine-fonts Version: 4.1.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X License: GPLv2+ with exceptions or OFL @@ -79,6 +79,9 @@ fi %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 4.1.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Fri Nov 21 2008 Frank Arnold 4.1.8-1 - Updated to 4.1.8 - Modified build procedure according to GENERATING.txt From d62747a1714563bd4eb9140c323fb486deabd110 Mon Sep 17 00:00:00 2001 From: nim Date: Sun, 15 Mar 2009 18:46:06 +0000 Subject: [PATCH 14/66] Try to build with F11 fontforge --- import.log | 1 + linux-libertine-fonts.spec | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/import.log b/import.log index 5ed822d..48ca827 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ linux-libertine-fonts-2_7_9-2_fc10:HEAD:linux-libertine-fonts-2.7.9-2.fc10.src.rpm:1220476988 +linux-libertine-fonts-4_1_8-3_fc11:HEAD:linux-libertine-fonts-4.1.8-3.fc11.src.rpm:1237142709 diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index edb7e13..9b348f3 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -4,7 +4,7 @@ Name: linux-libertine-fonts Version: 4.1.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X License: GPLv2+ with exceptions or OFL @@ -79,6 +79,9 @@ fi %changelog +* Sun Mar 15 2009 Nicolas Mailhot - 4.1.8-3 +— Make sure F11 font packages have been built with F11 fontforge + * Wed Feb 25 2009 Fedora Release Engineering - 4.1.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From f157565de31d773ab178d36d9da8681265efdd09 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 15 Jul 2009 06:03:06 +0000 Subject: [PATCH 15/66] Upgrade to 4.4.1 Fix to match current font guidelines --- .cvsignore | 2 +- linux-libertine-fonts-fontconfig.conf | 10 ++++ linux-libertine-fonts.spec | 83 ++++++++++++--------------- sources | 2 +- 4 files changed, 50 insertions(+), 47 deletions(-) create mode 100644 linux-libertine-fonts-fontconfig.conf diff --git a/.cvsignore b/.cvsignore index 63869c2..f43f9d4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -LinLibertineSRC-4.1.8.tgz +LinLibertineSRC-4.4.1.tgz diff --git a/linux-libertine-fonts-fontconfig.conf b/linux-libertine-fonts-fontconfig.conf new file mode 100644 index 0000000..05670b6 --- /dev/null +++ b/linux-libertine-fonts-fontconfig.conf @@ -0,0 +1,10 @@ + + + + + Linux Libertine + + Linux Libertine O + + + diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index 9b348f3..b5cc283 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -1,33 +1,35 @@ -%define archivename LinLibertineSRC -%define fontdir %{_datadir}/fonts/linux-libertine - - -Name: linux-libertine-fonts -Version: 4.1.8 -Release: 3%{?dist} -Summary: Linux Libertine Open Fonts -Group: User Interface/X -License: GPLv2+ with exceptions or OFL -URL: http://linuxlibertine.sf.net -Source: http://dl.sf.net/linuxlibertine/%{archivename}-%{version}.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch -BuildRequires: fontforge - +%global fontname linux-libertine +%global fontconf 75-%{fontname}.conf +%global archivename LinLibertineSRC + +Name: %{fontname}-fonts +Version: 4.4.1 +Release: 1%{?dist} +Summary: Linux Libertine Open Fonts + +Group: User Interface/X +License: GPLv2+ with exceptions or OFL +URL: http://linuxlibertine.sf.net +Source0: http://download.sourceforge.net/sourceforge/linuxlibertine/LinLibertineSRC-4.4.1.tgz +Source1: %{name}-fontconfig.conf +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + +BuildArch: noarch +BuildRequires: fontpackages-devel +BuildRequires: fontforge +Requires: fontpackages-filesystem %description The Linux Libertine Open Fonts are a TrueType font family for practical use in documents. They were created to provide a free alternative to proprietary standard fonts. - %prep %setup -q -n %{archivename} sed -i -e 's/\r//' OFL.txt - %build -fontforge -script "-" *.sfd < - 4.4.1-1 +- Upgrade to 4.4.1 +- Fix to match current font guidelines + * Sun Mar 15 2009 Nicolas Mailhot - 4.1.8-3 — Make sure F11 font packages have been built with F11 fontforge diff --git a/sources b/sources index b1a184e..2180ba3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e7357378dc803cf6a2823cae032caf24 LinLibertineSRC-4.1.8.tgz +a0fc3c60fcfdc6b7261f746043efe980 LinLibertineSRC-4.4.1.tgz From dc9552284e65337cb8643004c652df0cec3dd0c5 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 11:08:05 +0000 Subject: [PATCH 16/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- linux-libertine-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index b5cc283..c348d25 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -4,7 +4,7 @@ Name: %{fontname}-fonts Version: 4.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X @@ -68,6 +68,9 @@ rm -fr %{buildroot} %doc OFL.txt GPL.txt ChangeLog.txt LICENCE.txt Readme Readme-TEX.txt %changelog +* Sat Jul 25 2009 Fedora Release Engineering - 4.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Tue Jul 14 2009 Kevin Fenzi - 4.4.1-1 - Upgrade to 4.4.1 - Fix to match current font guidelines From 34c72f9bbb73f4ca715a2d0376f162ea1e811a8d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:51:32 +0000 Subject: [PATCH 17/66] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 36ed6da..74ff7dd 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := linux-libertine-fonts SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From f390396a1524b39ac0ca16e4d03ed4da9d2a0536 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 02:26:32 +0000 Subject: [PATCH 18/66] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 2 -- 3 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 74ff7dd..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: linux-libertine-fonts -# $Id$ -NAME := linux-libertine-fonts -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index 48ca827..0000000 --- a/import.log +++ /dev/null @@ -1,2 +0,0 @@ -linux-libertine-fonts-2_7_9-2_fc10:HEAD:linux-libertine-fonts-2.7.9-2.fc10.src.rpm:1220476988 -linux-libertine-fonts-4_1_8-3_fc11:HEAD:linux-libertine-fonts-4.1.8-3.fc11.src.rpm:1237142709 From 0866e1ec034d1f18626cec6cb1a26b0a6b1384cf Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 07:18:52 -0600 Subject: [PATCH 19/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- linux-libertine-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index c348d25..11d70c0 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -4,7 +4,7 @@ Name: %{fontname}-fonts Version: 4.4.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X @@ -68,6 +68,9 @@ rm -fr %{buildroot} %doc OFL.txt GPL.txt ChangeLog.txt LICENCE.txt Readme Readme-TEX.txt %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 4.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sat Jul 25 2009 Fedora Release Engineering - 4.4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 96d1abe5b4468e1b0d58cbf180ba3518bdce2fd4 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Thu, 17 Feb 2011 20:18:38 +0900 Subject: [PATCH 20/66] - Improve the spec file to meet the packaging guidelines. (#477418) - Updates to 4.7.5-2 (#628540) --- ...x-libertine-fonts-biolinum-fontconfig.conf | 10 +- ...-libertine-fonts-libertine-fontconfig.conf | 30 ++++++ linux-libertine-fonts.spec | 100 ++++++++++++------ 3 files changed, 102 insertions(+), 38 deletions(-) rename linux-libertine-fonts-fontconfig.conf => linux-libertine-fonts-biolinum-fontconfig.conf (51%) create mode 100644 linux-libertine-fonts-libertine-fontconfig.conf diff --git a/linux-libertine-fonts-fontconfig.conf b/linux-libertine-fonts-biolinum-fontconfig.conf similarity index 51% rename from linux-libertine-fonts-fontconfig.conf rename to linux-libertine-fonts-biolinum-fontconfig.conf index 05670b6..8112218 100644 --- a/linux-libertine-fonts-fontconfig.conf +++ b/linux-libertine-fonts-biolinum-fontconfig.conf @@ -1,10 +1,12 @@ + - Linux Libertine - - Linux Libertine O - + Linux Biolinum + + sans-serif + + diff --git a/linux-libertine-fonts-libertine-fontconfig.conf b/linux-libertine-fonts-libertine-fontconfig.conf new file mode 100644 index 0000000..ac3657f --- /dev/null +++ b/linux-libertine-fonts-libertine-fontconfig.conf @@ -0,0 +1,30 @@ + + + + + + Linux Libertine + + serif + + + + + Times Roman + + Linux Libertine + + + + Times New Roman + + Linux Libertine + + + + Linux Libertine O + + Linux Libertine + + + diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index 11d70c0..f1ca6b4 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -1,52 +1,70 @@ -%global fontname linux-libertine -%global fontconf 75-%{fontname}.conf -%global archivename LinLibertineSRC +%global fontname linux-libertine +%global prio_libertine 60 +%global prio_biolinum 61 +%global fontconf_libertine %{prio_libertine}-%{fontname}-libertine.conf +%global fontconf_biolinum %{prio_biolinum}-%{fontname}-biolinum.conf +%global archivename LinLibertine +%define posttag 2 + +%define common_desc \ +The Linux Libertine Open Fonts are a TrueType font family for practical \ +use in documents. They were created to provide a free alternative to \ +proprietary standard fonts. Name: %{fontname}-fonts -Version: 4.4.1 -Release: 3%{?dist} +Version: 4.7.5 +Release: 1.%{posttag}%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X License: GPLv2+ with exceptions or OFL URL: http://linuxlibertine.sf.net -Source0: http://download.sourceforge.net/sourceforge/linuxlibertine/LinLibertineSRC-4.4.1.tgz -Source1: %{name}-fontconfig.conf +Source0: http://download.sourceforge.net/sourceforge/linuxlibertine/LinLibertineSRC-%{version}-%{posttag}.tgz +Source1: %{name}-libertine-fontconfig.conf +Source2: %{name}-biolinum-fontconfig.conf BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch BuildRequires: fontpackages-devel BuildRequires: fontforge -Requires: fontpackages-filesystem +Requires: %{name}-common = %{version}-%{release} %description -The Linux Libertine Open Fonts are a TrueType font family for practical -use in documents. They were created to provide a free alternative to -proprietary standard fonts. +%common_desc + +This package contains Serif fonts. + +%package -n %{fontname}-biolinum-fonts +Summary: Sans-serif fonts from Linux Libertine Open Fonts +Requires: %{name}-common = %{version}-%{release} +Group: User Interface/X + +%description -n %{fontname}-biolinum-fonts +%common_desc + +This package contains Sans fonts. + +%package common +Summary: Common files for Linux Libertine Open Fonts +Requires: fontpackages-filesystem +Group: User Interface/X + +%description common +%common_desc + +This package consists of files used by other %{name} packages. %prep %setup -q -n %{archivename} sed -i -e 's/\r//' OFL.txt %build -fontforge -lang=ff -script "-" *.sfd < - 4.4.1-4 +- Improve the spec file to meet the packaging guidelines. (#477418) +- Updates to 4.7.5-2 (#628540) + * Tue Feb 08 2011 Fedora Release Engineering - 4.4.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 9fc06f15c979030f3c84b6bfe571b3e2acce9083 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Thu, 17 Feb 2011 20:19:18 +0900 Subject: [PATCH 21/66] - Improve the spec file to meet the packaging guidelines. (#477418) - Updates to 4.7.5-2 (#628540) --- linux-libertine-fonts.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index f1ca6b4..c6a008f 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -96,7 +96,7 @@ rm -fr %{buildroot} %_font_pkg -n biolinum -f %{fontconf_biolinum} LinBiolinum*.ttf %changelog -* Thu Feb 17 2011 Akira TAGOH - 4.4.1-4 +* Thu Feb 17 2011 Akira TAGOH - 4.7.5-1.2 - Improve the spec file to meet the packaging guidelines. (#477418) - Updates to 4.7.5-2 (#628540) From 1252e01f882ec4b318b1cde202f4b06afb9a5e15 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Thu, 17 Feb 2011 20:24:50 +0900 Subject: [PATCH 22/66] - Improve the spec file to meet the packaging guidelines. (#477418) - Updates to 4.7.5-2 (#628540) --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f43f9d4..bb40862 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ LinLibertineSRC-4.4.1.tgz +/LinLibertineSRC-4.7.5-2.tgz diff --git a/sources b/sources index 2180ba3..86a898b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a0fc3c60fcfdc6b7261f746043efe980 LinLibertineSRC-4.4.1.tgz +6c1670ce222c44a88ea3cb0cb73b4f6a LinLibertineSRC-4.7.5-2.tgz From dc3c2db099ae810d32cd27569a46a0d08b3c4775 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 02:47:43 -0600 Subject: [PATCH 23/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- linux-libertine-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index c6a008f..a870b9f 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -13,7 +13,7 @@ proprietary standard fonts. Name: %{fontname}-fonts Version: 4.7.5 -Release: 1.%{posttag}%{?dist} +Release: 2.%{posttag}%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X @@ -96,6 +96,9 @@ rm -fr %{buildroot} %_font_pkg -n biolinum -f %{fontconf_biolinum} LinBiolinum*.ttf %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 4.7.5-2.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Thu Feb 17 2011 Akira TAGOH - 4.7.5-1.2 - Improve the spec file to meet the packaging guidelines. (#477418) - Updates to 4.7.5-2 (#628540) From 39f7953c3f5c5916c427adf2d7ac3f104878b34a Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Thu, 19 Apr 2012 13:54:53 +0900 Subject: [PATCH 24/66] New upstream release. (#813730) --- .gitignore | 1 + linux-libertine-fonts.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index bb40862..96cf0b5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ LinLibertineSRC-4.4.1.tgz /LinLibertineSRC-4.7.5-2.tgz +/LinLibertineSRC_5.1.3_2011_06_21.tgz diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index a870b9f..3e96cb0 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -4,7 +4,7 @@ %global fontconf_libertine %{prio_libertine}-%{fontname}-libertine.conf %global fontconf_biolinum %{prio_biolinum}-%{fontname}-biolinum.conf %global archivename LinLibertine -%define posttag 2 +%define posttag 2011_06_21 %define common_desc \ The Linux Libertine Open Fonts are a TrueType font family for practical \ @@ -12,14 +12,14 @@ use in documents. They were created to provide a free alternative to \ proprietary standard fonts. Name: %{fontname}-fonts -Version: 4.7.5 -Release: 2.%{posttag}%{?dist} +Version: 5.1.3 +Release: 1.%{posttag}%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X License: GPLv2+ with exceptions or OFL URL: http://linuxlibertine.sf.net -Source0: http://download.sourceforge.net/sourceforge/linuxlibertine/LinLibertineSRC-%{version}-%{posttag}.tgz +Source0: http://download.sourceforge.net/sourceforge/linuxlibertine/LinLibertineSRC-%{version}_%{posttag}.tgz Source1: %{name}-libertine-fontconfig.conf Source2: %{name}-biolinum-fontconfig.conf BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -96,6 +96,9 @@ rm -fr %{buildroot} %_font_pkg -n biolinum -f %{fontconf_biolinum} LinBiolinum*.ttf %changelog +* Thu Apr 19 2012 Akira TAGOH - 5.1.3-1.2011_06_21 +- New upstream release. (#813730) + * Fri Jan 13 2012 Fedora Release Engineering - 4.7.5-2.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 86a898b..c046537 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6c1670ce222c44a88ea3cb0cb73b4f6a LinLibertineSRC-4.7.5-2.tgz +15e268158671a5bf6b8146ec6bd6bf9b LinLibertineSRC_5.1.3_2011_06_21.tgz From bdd32aab3b3ffd33b3a76f031afa8f4be0e29637 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Thu, 19 Apr 2012 14:00:15 +0900 Subject: [PATCH 25/66] update source filename --- linux-libertine-fonts.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index 3e96cb0..a408b45 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -19,7 +19,7 @@ Summary: Linux Libertine Open Fonts Group: User Interface/X License: GPLv2+ with exceptions or OFL URL: http://linuxlibertine.sf.net -Source0: http://download.sourceforge.net/sourceforge/linuxlibertine/LinLibertineSRC-%{version}_%{posttag}.tgz +Source0: http://download.sourceforge.net/sourceforge/linuxlibertine/LinLibertineSRC_%{version}_%{posttag}.tgz Source1: %{name}-libertine-fontconfig.conf Source2: %{name}-biolinum-fontconfig.conf BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) From 69205baa82ecafa0e506d440cc44e925de35617c Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Wed, 13 Jun 2012 13:56:09 +0900 Subject: [PATCH 26/66] Fix the order for substitute of Times New Roman. (#830849) --- linux-libertine-fonts-libertine-fontconfig.conf | 12 ------------ ...onts-libertine-metrics-alias-fontconfig.conf | 17 +++++++++++++++++ linux-libertine-fonts.spec | 11 +++++++++-- 3 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 linux-libertine-fonts-libertine-metrics-alias-fontconfig.conf diff --git a/linux-libertine-fonts-libertine-fontconfig.conf b/linux-libertine-fonts-libertine-fontconfig.conf index ac3657f..9bef8c1 100644 --- a/linux-libertine-fonts-libertine-fontconfig.conf +++ b/linux-libertine-fonts-libertine-fontconfig.conf @@ -9,18 +9,6 @@ - - Times Roman - - Linux Libertine - - - - Times New Roman - - Linux Libertine - - Linux Libertine O diff --git a/linux-libertine-fonts-libertine-metrics-alias-fontconfig.conf b/linux-libertine-fonts-libertine-metrics-alias-fontconfig.conf new file mode 100644 index 0000000..b030173 --- /dev/null +++ b/linux-libertine-fonts-libertine-metrics-alias-fontconfig.conf @@ -0,0 +1,17 @@ + + + + + + Times Roman + + Linux Libertine + + + + Times New Roman + + Linux Libertine + + + diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index a408b45..89d194c 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -3,6 +3,7 @@ %global prio_biolinum 61 %global fontconf_libertine %{prio_libertine}-%{fontname}-libertine.conf %global fontconf_biolinum %{prio_biolinum}-%{fontname}-biolinum.conf +%global fontconf_metrics 29-%{fontname}-metrics-alias.conf %global archivename LinLibertine %define posttag 2011_06_21 @@ -13,7 +14,7 @@ proprietary standard fonts. Name: %{fontname}-fonts Version: 5.1.3 -Release: 1.%{posttag}%{?dist} +Release: 2.%{posttag}%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X @@ -22,6 +23,7 @@ URL: http://linuxlibertine.sf.net Source0: http://download.sourceforge.net/sourceforge/linuxlibertine/LinLibertineSRC_%{version}_%{posttag}.tgz Source1: %{name}-libertine-fontconfig.conf Source2: %{name}-biolinum-fontconfig.conf +Source3: %{name}-libertine-metrics-alias-fontconfig.conf BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch @@ -76,8 +78,10 @@ install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ install -m 0644 -p %{SOURCE1} \ %{buildroot}%{_fontconfig_templatedir}/%{fontconf_libertine} -install -m 0644 -p %{SOURCE1} \ +install -m 0644 -p %{SOURCE2} \ %{buildroot}%{_fontconfig_templatedir}/%{fontconf_biolinum} +install -m 0644 -p %{SOURCE3} \ + %{buildroot}%{_fontconfig_templatedir}/%{fontconf_metrics} for fconf in %{fontconf_libertine} %{fontconf_biolinum}; do ln -s %{_fontconfig_templatedir}/$fconf \ @@ -96,6 +100,9 @@ rm -fr %{buildroot} %_font_pkg -n biolinum -f %{fontconf_biolinum} LinBiolinum*.ttf %changelog +* Wed Jun 13 2012 Akira TAGOH - 5.1.3-2.2011_06_21 +- Fix the order for substitute of Times New Roman. (#830849) + * Thu Apr 19 2012 Akira TAGOH - 5.1.3-1.2011_06_21 - New upstream release. (#813730) From 37f9349f0903a198e5dfec18b5d9e5d6cb95a4b7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 16:56:08 -0500 Subject: [PATCH 27/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- linux-libertine-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index 89d194c..a6d72f2 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -14,7 +14,7 @@ proprietary standard fonts. Name: %{fontname}-fonts Version: 5.1.3 -Release: 2.%{posttag}%{?dist} +Release: 3.%{posttag}%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X @@ -100,6 +100,9 @@ rm -fr %{buildroot} %_font_pkg -n biolinum -f %{fontconf_biolinum} LinBiolinum*.ttf %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 5.1.3-3.2011_06_21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Wed Jun 13 2012 Akira TAGOH - 5.1.3-2.2011_06_21 - Fix the order for substitute of Times New Roman. (#830849) From 55af01078a0206b9978f19ad5f5b5631d465c189 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 24 Jul 2012 19:37:20 +0900 Subject: [PATCH 28/66] New upstream release. - Giving up to build fonts from the source due to lacking of the build script. --- .gitignore | 1 + linux-libertine-fonts.spec | 35 +++++++++++++++++++++-------------- sources | 2 +- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 96cf0b5..0a2ea16 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ LinLibertineSRC-4.4.1.tgz /LinLibertineSRC-4.7.5-2.tgz /LinLibertineSRC_5.1.3_2011_06_21.tgz +/LinLibertineTTF_5.3.0_2012_07_02.tgz diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index a6d72f2..b4ef9b2 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -5,7 +5,7 @@ %global fontconf_biolinum %{prio_biolinum}-%{fontname}-biolinum.conf %global fontconf_metrics 29-%{fontname}-metrics-alias.conf %global archivename LinLibertine -%define posttag 2011_06_21 +%define posttag 2012_07_02 %define common_desc \ The Linux Libertine Open Fonts are a TrueType font family for practical \ @@ -13,14 +13,14 @@ use in documents. They were created to provide a free alternative to \ proprietary standard fonts. Name: %{fontname}-fonts -Version: 5.1.3 -Release: 3.%{posttag}%{?dist} +Version: 5.3.0 +Release: 1.%{posttag}%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X License: GPLv2+ with exceptions or OFL URL: http://linuxlibertine.sf.net -Source0: http://download.sourceforge.net/sourceforge/linuxlibertine/LinLibertineSRC_%{version}_%{posttag}.tgz +Source0: http://download.sourceforge.net/sourceforge/linuxlibertine/LinLibertineTTF_%{version}_%{posttag}.tgz Source1: %{name}-libertine-fontconfig.conf Source2: %{name}-biolinum-fontconfig.conf Source3: %{name}-libertine-metrics-alias-fontconfig.conf @@ -57,16 +57,16 @@ Group: User Interface/X This package consists of files used by other %{name} packages. %prep -%setup -q -n %{archivename} -sed -i -e 's/\r//' OFL.txt +%setup -q -c +sed -i -e 's/\r//' OFL-1.1.txt %build -for i in $(find -name '*.sfd'); do - (cd scripts; - ./bailly-2.sh "../$i" ttf - ) -done -mv scripts/*.ttf . +#for i in $(find -name '*.sfd'); do +# (cd scripts; +# ./bailly-2.sh "../$i" ttf +# ) +#done +#mv scripts/*.ttf . %install rm -fr %{buildroot} @@ -83,7 +83,7 @@ install -m 0644 -p %{SOURCE2} \ install -m 0644 -p %{SOURCE3} \ %{buildroot}%{_fontconfig_templatedir}/%{fontconf_metrics} -for fconf in %{fontconf_libertine} %{fontconf_biolinum}; do +for fconf in %{fontconf_libertine} %{fontconf_metrics} %{fontconf_biolinum}; do ln -s %{_fontconfig_templatedir}/$fconf \ %{buildroot}%{_fontconfig_confdir}/$fconf done @@ -93,13 +93,20 @@ rm -fr %{buildroot} %files common %defattr(0644, root, root, 0755) -%doc Bugs.txt ChangeLog.txt GPL.txt LICENCE.txt OFL.txt Readme-TEX.txt Readme.txt +%doc Bugs.txt ChangeLog.txt GPL.txt LICENCE.txt OFL-1.1.txt Readme-TEX.txt README %_font_pkg -f %{fontconf_libertine} LinLibertine*.ttf +%{_fontconfig_templatedir}/%{fontconf_metrics} +%{_fontconfig_confdir}/%{fontconf_metrics} + %_font_pkg -n biolinum -f %{fontconf_biolinum} LinBiolinum*.ttf %changelog +* Tue Jul 24 2012 Akira TAGOH - 5.3.0-1.2012_07_02 +- New upstream release. +- Giving up to build fonts from the source due to lacking of the build script. + * Thu Jul 19 2012 Fedora Release Engineering - 5.1.3-3.2011_06_21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index c046537..c7dd768 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -15e268158671a5bf6b8146ec6bd6bf9b LinLibertineSRC_5.1.3_2011_06_21.tgz +3ff3ede32b0a62e57a62e33783815b70 LinLibertineTTF_5.3.0_2012_07_02.tgz From 9a70e158f18f383b074f3b19c0aafdee7ea28cf3 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Fri, 27 Jul 2012 16:09:16 +0900 Subject: [PATCH 29/66] update fontconfig files according to some information on #843202 --- ...x-libertine-fonts-biolinum-fontconfig.conf | 41 ++++++++++ ...-libertine-fonts-libertine-fontconfig.conf | 74 +++++++++++++++++++ 2 files changed, 115 insertions(+) diff --git a/linux-libertine-fonts-biolinum-fontconfig.conf b/linux-libertine-fonts-biolinum-fontconfig.conf index 8112218..ca99056 100644 --- a/linux-libertine-fonts-biolinum-fontconfig.conf +++ b/linux-libertine-fonts-biolinum-fontconfig.conf @@ -1,6 +1,47 @@ + + + Linux Biolinum Keyboard O + + + Linux Biolinum Keyboard + + + + + Linux Biolinum O + + + Linux Biolinum + + + + + Linux Biolinum Keyboard O + + Linux Biolinum Keyboard + + + + Linux Biolinum Keyboard G + + Linux Biolinum Keyboard + + + + Linux Biolinum O + + Linux Biolinum + + + + Linux Biolinum G + + Linux Biolinum + + Linux Biolinum diff --git a/linux-libertine-fonts-libertine-fontconfig.conf b/linux-libertine-fonts-libertine-fontconfig.conf index 9bef8c1..acc3240 100644 --- a/linux-libertine-fonts-libertine-fontconfig.conf +++ b/linux-libertine-fonts-libertine-fontconfig.conf @@ -1,6 +1,38 @@ + + + Linux Libertine Display O + + + Linux Libertine Display + + + + + Linux Libertine Initials O + + + Linux Libertine Initials + + + + + Linux Libertine Mono O + + + Linux Libertine Mono + + + + + Linux Libertine O + + + Linux Libertine + + Linux Libertine @@ -9,10 +41,52 @@ + + Linux Libertine Display O + + Linux Libertine Display + + + + Linux Libertine Display G + + Linux Libertine Display + + + + Linux Libertine Initials O + + Linux Libertine Initials + + + + Linux Libertine Initials G + + Linux Libertine Initials + + + + Linux Libertine Mono O + + Linux Libertine Mono + + + + Linux Libertine Mono G + + Linux Libertine Mono + + Linux Libertine O Linux Libertine + + Linux Libertine G + + Linux Libertine + + From 02d115b90324693031d87cf80b8693fc0a9a962b Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Fri, 27 Jul 2012 16:28:01 +0900 Subject: [PATCH 30/66] improved more --- ...x-libertine-fonts-biolinum-fontconfig.conf | 16 ++-------- ...-libertine-fonts-libertine-fontconfig.conf | 32 +++---------------- 2 files changed, 6 insertions(+), 42 deletions(-) diff --git a/linux-libertine-fonts-biolinum-fontconfig.conf b/linux-libertine-fonts-biolinum-fontconfig.conf index ca99056..af9fa47 100644 --- a/linux-libertine-fonts-biolinum-fontconfig.conf +++ b/linux-libertine-fonts-biolinum-fontconfig.conf @@ -5,7 +5,7 @@ Linux Biolinum Keyboard O - + Linux Biolinum Keyboard @@ -13,29 +13,17 @@ Linux Biolinum O - + Linux Biolinum - - Linux Biolinum Keyboard O - - Linux Biolinum Keyboard - - Linux Biolinum Keyboard G Linux Biolinum Keyboard - - Linux Biolinum O - - Linux Biolinum - - Linux Biolinum G diff --git a/linux-libertine-fonts-libertine-fontconfig.conf b/linux-libertine-fonts-libertine-fontconfig.conf index acc3240..12ab4a6 100644 --- a/linux-libertine-fonts-libertine-fontconfig.conf +++ b/linux-libertine-fonts-libertine-fontconfig.conf @@ -5,7 +5,7 @@ Linux Libertine Display O - + Linux Libertine Display @@ -13,7 +13,7 @@ Linux Libertine Initials O - + Linux Libertine Initials @@ -21,7 +21,7 @@ Linux Libertine Mono O - + Linux Libertine Mono @@ -29,7 +29,7 @@ Linux Libertine O - + Linux Libertine @@ -41,48 +41,24 @@ - - Linux Libertine Display O - - Linux Libertine Display - - Linux Libertine Display G Linux Libertine Display - - Linux Libertine Initials O - - Linux Libertine Initials - - Linux Libertine Initials G Linux Libertine Initials - - Linux Libertine Mono O - - Linux Libertine Mono - - Linux Libertine Mono G Linux Libertine Mono - - Linux Libertine O - - Linux Libertine - - Linux Libertine G From 61ba3d81f24178d6cee2acf8eca2d82ef53f2157 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 31 Jul 2012 17:02:57 +0900 Subject: [PATCH 31/66] Use OTF version of fonts. --- .gitignore | 1 + linux-libertine-fonts.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 0a2ea16..75928a0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ LinLibertineSRC-4.4.1.tgz /LinLibertineSRC-4.7.5-2.tgz /LinLibertineSRC_5.1.3_2011_06_21.tgz /LinLibertineTTF_5.3.0_2012_07_02.tgz +/LinLibertineOTF_5.3.0_2012_07_02.tgz diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index b4ef9b2..92d3ded 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -14,13 +14,13 @@ proprietary standard fonts. Name: %{fontname}-fonts Version: 5.3.0 -Release: 1.%{posttag}%{?dist} +Release: 2.%{posttag}%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X License: GPLv2+ with exceptions or OFL URL: http://linuxlibertine.sf.net -Source0: http://download.sourceforge.net/sourceforge/linuxlibertine/LinLibertineTTF_%{version}_%{posttag}.tgz +Source0: http://download.sourceforge.net/sourceforge/linuxlibertine/LinLibertineOTF_%{version}_%{posttag}.tgz Source1: %{name}-libertine-fontconfig.conf Source2: %{name}-biolinum-fontconfig.conf Source3: %{name}-libertine-metrics-alias-fontconfig.conf @@ -28,7 +28,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch BuildRequires: fontpackages-devel -BuildRequires: fontforge +#BuildRequires: fontforge Requires: %{name}-common = %{version}-%{release} %description @@ -71,7 +71,7 @@ sed -i -e 's/\r//' OFL-1.1.txt %install rm -fr %{buildroot} install -m 0755 -d %{buildroot}%{_fontdir} -install -m 0644 -p *.ttf %{buildroot}%{_fontdir} +install -m 0644 -p *.otf %{buildroot}%{_fontdir} install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ %{buildroot}%{_fontconfig_confdir} @@ -95,14 +95,17 @@ rm -fr %{buildroot} %defattr(0644, root, root, 0755) %doc Bugs.txt ChangeLog.txt GPL.txt LICENCE.txt OFL-1.1.txt Readme-TEX.txt README -%_font_pkg -f %{fontconf_libertine} LinLibertine*.ttf +%_font_pkg -f %{fontconf_libertine} LinLibertine*.otf %{_fontconfig_templatedir}/%{fontconf_metrics} %{_fontconfig_confdir}/%{fontconf_metrics} -%_font_pkg -n biolinum -f %{fontconf_biolinum} LinBiolinum*.ttf +%_font_pkg -n biolinum -f %{fontconf_biolinum} LinBiolinum*.otf %changelog +* Tue Jul 31 2012 Akira TAGOH - 5.3.0-2.2012_07_02 +- Use OTF version of fonts. + * Tue Jul 24 2012 Akira TAGOH - 5.3.0-1.2012_07_02 - New upstream release. - Giving up to build fonts from the source due to lacking of the build script. diff --git a/sources b/sources index c7dd768..5ade67c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3ff3ede32b0a62e57a62e33783815b70 LinLibertineTTF_5.3.0_2012_07_02.tgz +e859a19401464097ab35226fdea64c3e LinLibertineOTF_5.3.0_2012_07_02.tgz From bce52fb8e01a2648d797025be4707bd5778bac8f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 23:41:21 -0600 Subject: [PATCH 32/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- linux-libertine-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index 92d3ded..875c39c 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -14,7 +14,7 @@ proprietary standard fonts. Name: %{fontname}-fonts Version: 5.3.0 -Release: 2.%{posttag}%{?dist} +Release: 3.%{posttag}%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X @@ -103,6 +103,9 @@ rm -fr %{buildroot} %_font_pkg -n biolinum -f %{fontconf_biolinum} LinBiolinum*.otf %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 5.3.0-3.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Tue Jul 31 2012 Akira TAGOH - 5.3.0-2.2012_07_02 - Use OTF version of fonts. From 87b7566ce5840bec48672f8f75dcaf594643500e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 02:50:37 -0500 Subject: [PATCH 33/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- linux-libertine-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index 875c39c..833d0ed 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -14,7 +14,7 @@ proprietary standard fonts. Name: %{fontname}-fonts Version: 5.3.0 -Release: 3.%{posttag}%{?dist} +Release: 4.%{posttag}%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X @@ -103,6 +103,9 @@ rm -fr %{buildroot} %_font_pkg -n biolinum -f %{fontconf_biolinum} LinBiolinum*.otf %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 5.3.0-4.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Feb 14 2013 Fedora Release Engineering - 5.3.0-3.2012_07_02 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From fe84ac4b879b9aa3cd7e237c499a9562f7825651 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 01:30:38 -0500 Subject: [PATCH 34/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- linux-libertine-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index 833d0ed..ef5a5a8 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -14,7 +14,7 @@ proprietary standard fonts. Name: %{fontname}-fonts Version: 5.3.0 -Release: 4.%{posttag}%{?dist} +Release: 5.%{posttag}%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X @@ -103,6 +103,9 @@ rm -fr %{buildroot} %_font_pkg -n biolinum -f %{fontconf_biolinum} LinBiolinum*.otf %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 5.3.0-5.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Aug 03 2013 Fedora Release Engineering - 5.3.0-4.2012_07_02 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 70e3a96ddc88117e68450431d3352882726be8ff Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Wed, 15 Oct 2014 19:47:46 +0100 Subject: [PATCH 35/66] Add a MetaInfo file for the software center --- biolinum.metainfo.xml | 8 ++++++++ libertine.metainfo.xml | 8 ++++++++ linux-libertine-fonts.spec | 15 ++++++++++++++- 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 biolinum.metainfo.xml create mode 100644 libertine.metainfo.xml diff --git a/biolinum.metainfo.xml b/biolinum.metainfo.xml new file mode 100644 index 0000000..a498183 --- /dev/null +++ b/biolinum.metainfo.xml @@ -0,0 +1,8 @@ + + + + biolinum + CC0-1.0 + Biolinum + Sans-serif fonts from Linux Libertine Open fonts + diff --git a/libertine.metainfo.xml b/libertine.metainfo.xml new file mode 100644 index 0000000..471c056 --- /dev/null +++ b/libertine.metainfo.xml @@ -0,0 +1,8 @@ + + + + libertine + CC0-1.0 + Libertine + Linux Libertine open fonts + diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index ef5a5a8..115c53f 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -14,7 +14,7 @@ proprietary standard fonts. Name: %{fontname}-fonts Version: 5.3.0 -Release: 5.%{posttag}%{?dist} +Release: 6.%{posttag}%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X @@ -24,6 +24,8 @@ Source0: http://download.sourceforge.net/sourceforge/linuxlibertine/LinLi Source1: %{name}-libertine-fontconfig.conf Source2: %{name}-biolinum-fontconfig.conf Source3: %{name}-libertine-metrics-alias-fontconfig.conf +Source4: libertine.metainfo.xml +Source5: biolinum.metainfo.xml BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch @@ -88,6 +90,12 @@ for fconf in %{fontconf_libertine} %{fontconf_metrics} %{fontconf_biolinum}; do %{buildroot}%{_fontconfig_confdir}/$fconf done +# Add AppStream metadata +install -Dm 0644 -p %{SOURCE4} \ + %{buildroot}%{_datadir}/appdata/libertine.metainfo.xml +install -Dm 0644 -p %{SOURCE5} \ + %{buildroot}%{_datadir}/appdata/biolinum.metainfo.xml + %clean rm -fr %{buildroot} @@ -96,13 +104,18 @@ rm -fr %{buildroot} %doc Bugs.txt ChangeLog.txt GPL.txt LICENCE.txt OFL-1.1.txt Readme-TEX.txt README %_font_pkg -f %{fontconf_libertine} LinLibertine*.otf +%{_datadir}/appdata/libertine.metainfo.xml %{_fontconfig_templatedir}/%{fontconf_metrics} %{_fontconfig_confdir}/%{fontconf_metrics} %_font_pkg -n biolinum -f %{fontconf_biolinum} LinBiolinum*.otf +%{_datadir}/appdata/biolinum.metainfo.xml %changelog +* Wed Oct 15 2014 Richard Hughes - 5.3.0-6.2012_07_02 +- Add a MetaInfo file for the software center; this is a font we want to show. + * Sat Jun 07 2014 Fedora Release Engineering - 5.3.0-5.2012_07_02 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 86f8aa13157b58cc82a07bae60b47ee530ac7d1a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 18:21:04 +0000 Subject: [PATCH 36/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- linux-libertine-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index 115c53f..27dc58c 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -14,7 +14,7 @@ proprietary standard fonts. Name: %{fontname}-fonts Version: 5.3.0 -Release: 6.%{posttag}%{?dist} +Release: 7.%{posttag}%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X @@ -113,6 +113,9 @@ rm -fr %{buildroot} %{_datadir}/appdata/biolinum.metainfo.xml %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 5.3.0-7.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed Oct 15 2014 Richard Hughes - 5.3.0-6.2012_07_02 - Add a MetaInfo file for the software center; this is a font we want to show. From 4d456a1e28b94170f66598cf85ad802383a2e93c Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Mon, 4 Jan 2016 16:24:29 +0900 Subject: [PATCH 37/66] Use %global instead of %define. --- linux-libertine-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index 27dc58c..f62057b 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -5,7 +5,7 @@ %global fontconf_biolinum %{prio_biolinum}-%{fontname}-biolinum.conf %global fontconf_metrics 29-%{fontname}-metrics-alias.conf %global archivename LinLibertine -%define posttag 2012_07_02 +%global posttag 2012_07_02 %define common_desc \ The Linux Libertine Open Fonts are a TrueType font family for practical \ @@ -113,6 +113,9 @@ rm -fr %{buildroot} %{_datadir}/appdata/biolinum.metainfo.xml %changelog +* Mon Jan 4 2016 Akira TAGOH +- Use %%global instead of %%define. + * Wed Jun 17 2015 Fedora Release Engineering - 5.3.0-7.2012_07_02 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 6caba494e59d78a6fd6914487e60a7eca4269224 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 04:18:44 +0000 Subject: [PATCH 38/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- linux-libertine-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index f62057b..cbe9197 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -14,7 +14,7 @@ proprietary standard fonts. Name: %{fontname}-fonts Version: 5.3.0 -Release: 7.%{posttag}%{?dist} +Release: 8.%{posttag}%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X @@ -113,6 +113,9 @@ rm -fr %{buildroot} %{_datadir}/appdata/biolinum.metainfo.xml %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 5.3.0-8.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Jan 4 2016 Akira TAGOH - Use %%global instead of %%define. From ef4fb0d126334f58a454b1847fa7a4dfae2eee38 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 19:52:19 +0000 Subject: [PATCH 39/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- linux-libertine-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index cbe9197..2a4f8eb 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -14,7 +14,7 @@ proprietary standard fonts. Name: %{fontname}-fonts Version: 5.3.0 -Release: 8.%{posttag}%{?dist} +Release: 9.%{posttag}%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X @@ -113,6 +113,9 @@ rm -fr %{buildroot} %{_datadir}/appdata/biolinum.metainfo.xml %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 5.3.0-9.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Feb 04 2016 Fedora Release Engineering - 5.3.0-8.2012_07_02 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From bc4b241d0b8475600ec28e613eaa8632a7675e20 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 20:10:49 +0000 Subject: [PATCH 40/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- linux-libertine-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index 2a4f8eb..b0e7d75 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -14,7 +14,7 @@ proprietary standard fonts. Name: %{fontname}-fonts Version: 5.3.0 -Release: 9.%{posttag}%{?dist} +Release: 10.%{posttag}%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X @@ -113,6 +113,9 @@ rm -fr %{buildroot} %{_datadir}/appdata/biolinum.metainfo.xml %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 5.3.0-10.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 5.3.0-9.2012_07_02 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From f90cb4c460b4c51aeeaf18d2e05417f2f8522a54 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 23:58:05 +0000 Subject: [PATCH 41/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- linux-libertine-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index b0e7d75..aa156ca 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -14,7 +14,7 @@ proprietary standard fonts. Name: %{fontname}-fonts Version: 5.3.0 -Release: 10.%{posttag}%{?dist} +Release: 11.%{posttag}%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X @@ -113,6 +113,9 @@ rm -fr %{buildroot} %{_datadir}/appdata/biolinum.metainfo.xml %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 5.3.0-11.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 5.3.0-10.2012_07_02 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 42aa06ad8a341acda3b255ca304ae677ffc6f69f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:45:36 +0100 Subject: [PATCH 42/66] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- linux-libertine-fonts.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index aa156ca..82c6df7 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -26,7 +26,6 @@ Source2: %{name}-biolinum-fontconfig.conf Source3: %{name}-libertine-metrics-alias-fontconfig.conf Source4: libertine.metainfo.xml Source5: biolinum.metainfo.xml -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch BuildRequires: fontpackages-devel From 733dc0dbfb18afd32604fff45a0130eef4a0039c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 09:28:10 +0100 Subject: [PATCH 43/66] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- linux-libertine-fonts.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index 82c6df7..81c2f88 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -95,9 +95,6 @@ install -Dm 0644 -p %{SOURCE4} \ install -Dm 0644 -p %{SOURCE5} \ %{buildroot}%{_datadir}/appdata/biolinum.metainfo.xml -%clean -rm -fr %{buildroot} - %files common %defattr(0644, root, root, 0755) %doc Bugs.txt ChangeLog.txt GPL.txt LICENCE.txt OFL-1.1.txt Readme-TEX.txt README From 2f4280aac88e0d914d76009b3d152fd3f1a9aa77 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Mon, 9 Jul 2018 04:11:16 +0000 Subject: [PATCH 44/66] Modernize the spec file. Fix bogus date in the spec file. --- linux-libertine-fonts.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index 81c2f88..fd97042 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -14,10 +14,9 @@ proprietary standard fonts. Name: %{fontname}-fonts Version: 5.3.0 -Release: 11.%{posttag}%{?dist} +Release: 12.%{posttag}%{?dist} Summary: Linux Libertine Open Fonts -Group: User Interface/X License: GPLv2+ with exceptions or OFL URL: http://linuxlibertine.sf.net Source0: http://download.sourceforge.net/sourceforge/linuxlibertine/LinLibertineOTF_%{version}_%{posttag}.tgz @@ -40,7 +39,6 @@ This package contains Serif fonts. %package -n %{fontname}-biolinum-fonts Summary: Sans-serif fonts from Linux Libertine Open Fonts Requires: %{name}-common = %{version}-%{release} -Group: User Interface/X %description -n %{fontname}-biolinum-fonts %common_desc @@ -50,7 +48,6 @@ This package contains Sans fonts. %package common Summary: Common files for Linux Libertine Open Fonts Requires: fontpackages-filesystem -Group: User Interface/X %description common %common_desc @@ -70,7 +67,6 @@ sed -i -e 's/\r//' OFL-1.1.txt #mv scripts/*.ttf . %install -rm -fr %{buildroot} install -m 0755 -d %{buildroot}%{_fontdir} install -m 0644 -p *.otf %{buildroot}%{_fontdir} @@ -96,8 +92,8 @@ install -Dm 0644 -p %{SOURCE5} \ %{buildroot}%{_datadir}/appdata/biolinum.metainfo.xml %files common -%defattr(0644, root, root, 0755) -%doc Bugs.txt ChangeLog.txt GPL.txt LICENCE.txt OFL-1.1.txt Readme-TEX.txt README +%license GPL.txt LICENCE.txt OFL-1.1.txt +%doc Bugs.txt ChangeLog.txt Readme-TEX.txt README %_font_pkg -f %{fontconf_libertine} LinLibertine*.otf %{_datadir}/appdata/libertine.metainfo.xml @@ -109,6 +105,10 @@ install -Dm 0644 -p %{SOURCE5} \ %{_datadir}/appdata/biolinum.metainfo.xml %changelog +* Mon Jul 09 2018 Akira TAGOH - 5.3.0-12.2012_07_02 +- Modernize the spec file. +- Fix bogus date in the spec file. + * Wed Feb 07 2018 Fedora Release Engineering - 5.3.0-11.2012_07_02 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild @@ -198,7 +198,7 @@ install -Dm 0644 -p %{SOURCE5} \ - Updated to 2.4.9 - Reenabled generation of PDF files -* Tue Oct 01 2006 Frank Arnold 2.2.0-1 +* Sun Oct 01 2006 Frank Arnold 2.2.0-1 - Updated to 2.2.0 - Removed ghosted cache file as it's no longer stored in tree - Disabled generation of PDF files because fontforge will segfault @@ -216,7 +216,7 @@ install -Dm 0644 -p %{SOURCE5} \ * Tue Feb 28 2006 Frank Arnold 2.0.4-2 - Named back to linux-libertine-fonts -* Wed Feb 13 2006 Frank Arnold 2.0.4-1 +* Mon Feb 13 2006 Frank Arnold 2.0.4-1 - Updated to 2.0.4 - Removed handling of fonts.cache-2 From e4fb221526e10ec715ec6bea812dd778131e2965 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 09:14:02 +0000 Subject: [PATCH 45/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- linux-libertine-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index fd97042..6c21f1e 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -14,7 +14,7 @@ proprietary standard fonts. Name: %{fontname}-fonts Version: 5.3.0 -Release: 12.%{posttag}%{?dist} +Release: 13.%{posttag}%{?dist} Summary: Linux Libertine Open Fonts License: GPLv2+ with exceptions or OFL @@ -105,6 +105,9 @@ install -Dm 0644 -p %{SOURCE5} \ %{_datadir}/appdata/biolinum.metainfo.xml %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 5.3.0-13.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Jul 09 2018 Akira TAGOH - 5.3.0-12.2012_07_02 - Modernize the spec file. - Fix bogus date in the spec file. From e2af8509c73fa894c3afa9f4fe8e78af558c3f67 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 08:48:41 +0000 Subject: [PATCH 46/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- linux-libertine-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index 6c21f1e..10684ed 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -14,7 +14,7 @@ proprietary standard fonts. Name: %{fontname}-fonts Version: 5.3.0 -Release: 13.%{posttag}%{?dist} +Release: 14.%{posttag}%{?dist} Summary: Linux Libertine Open Fonts License: GPLv2+ with exceptions or OFL @@ -105,6 +105,9 @@ install -Dm 0644 -p %{SOURCE5} \ %{_datadir}/appdata/biolinum.metainfo.xml %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 5.3.0-14.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 5.3.0-13.2012_07_02 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 5d71b7bee5845038671136e33280e47ab448187d Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 21 May 2019 09:42:59 +0000 Subject: [PATCH 47/66] Add simple priority list rules --- linux-libertine-fonts-biolinum-fontconfig.conf | 6 ++++++ linux-libertine-fonts-libertine-fontconfig.conf | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/linux-libertine-fonts-biolinum-fontconfig.conf b/linux-libertine-fonts-biolinum-fontconfig.conf index af9fa47..de0e296 100644 --- a/linux-libertine-fonts-biolinum-fontconfig.conf +++ b/linux-libertine-fonts-biolinum-fontconfig.conf @@ -37,5 +37,11 @@ sans-serif + + sans-serif + + Linux Biolinum + + diff --git a/linux-libertine-fonts-libertine-fontconfig.conf b/linux-libertine-fonts-libertine-fontconfig.conf index 12ab4a6..55878be 100644 --- a/linux-libertine-fonts-libertine-fontconfig.conf +++ b/linux-libertine-fonts-libertine-fontconfig.conf @@ -40,6 +40,12 @@ serif + + serif + + Linux Libertine + + Linux Libertine Display G From 0772477231ddbe489ee3cf2c485188bf94805b39 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 21 May 2019 09:43:39 +0000 Subject: [PATCH 48/66] Add CI tests --- .gitignore | 2 + .../roles/custom-test-fonts/defaults/main.yml | 7 + .../custom-test-fonts/files/run-family-test | 152 +++++++++++++++++ .../files/run-lang-coverage-test | 155 ++++++++++++++++++ tests/roles/custom-test-fonts/meta/main.yml | 4 + tests/roles/custom-test-fonts/tasks/main.yml | 39 +++++ tests/tests.yml | 20 +++ 7 files changed, 379 insertions(+) create mode 100644 tests/roles/custom-test-fonts/defaults/main.yml create mode 100755 tests/roles/custom-test-fonts/files/run-family-test create mode 100755 tests/roles/custom-test-fonts/files/run-lang-coverage-test create mode 100644 tests/roles/custom-test-fonts/meta/main.yml create mode 100644 tests/roles/custom-test-fonts/tasks/main.yml create mode 100644 tests/tests.yml diff --git a/.gitignore b/.gitignore index 75928a0..db02bbf 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ LinLibertineSRC-4.4.1.tgz /LinLibertineSRC_5.1.3_2011_06_21.tgz /LinLibertineTTF_5.3.0_2012_07_02.tgz /LinLibertineOTF_5.3.0_2012_07_02.tgz +/tests/artifacts +*~ diff --git a/tests/roles/custom-test-fonts/defaults/main.yml b/tests/roles/custom-test-fonts/defaults/main.yml new file mode 100644 index 0000000..fe09145 --- /dev/null +++ b/tests/roles/custom-test-fonts/defaults/main.yml @@ -0,0 +1,7 @@ +--- + +role_pkgs_req: + - fontconfig + - fontconfig-devel + - pkg-config + - rsync diff --git a/tests/roles/custom-test-fonts/files/run-family-test b/tests/roles/custom-test-fonts/files/run-family-test new file mode 100755 index 0000000..9b5cc2c --- /dev/null +++ b/tests/roles/custom-test-fonts/files/run-family-test @@ -0,0 +1,152 @@ +#! /bin/bash -efu + +debug() { + if [ -n "$DEBUG" ]; then + echo "$*" >&2 + fi +} + +msg_usage() { + cat <<_EOF_ +Run family test. + +Usage: +$PROG + +Options: +-h, --help Display this help and exit +-v, --verbose Turn on debug +-l, --lang=LANG Test LANG language coverage (default: en) +-f, --family=FILE Set a family name supposed to be assigned for alias. +-g, --alias=STR Set an alias name. (default: sans-serif) +-a, --artifactsdir=DIR Set environment dir to store artifacts +-k, --package=NAME Set a package name for fonts. +_EOF_ +} + +PROG="${PROG:-${0##*/}}" +DEBUG="${DEBUG:-}" +OPT_LANG="${OPT_LANG:-en}" +OPT_FAMILY="${OPT_FAMILY:-}" +OPT_ARTIFACTS_DIR="${OPT_ARTIFACTS_DIR:-}" +OPT_ALIAS="${OPT_ALIAS:-sans-serif}" +OPT_PACKAGE="${OPT_PACKAGE:-}" + +opt=$(getopt -n "$0" --options "hvl:f:t:a:g:k:" --longoptions "help,verbose,lang:,family:,test:,artifactsdir:,alias:,package:" -- "$@") +eval set -- "$opt" +while [[ $# -gt 0 ]]; do + case "$1" in + -k|--package) + OPT_PACKAGE="$2" + shift 2 + ;; + -g|--alias) + OPT_ALIAS="$2" + shift 2 + ;; + -a|--artifactsdir) + OPT_ARTIFACTS_DIR="$2" + shift 2 + ;; + -f|--family) + OPT_FAMILY="$2" + shift 2 + ;; + -l|--lang) + OPT_LANG="$2" + shift 2 + ;; + -v|--verbose) + DEBUG="-v" + shift + ;; + -h|--help) + msg_usage + exit 0 + ;; + --) + shift + ;; + *) + msg_usage + exit 1 + esac +done + +if [ -z "$OPT_ARTIFACTS_DIR" ] || [ -z "$OPT_LANG" ] || [ -z "$OPT_FAMILY" ]; then + echo "Use: $PROG -h for help." + exit 0 +fi + +debug "Alias: $OPT_ALIAS" +debug "Family: $OPT_FAMILY" +debug "Lang: $OPT_LANG" +debug "Artifacts dir: $OPT_ARTIFACTS_DIR" +debug "Package name: $OPT_PACKAGE" +STR_TEST_DASHED=$(echo "$OPT_ALIAS" | sed -e 's/\//-/g' -e 's/ /-/g') + +clean_exit() { + rc=$?; + trap - SIGINT SIGTERM SIGABRT EXIT + echo "Run test $OPT_ALIAS: done." + for pid in $(ps -o pid --no-headers --ppid $$); do + if [ -n "$(ps -p $pid -o pid=)" ]; then + kill -s HUP $pid + fi + done + local log_file_name="$STR_TEST_DASHED.log" + local log_file_path="$OPT_ARTIFACTS_DIR/$log_file_name" + local status + if [[ $rc -eq 127 ]]; then + status="ERROR" + elif grep -q "RESULT: WARN" "$log_file_path"; then + status="ERROR" + elif grep -q "RESULT: FAIL" "$log_file_path"; then + status="FAIL" + elif grep -q "RESULT: PASS" "$log_file_path"; then + status="PASS" + elif grep -q "FAIL" "$log_file_path"; then + status="FAIL" + elif grep -q "PASS" "$log_file_path"; then + status="PASS" + else + status="ERROR" + fi + echo "$status $OPT_ALIAS" >> "$OPT_ARTIFACTS_DIR/test.log" + mv "$log_file_path" "$OPT_ARTIFACTS_DIR/${status}_${log_file_name}" + local results="$OPT_ARTIFACTS_DIR/results.yml" + local result=$(echo $status | tr '[:upper:]' '[:lower:]') + test -f "$results" || echo 'results:' > "$results" + echo "- {result: $result, test: $OPT_ALIAS}" >> "$results" + exit 0 +} +trap clean_exit SIGINT SIGTERM SIGABRT EXIT + +cachedir=`pkg-config --variable cachedir fontconfig` +tmpconfd=`mktemp --tmpdir -d fontsci.XXXXXXXX` +conf=$(for i in `rpm -ql $OPT_PACKAGE | grep conf.d`; do + echo "$i" +done) +cat <<_EOF_> $tmpconfd/fonts.conf + + /usr/share/fonts + $conf + $cachedir + +_EOF_ +debug "Config: `cat $tmpconfd/fonts.conf`" + +mkdir -p "$OPT_ARTIFACTS_DIR" +export OUTPUTFILE="$(realpath "$OPT_ARTIFACTS_DIR")/$STR_TEST_DASHED-out.log" +logfile_stdout="$OPT_ARTIFACTS_DIR/$STR_TEST_DASHED.log" +logfile_stderr="$OPT_ARTIFACTS_DIR/$STR_TEST_DASHED-err.log" +exec 3>&1 4>&2 1> >(tee -a "$logfile_stdout" >&3) 2> >(tee -a "$logfile_stderr" >&4) + +debug "Check family assignment" +res=`FONTCONFIG_FILE=$tmpconfd/fonts.conf fc-match -f "%{family[0]}" :family=$OPT_ALIAS:lang=$OPT_LANG` +if [ "x$res" = "x$OPT_FAMILY" ]; then + echo "RESULT: PASS: $OPT_FAMILY was assigned to $OPT_ALIAS as expected" +else + echo "RESULT: FAIL: $OPT_FAMILY wasn't assigned to $OPT_ALIAS (actual result: $res)" +fi +rm -rf $tmpconfd diff --git a/tests/roles/custom-test-fonts/files/run-lang-coverage-test b/tests/roles/custom-test-fonts/files/run-lang-coverage-test new file mode 100755 index 0000000..cc102b2 --- /dev/null +++ b/tests/roles/custom-test-fonts/files/run-lang-coverage-test @@ -0,0 +1,155 @@ +#! /bin/bash -efu + +debug() { + if [ -n "$DEBUG" ]; then + echo "$*" >&2 + fi +} + +msg_usage() { + cat <<_EOF_ +Run language coverage test. + +Usage: +$PROG + +Options: +-h, --help Display this help and exit +-v, --verbose Turn on debug +-l, --lang=LANG Test LANG language coverage (default: en) +-p, --path=PATH Test fonts on PATH +-a, --artifactsdir=DIR test environment dir to store artifacts +-i, --ignore=FILE Ignore FILE to check. +_EOF_ +} + +PROG="${PROG:-${0##*/}}" +DEBUG="${DEBUG:-}" +OPT_LANG="${OPT_LANG:-en}" +OPT_PATH="${OPT_PATH:-}" +OPT_ARTIFACTS_DIR="${OPT_ARTIFACTS_DIR:-}" +OPT_IGNORE=() + +opt=$(getopt -n "$0" --options "hvl:p:t:a:i:" --longoptions "help,verbose,lang:,path:,test:,artifactsdir:,ignore:" -- "$@") +eval set -- "$opt" +while [[ $# -gt 0 ]]; do + case "$1" in + -i|--ignore) + OPT_IGNORE+=("$2") + shift 2 + ;; + -a|--artifactsdir) + OPT_ARTIFACTS_DIR="$2" + shift 2 + ;; + -p|--path) + OPT_PATH="$2" + shift 2 + ;; + -l|--lang) + OPT_LANG="$2" + shift 2 + ;; + -v|--verbose) + DEBUG="-v" + shift + ;; + -h|--help) + msg_usage + exit 0 + ;; + --) + shift + ;; + *) + msg_usage + exit 1 + esac +done + +if [ -z "$OPT_ARTIFACTS_DIR" ] || [ -z "$OPT_LANG" ] || [ -z "$OPT_PATH" ]; then + echo "Use: $PROG -h for help." + exit 0 +fi + +debug "Path: $OPT_PATH" +debug "Lang: $OPT_LANG" +debug "Artifacts dir: $OPT_ARTIFACTS_DIR" +debug "Ignore: ${OPT_IGNORE[@]}" +STR_TEST_DASHED=$(echo "$OPT_PATH" | sed -e 's/\//-/g') + +clean_exit() { + rc=$?; + trap - SIGINT SIGTERM SIGABRT EXIT + echo "Run test $OPT_PATH: done." + for pid in $(ps -o pid --no-headers --ppid $$); do + if [ -n "$(ps -p $pid -o pid=)" ]; then + kill -s HUP $pid + fi + done + local log_file_name="$STR_TEST_DASHED.log" + local log_file_path="$OPT_ARTIFACTS_DIR/$log_file_name" + local status + if [[ $rc -eq 127 ]]; then + status="ERROR" + elif grep -q "RESULT: WARN" "$log_file_path"; then + status="ERROR" + elif grep -q "RESULT: FAIL" "$log_file_path"; then + status="FAIL" + elif grep -q "RESULT: PASS" "$log_file_path"; then + status="PASS" + elif grep -q "FAIL" "$log_file_path"; then + status="FAIL" + elif grep -q "PASS" "$log_file_path"; then + status="PASS" + else + status="ERROR" + fi + echo "$status $OPT_PATH" >> "$OPT_ARTIFACTS_DIR/test.log" + mv "$log_file_path" "$OPT_ARTIFACTS_DIR/${status}_${log_file_name}" + local results="$OPT_ARTIFACTS_DIR/results.yml" + local result=$(echo $status | tr '[:upper:]' '[:lower:]') + test -f "$results" || echo 'results:' > "$results" + echo "- {result: $result, test: $OPT_PATH}" >> "$results" + exit 0 +} +trap clean_exit SIGINT SIGTERM SIGABRT EXIT + +mkdir -p "$OPT_ARTIFACTS_DIR" +export OUTPUTFILE="$(realpath "$OPT_ARTIFACTS_DIR")/$STR_TEST_DASHED-out.log" +logfile_stdout="$OPT_ARTIFACTS_DIR/$STR_TEST_DASHED.log" +logfile_stderr="$OPT_ARTIFACTS_DIR/$STR_TEST_DASHED-err.log" +exec 3>&1 4>&2 1> >(tee -a "$logfile_stdout" >&3) 2> >(tee -a "$logfile_stderr" >&4) + +contains() { + local e match="$1" + shift + for e; do [[ "$e" == "$match" ]] && return 1; done + return 0 +} + +debug "Check language coverage" +set +f +for i in `find $OPT_PATH -regex '.*/*\.\(t1\)?\(ttf\)?\(otf\)?\(ttc\)?'`; do + set -f + echo $i + if test -f $i; then + n=`basename $i` + set +e + contains "$n" "${OPT_IGNORE[@]}" + ret=$? + set -e + if [ $ret -eq 1 ]; then + debug "ignoring $i" + continue + fi + debug " $i" + res=`fc-validate -l $OPT_LANG $i` + if echo $res | grep -q Missing; then + echo "RESULT: FAIL: $i doesn't satisfy $OPT_LANG language coverage." + else + echo "RESULT: PASS: $i satisfy $OPT_LANG language coverage." + fi + fi +done + diff --git a/tests/roles/custom-test-fonts/meta/main.yml b/tests/roles/custom-test-fonts/meta/main.yml new file mode 100644 index 0000000..f6d273c --- /dev/null +++ b/tests/roles/custom-test-fonts/meta/main.yml @@ -0,0 +1,4 @@ +--- + +dependencies: + - role: str-common-init diff --git a/tests/roles/custom-test-fonts/tasks/main.yml b/tests/roles/custom-test-fonts/tasks/main.yml new file mode 100644 index 0000000..ba5c768 --- /dev/null +++ b/tests/roles/custom-test-fonts/tasks/main.yml @@ -0,0 +1,39 @@ +--- + +- block: + - name: language coverage + script: run-lang-coverage-test --lang "{{ item }}" --path "{{ path_prefix }}" --artifactsdir "{{ remote_artifacts }}" {{ "" if coverage.values is not defined and coverage[item].ignore is not defined else "--ignore " + (coverage[item].ignore | join('--ignore ')) }} + with_items: + - "{{ coverage if coverage.keys is not defined else coverage.keys()|list }}" + - name: generic family assignment + script: run-family-test --lang {{ item.lang }} --family '{{ item.family }}' --alias {{ item.alias }} --artifactsdir {{ remote_artifacts }} --package {{ package if item.package is not defined else item.package }} + with_items: + - "{{ families }}" + + - name: Check the results + shell: | + log="{{ remote_artifacts }}/test.log" + if [ ! -f "$log" ]; then + echo ERROR + echo "Test results not found." 1>&2 + elif grep ^ERROR "$log" 1>&2; then + echo ERROR + elif grep ^FAIL "$log" 1>&2; then + echo FAIL + elif grep -q ^PASS "$log"; then + echo PASS + else + echo ERROR + echo "No test results found." 1>&2 + fi + register: test_results + + - name: Set role result + set_fact: + role_result: "{{ test_results.stdout }}" + role_message: "{{ test_results.stderr|d('test execution error.') }}" + role_result_failed: "{{ test_results.stdout != 'PASS' }}" + role_result_msg: "{{ test_results.stderr|d('test execution error.') }}" + + - include_role: + name: str-common-final diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..2176b3e --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,20 @@ +- hosts: localhost + tags: + - classic + roles: + - role: custom-test-fonts + required_packages: + - linux-libertine-fonts + - linux-libertine-biolinum-fonts + path_prefix: /usr/share/fonts/linux-libertine + coverage: + - en + families: + - lang: en + alias: serif + family: Linux Libertine O + package: linux-libertine-fonts + - lang: en + alias: sans-serif + family: Linux Biolinum O + package: linux-libertine-biolinum-fonts From 80f5d65d1b0c2e3bd29f2b35a58a745dc7933758 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Wed, 22 May 2019 09:24:52 +0000 Subject: [PATCH 49/66] Fix a condition in role of CI tests --- tests/roles/custom-test-fonts/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/roles/custom-test-fonts/tasks/main.yml b/tests/roles/custom-test-fonts/tasks/main.yml index ba5c768..2f5f799 100644 --- a/tests/roles/custom-test-fonts/tasks/main.yml +++ b/tests/roles/custom-test-fonts/tasks/main.yml @@ -2,7 +2,7 @@ - block: - name: language coverage - script: run-lang-coverage-test --lang "{{ item }}" --path "{{ path_prefix }}" --artifactsdir "{{ remote_artifacts }}" {{ "" if coverage.values is not defined and coverage[item].ignore is not defined else "--ignore " + (coverage[item].ignore | join('--ignore ')) }} + script: run-lang-coverage-test --lang "{{ item }}" --path "{{ path_prefix }}" --artifactsdir "{{ remote_artifacts }}" {{ "" if coverage.values is not defined or coverage[item].ignore is not defined else "--ignore " + (coverage[item].ignore | join('--ignore ')) }} with_items: - "{{ coverage if coverage.keys is not defined else coverage.keys()|list }}" - name: generic family assignment From c0a402d955eca6abd2cb117b79fafc26a74cd1b1 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Thu, 23 May 2019 09:44:56 +0000 Subject: [PATCH 50/66] Update some fixes --- tests/roles/custom-test-fonts/files/run-family-test | 3 ++- tests/roles/custom-test-fonts/files/run-lang-coverage-test | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/roles/custom-test-fonts/files/run-family-test b/tests/roles/custom-test-fonts/files/run-family-test index 9b5cc2c..e87cad0 100755 --- a/tests/roles/custom-test-fonts/files/run-family-test +++ b/tests/roles/custom-test-fonts/files/run-family-test @@ -83,7 +83,8 @@ debug "Family: $OPT_FAMILY" debug "Lang: $OPT_LANG" debug "Artifacts dir: $OPT_ARTIFACTS_DIR" debug "Package name: $OPT_PACKAGE" -STR_TEST_DASHED=$(echo "$OPT_ALIAS" | sed -e 's/\//-/g' -e 's/ /-/g') +STR_TEST_DASHED=$(echo "${OPT_PACKAGE}_${OPT_ALIAS}" | sed -e 's/\//-/g' -e 's/ /-/g') +debug "Log file: $STR_TEST_DASHED.log" clean_exit() { rc=$?; diff --git a/tests/roles/custom-test-fonts/files/run-lang-coverage-test b/tests/roles/custom-test-fonts/files/run-lang-coverage-test index cc102b2..c7823cb 100755 --- a/tests/roles/custom-test-fonts/files/run-lang-coverage-test +++ b/tests/roles/custom-test-fonts/files/run-lang-coverage-test @@ -130,9 +130,9 @@ contains() { debug "Check language coverage" set +f -for i in `find $OPT_PATH -regex '.*/*\.\(t1\)?\(ttf\)?\(otf\)?\(ttc\)?'`; do - set -f - echo $i +for i in `find $OPT_PATH -regex '.*/*\.\(t1\)?\(ttf\)?\(otf\)?\(ttc\)?\(pcf.*\)?'`; do +set -f + debug "$i" if test -f $i; then n=`basename $i` set +e From c528456077e22d58550bc243dd301a9874d65e16 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Fri, 24 May 2019 06:51:36 +0000 Subject: [PATCH 51/66] Update some fixes --- .../files/run-lang-coverage-test | 29 ++++++++++++++----- tests/roles/custom-test-fonts/tasks/main.yml | 2 +- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/tests/roles/custom-test-fonts/files/run-lang-coverage-test b/tests/roles/custom-test-fonts/files/run-lang-coverage-test index c7823cb..5658cfd 100755 --- a/tests/roles/custom-test-fonts/files/run-lang-coverage-test +++ b/tests/roles/custom-test-fonts/files/run-lang-coverage-test @@ -19,7 +19,8 @@ Options: -l, --lang=LANG Test LANG language coverage (default: en) -p, --path=PATH Test fonts on PATH -a, --artifactsdir=DIR test environment dir to store artifacts --i, --ignore=FILE Ignore FILE to check. +-e, --exclude=FILE Exclude FILE to check. +-i, --include=FILE Include File to check. _EOF_ } @@ -28,14 +29,19 @@ DEBUG="${DEBUG:-}" OPT_LANG="${OPT_LANG:-en}" OPT_PATH="${OPT_PATH:-}" OPT_ARTIFACTS_DIR="${OPT_ARTIFACTS_DIR:-}" -OPT_IGNORE=() +OPT_EXCLUDE=() +OPT_INCLUDE=() -opt=$(getopt -n "$0" --options "hvl:p:t:a:i:" --longoptions "help,verbose,lang:,path:,test:,artifactsdir:,ignore:" -- "$@") +opt=$(getopt -n "$0" --options "hvl:p:t:a:e:i:" --longoptions "help,verbose,lang:,path:,test:,artifactsdir:,exclude:,include:" -- "$@") eval set -- "$opt" while [[ $# -gt 0 ]]; do case "$1" in - -i|--ignore) - OPT_IGNORE+=("$2") + -i|--include) + OPT_INCLUDE+=("$2") + shift 2 + ;; + -e|--exclude) + OPT_EXCLUDE+=("$2") shift 2 ;; -a|--artifactsdir) @@ -75,7 +81,8 @@ fi debug "Path: $OPT_PATH" debug "Lang: $OPT_LANG" debug "Artifacts dir: $OPT_ARTIFACTS_DIR" -debug "Ignore: ${OPT_IGNORE[@]}" +debug "Exclude: ${OPT_EXCLUDE[@]}" +debug "Include: ${OPT_INCLUDE[@]}" STR_TEST_DASHED=$(echo "$OPT_PATH" | sed -e 's/\//-/g') clean_exit() { @@ -136,13 +143,21 @@ set -f if test -f $i; then n=`basename $i` set +e - contains "$n" "${OPT_IGNORE[@]}" + contains "$n" "${OPT_EXCLUDE[@]}" ret=$? set -e if [ $ret -eq 1 ]; then debug "ignoring $i" continue fi + set +e + contains "$n" "${OPT_INCLUDE[@]}" + ret=$? + set -e + if [ $ret -eq 0 ]; then + debug "$i isn't targeted file" + continue + fi debug " $i" res=`fc-validate -l $OPT_LANG $i` if echo $res | grep -q Missing; then diff --git a/tests/roles/custom-test-fonts/tasks/main.yml b/tests/roles/custom-test-fonts/tasks/main.yml index 2f5f799..44830cb 100644 --- a/tests/roles/custom-test-fonts/tasks/main.yml +++ b/tests/roles/custom-test-fonts/tasks/main.yml @@ -2,7 +2,7 @@ - block: - name: language coverage - script: run-lang-coverage-test --lang "{{ item }}" --path "{{ path_prefix }}" --artifactsdir "{{ remote_artifacts }}" {{ "" if coverage.values is not defined or coverage[item].ignore is not defined else "--ignore " + (coverage[item].ignore | join('--ignore ')) }} + script: run-lang-coverage-test --lang "{{ item }}" --path "{{ path_prefix }}" --artifactsdir "{{ remote_artifacts }}" {{ "" if coverage.values is not defined or coverage[item].ignore is not defined else "--exclude " + (coverage[item].ignore | join('--exclude ')) }} {{ "" if coverage.values is not defined or coverage[item].include is not defined else "--include " + (coverage[item].include | join('--include ')) }} with_items: - "{{ coverage if coverage.keys is not defined else coverage.keys()|list }}" - name: generic family assignment From 797164cb81b93c11395ac75083805cecade27de0 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Fri, 24 May 2019 07:24:42 +0000 Subject: [PATCH 52/66] Update some fixes --- .../files/run-lang-coverage-test | 28 ++++++++++++------- tests/roles/custom-test-fonts/tasks/main.yml | 2 +- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/tests/roles/custom-test-fonts/files/run-lang-coverage-test b/tests/roles/custom-test-fonts/files/run-lang-coverage-test index 5658cfd..1c91cf6 100755 --- a/tests/roles/custom-test-fonts/files/run-lang-coverage-test +++ b/tests/roles/custom-test-fonts/files/run-lang-coverage-test @@ -18,6 +18,7 @@ Options: -v, --verbose Turn on debug -l, --lang=LANG Test LANG language coverage (default: en) -p, --path=PATH Test fonts on PATH +-n, --name=NAME Set NAME to store a log file. -a, --artifactsdir=DIR test environment dir to store artifacts -e, --exclude=FILE Exclude FILE to check. -i, --include=FILE Include File to check. @@ -31,11 +32,16 @@ OPT_PATH="${OPT_PATH:-}" OPT_ARTIFACTS_DIR="${OPT_ARTIFACTS_DIR:-}" OPT_EXCLUDE=() OPT_INCLUDE=() +OPT_NAME="${OPT_NAME:-}" -opt=$(getopt -n "$0" --options "hvl:p:t:a:e:i:" --longoptions "help,verbose,lang:,path:,test:,artifactsdir:,exclude:,include:" -- "$@") +opt=$(getopt -n "$0" --options "hvl:p:n:a:e:i:" --longoptions "help,verbose,lang:,path:,name:,artifactsdir:,exclude:,include:" -- "$@") eval set -- "$opt" while [[ $# -gt 0 ]]; do case "$1" in + -n|--name) + OPT_NAME="$2" + shift 2 + ;; -i|--include) OPT_INCLUDE+=("$2") shift 2 @@ -83,7 +89,7 @@ debug "Lang: $OPT_LANG" debug "Artifacts dir: $OPT_ARTIFACTS_DIR" debug "Exclude: ${OPT_EXCLUDE[@]}" debug "Include: ${OPT_INCLUDE[@]}" -STR_TEST_DASHED=$(echo "$OPT_PATH" | sed -e 's/\//-/g') +STR_TEST_DASHED=$(echo "${OPT_NAME:-${OPT_LANG}_${OPT_PATH}}" | sed -e 's/\//-/g') clean_exit() { rc=$?; @@ -137,7 +143,7 @@ contains() { debug "Check language coverage" set +f -for i in `find $OPT_PATH -regex '.*/*\.\(t1\)?\(ttf\)?\(otf\)?\(ttc\)?\(pcf.*\)?'`; do +for i in `find $OPT_PATH -regex '.*/*\.\(t1\)?\(ttf\)?\(otf\)?\(ttc\)?\(pcf.*\)?\(pfa\)?'`; do set -f debug "$i" if test -f $i; then @@ -150,13 +156,15 @@ set -f debug "ignoring $i" continue fi - set +e - contains "$n" "${OPT_INCLUDE[@]}" - ret=$? - set -e - if [ $ret -eq 0 ]; then - debug "$i isn't targeted file" - continue + if [ ${#OPT_INCLUDE[@]} -ne 0 ]; then + set +e + contains "$n" "${OPT_INCLUDE[@]}" + ret=$? + set -e + if [ $ret -eq 0 ]; then + debug "$i isn't targeted file" + continue + fi fi debug " $i" res=`fc-validate -l $OPT_LANG $i` diff --git a/tests/roles/custom-test-fonts/tasks/main.yml b/tests/roles/custom-test-fonts/tasks/main.yml index 44830cb..f4c4ce0 100644 --- a/tests/roles/custom-test-fonts/tasks/main.yml +++ b/tests/roles/custom-test-fonts/tasks/main.yml @@ -2,7 +2,7 @@ - block: - name: language coverage - script: run-lang-coverage-test --lang "{{ item }}" --path "{{ path_prefix }}" --artifactsdir "{{ remote_artifacts }}" {{ "" if coverage.values is not defined or coverage[item].ignore is not defined else "--exclude " + (coverage[item].ignore | join('--exclude ')) }} {{ "" if coverage.values is not defined or coverage[item].include is not defined else "--include " + (coverage[item].include | join('--include ')) }} + script: run-lang-coverage-test --lang "{{ item }}" --path "{{ path_prefix }}" --artifactsdir "{{ remote_artifacts }}" {{ "" if coverage.values is not defined or coverage[item].name is not defined else "--name " + coverage[item].name }} {{ "" if coverage.values is not defined or coverage[item].exclude is not defined else "--exclude " + (coverage[item].exclude | join('--exclude ')) }} {{ "" if coverage.values is not defined or coverage[item].include is not defined else "--include " + (coverage[item].include | join('--include ')) }} with_items: - "{{ coverage if coverage.keys is not defined else coverage.keys()|list }}" - name: generic family assignment From cffe05a60e6718c7a4f4fbc78f4471f2ce526f3a Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Fri, 24 May 2019 11:16:31 +0000 Subject: [PATCH 53/66] Update some fixes --- .../files/run-lang-coverage-test | 19 +++++++++++++++++++ tests/roles/custom-test-fonts/tasks/main.yml | 3 ++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/tests/roles/custom-test-fonts/files/run-lang-coverage-test b/tests/roles/custom-test-fonts/files/run-lang-coverage-test index 1c91cf6..81fefa8 100755 --- a/tests/roles/custom-test-fonts/files/run-lang-coverage-test +++ b/tests/roles/custom-test-fonts/files/run-lang-coverage-test @@ -84,6 +84,25 @@ if [ -z "$OPT_ARTIFACTS_DIR" ] || [ -z "$OPT_LANG" ] || [ -z "$OPT_PATH" ]; then exit 0 fi +expand_regex() { + local e ret=() + local path="$1" + shift + (cd $path; + for e; do + debug "$e" + set +f + local x=$(find -regextype posix-egrep -regex "./$e" -print|sed -e 's,^\./,,g') + ret+=($x) + set -f + echo ${ret[@]} + done) + echo ${ret[@]} +} + +OPT_INCLUDE=($(expand_regex $OPT_PATH ${OPT_INCLUDE[@]})) +OPT_EXCLUDE=($(expand_regex $OPT_PATH ${OPT_EXCLUDE[@]})) + debug "Path: $OPT_PATH" debug "Lang: $OPT_LANG" debug "Artifacts dir: $OPT_ARTIFACTS_DIR" diff --git a/tests/roles/custom-test-fonts/tasks/main.yml b/tests/roles/custom-test-fonts/tasks/main.yml index f4c4ce0..981d3aa 100644 --- a/tests/roles/custom-test-fonts/tasks/main.yml +++ b/tests/roles/custom-test-fonts/tasks/main.yml @@ -2,10 +2,11 @@ - block: - name: language coverage - script: run-lang-coverage-test --lang "{{ item }}" --path "{{ path_prefix }}" --artifactsdir "{{ remote_artifacts }}" {{ "" if coverage.values is not defined or coverage[item].name is not defined else "--name " + coverage[item].name }} {{ "" if coverage.values is not defined or coverage[item].exclude is not defined else "--exclude " + (coverage[item].exclude | join('--exclude ')) }} {{ "" if coverage.values is not defined or coverage[item].include is not defined else "--include " + (coverage[item].include | join('--include ')) }} + script: run-lang-coverage-test --lang "{{ item }}" --path "{{ path_prefix }}" --artifactsdir "{{ remote_artifacts }}" {{ "" if coverage.values is not defined or coverage[item].name is not defined else "--name " + coverage[item].name }} {{ "" if coverage.values is not defined or coverage[item].exclude is not defined else '--exclude "' + (coverage[item].exclude | join('" --exclude "')) + '"'}} {{ "" if coverage.values is not defined or coverage[item].include is not defined else '--include "' + (coverage[item].include | join('" --include "')) + '"'}} with_items: - "{{ coverage if coverage.keys is not defined else coverage.keys()|list }}" - name: generic family assignment + when: families is defined script: run-family-test --lang {{ item.lang }} --family '{{ item.family }}' --alias {{ item.alias }} --artifactsdir {{ remote_artifacts }} --package {{ package if item.package is not defined else item.package }} with_items: - "{{ families }}" From 3e90b14dced89d42090fa918e6d4435831d08c3f Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Wed, 5 Jun 2019 09:48:14 +0000 Subject: [PATCH 54/66] Install metainfo files under %{_metainfodir}. --- linux-libertine-fonts.spec | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index 10684ed..65e553e 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -14,7 +14,7 @@ proprietary standard fonts. Name: %{fontname}-fonts Version: 5.3.0 -Release: 14.%{posttag}%{?dist} +Release: 15.%{posttag}%{?dist} Summary: Linux Libertine Open Fonts License: GPLv2+ with exceptions or OFL @@ -27,7 +27,7 @@ Source4: libertine.metainfo.xml Source5: biolinum.metainfo.xml BuildArch: noarch -BuildRequires: fontpackages-devel +BuildRequires: fontpackages-devel libappstream-glib #BuildRequires: fontforge Requires: %{name}-common = %{version}-%{release} @@ -87,24 +87,30 @@ done # Add AppStream metadata install -Dm 0644 -p %{SOURCE4} \ - %{buildroot}%{_datadir}/appdata/libertine.metainfo.xml + %{buildroot}%{_metainfodir}/libertine.metainfo.xml install -Dm 0644 -p %{SOURCE5} \ - %{buildroot}%{_datadir}/appdata/biolinum.metainfo.xml + %{buildroot}%{_metainfodir}/biolinum.metainfo.xml + +%check +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml %files common %license GPL.txt LICENCE.txt OFL-1.1.txt %doc Bugs.txt ChangeLog.txt Readme-TEX.txt README %_font_pkg -f %{fontconf_libertine} LinLibertine*.otf -%{_datadir}/appdata/libertine.metainfo.xml +%{_metainfodir}/libertine.metainfo.xml %{_fontconfig_templatedir}/%{fontconf_metrics} %{_fontconfig_confdir}/%{fontconf_metrics} %_font_pkg -n biolinum -f %{fontconf_biolinum} LinBiolinum*.otf -%{_datadir}/appdata/biolinum.metainfo.xml +%{_metainfodir}/biolinum.metainfo.xml %changelog +* Wed Jun 5 2019 Akira TAGOH - 5.3.0-15.2012_07_02 +- Install metainfo files under %%{_metainfodir}. + * Fri Feb 01 2019 Fedora Release Engineering - 5.3.0-14.2012_07_02 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 3d17d85327702b3db7914ecbb09b19ea077e85d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 14:59:47 +0000 Subject: [PATCH 55/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- linux-libertine-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index 65e553e..b95c4a3 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -14,7 +14,7 @@ proprietary standard fonts. Name: %{fontname}-fonts Version: 5.3.0 -Release: 15.%{posttag}%{?dist} +Release: 16.%{posttag}%{?dist} Summary: Linux Libertine Open Fonts License: GPLv2+ with exceptions or OFL @@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml %{_metainfodir}/biolinum.metainfo.xml %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 5.3.0-16.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Wed Jun 5 2019 Akira TAGOH - 5.3.0-15.2012_07_02 - Install metainfo files under %%{_metainfodir}. From 26940ab176c7af82902be0da75751b2e54158cb6 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Wed, 20 Nov 2019 19:16:41 +0900 Subject: [PATCH 56/66] Update CI roles --- .../custom-test-fonts/files/run-family-test | 25 +- .../files/run-lang-coverage-test | 286 ++++++++++-------- tests/roles/custom-test-fonts/tasks/main.yml | 14 +- 3 files changed, 191 insertions(+), 134 deletions(-) diff --git a/tests/roles/custom-test-fonts/files/run-family-test b/tests/roles/custom-test-fonts/files/run-family-test index e87cad0..bbbed73 100755 --- a/tests/roles/custom-test-fonts/files/run-family-test +++ b/tests/roles/custom-test-fonts/files/run-family-test @@ -83,13 +83,13 @@ debug "Family: $OPT_FAMILY" debug "Lang: $OPT_LANG" debug "Artifacts dir: $OPT_ARTIFACTS_DIR" debug "Package name: $OPT_PACKAGE" -STR_TEST_DASHED=$(echo "${OPT_PACKAGE}_${OPT_ALIAS}" | sed -e 's/\//-/g' -e 's/ /-/g') +STR_TEST_DASHED=$(echo "${OPT_PACKAGE}_${OPT_ALIAS}_${OPT_LANG}" | sed -e 's/\//-/g' -e 's/ /-/g') debug "Log file: $STR_TEST_DASHED.log" clean_exit() { rc=$?; trap - SIGINT SIGTERM SIGABRT EXIT - echo "Run test $OPT_ALIAS: done." + echo "Run test $OPT_ALIAS: done. Test's exit code: $rc" for pid in $(ps -o pid --no-headers --ppid $$); do if [ -n "$(ps -p $pid -o pid=)" ]; then kill -s HUP $pid @@ -114,11 +114,16 @@ clean_exit() { status="ERROR" fi echo "$status $OPT_ALIAS" >> "$OPT_ARTIFACTS_DIR/test.log" - mv "$log_file_path" "$OPT_ARTIFACTS_DIR/${status}_${log_file_name}" + mv "$log_file_path" "$OPT_ARTIFACTS_DIR/${status}-${log_file_name}" local results="$OPT_ARTIFACTS_DIR/results.yml" local result=$(echo $status | tr '[:upper:]' '[:lower:]') test -f "$results" || echo 'results:' > "$results" - echo "- {result: $result, test: $OPT_ALIAS}" >> "$results" + printf '%s\n' '' \ + "- test: $OPT_ALIAS" \ + " result: $result" \ + " logs:" \ + " - ${status}_${log_file_name}" \ + >> "$results" exit 0 } trap clean_exit SIGINT SIGTERM SIGABRT EXIT @@ -139,15 +144,19 @@ debug "Config: `cat $tmpconfd/fonts.conf`" mkdir -p "$OPT_ARTIFACTS_DIR" export OUTPUTFILE="$(realpath "$OPT_ARTIFACTS_DIR")/$STR_TEST_DASHED-out.log" -logfile_stdout="$OPT_ARTIFACTS_DIR/$STR_TEST_DASHED.log" -logfile_stderr="$OPT_ARTIFACTS_DIR/$STR_TEST_DASHED-err.log" -exec 3>&1 4>&2 1> >(tee -a "$logfile_stdout" >&3) 2> >(tee -a "$logfile_stderr" >&4) +logfile="$OPT_ARTIFACTS_DIR/$STR_TEST_DASHED.log" +logfile="$(realpath "$logfile")" +exec > >(tee -a "$logfile") 2>&1 debug "Check family assignment" res=`FONTCONFIG_FILE=$tmpconfd/fonts.conf fc-match -f "%{family[0]}" :family=$OPT_ALIAS:lang=$OPT_LANG` +ret=0 if [ "x$res" = "x$OPT_FAMILY" ]; then echo "RESULT: PASS: $OPT_FAMILY was assigned to $OPT_ALIAS as expected" else - echo "RESULT: FAIL: $OPT_FAMILY wasn't assigned to $OPT_ALIAS (actual result: $res)" + echo "RESULT: FAIL: $OPT_FAMILY wasn't assigned to $OPT_ALIAS (actual result: $res)" + ret=1 fi rm -rf $tmpconfd + +exit $ret diff --git a/tests/roles/custom-test-fonts/files/run-lang-coverage-test b/tests/roles/custom-test-fonts/files/run-lang-coverage-test index 81fefa8..299f06b 100755 --- a/tests/roles/custom-test-fonts/files/run-lang-coverage-test +++ b/tests/roles/custom-test-fonts/files/run-lang-coverage-test @@ -1,13 +1,13 @@ #! /bin/bash -efu debug() { - if [ -n "$DEBUG" ]; then - echo "$*" >&2 - fi + if [ -n "$DEBUG" ]; then + echo "$*" >&2 + fi } msg_usage() { - cat <<_EOF_ + cat <<_EOF_ Run language coverage test. Usage: @@ -28,7 +28,7 @@ _EOF_ PROG="${PROG:-${0##*/}}" DEBUG="${DEBUG:-}" OPT_LANG="${OPT_LANG:-en}" -OPT_PATH="${OPT_PATH:-}" +OPT_PATH=() OPT_ARTIFACTS_DIR="${OPT_ARTIFACTS_DIR:-}" OPT_EXCLUDE=() OPT_INCLUDE=() @@ -37,161 +37,197 @@ OPT_NAME="${OPT_NAME:-}" opt=$(getopt -n "$0" --options "hvl:p:n:a:e:i:" --longoptions "help,verbose,lang:,path:,name:,artifactsdir:,exclude:,include:" -- "$@") eval set -- "$opt" while [[ $# -gt 0 ]]; do - case "$1" in + case "$1" in -n|--name) - OPT_NAME="$2" - shift 2 - ;; + OPT_NAME="$2" + shift 2 + ;; -i|--include) - OPT_INCLUDE+=("$2") - shift 2 - ;; + OPT_INCLUDE+=("$2") + shift 2 + ;; -e|--exclude) - OPT_EXCLUDE+=("$2") - shift 2 - ;; + OPT_EXCLUDE+=("$2") + shift 2 + ;; -a|--artifactsdir) - OPT_ARTIFACTS_DIR="$2" - shift 2 - ;; + OPT_ARTIFACTS_DIR="$2" + shift 2 + ;; -p|--path) - OPT_PATH="$2" - shift 2 - ;; + OPT_PATH+=("$2") + shift 2 + ;; -l|--lang) - OPT_LANG="$2" - shift 2 - ;; + OPT_LANG="$2" + shift 2 + ;; -v|--verbose) - DEBUG="-v" - shift - ;; + DEBUG="-v" + shift + ;; -h|--help) - msg_usage - exit 0 - ;; + msg_usage + exit 0 + ;; --) - shift - ;; + shift + ;; *) - msg_usage - exit 1 - esac + msg_usage + exit 1 + esac done if [ -z "$OPT_ARTIFACTS_DIR" ] || [ -z "$OPT_LANG" ] || [ -z "$OPT_PATH" ]; then - echo "Use: $PROG -h for help." - exit 0 + echo "Use: $PROG -h for help." + exit 0 fi -expand_regex() { - local e ret=() - local path="$1" - shift - (cd $path; - for e; do - debug "$e" - set +f - local x=$(find -regextype posix-egrep -regex "./$e" -print|sed -e 's,^\./,,g') - ret+=($x) - set -f - echo ${ret[@]} - done) - echo ${ret[@]} -} - -OPT_INCLUDE=($(expand_regex $OPT_PATH ${OPT_INCLUDE[@]})) -OPT_EXCLUDE=($(expand_regex $OPT_PATH ${OPT_EXCLUDE[@]})) - -debug "Path: $OPT_PATH" -debug "Lang: $OPT_LANG" -debug "Artifacts dir: $OPT_ARTIFACTS_DIR" -debug "Exclude: ${OPT_EXCLUDE[@]}" -debug "Include: ${OPT_INCLUDE[@]}" -STR_TEST_DASHED=$(echo "${OPT_NAME:-${OPT_LANG}_${OPT_PATH}}" | sed -e 's/\//-/g') +STR_TEST_DASHED=$(echo "${OPT_NAME:-$OPT_LANG}" | sed -e 's/\//-/g') clean_exit() { - rc=$?; - trap - SIGINT SIGTERM SIGABRT EXIT - echo "Run test $OPT_PATH: done." - for pid in $(ps -o pid --no-headers --ppid $$); do - if [ -n "$(ps -p $pid -o pid=)" ]; then - kill -s HUP $pid - fi - done - local log_file_name="$STR_TEST_DASHED.log" - local log_file_path="$OPT_ARTIFACTS_DIR/$log_file_name" - local status - if [[ $rc -eq 127 ]]; then - status="ERROR" - elif grep -q "RESULT: WARN" "$log_file_path"; then - status="ERROR" - elif grep -q "RESULT: FAIL" "$log_file_path"; then - status="FAIL" - elif grep -q "RESULT: PASS" "$log_file_path"; then - status="PASS" - elif grep -q "FAIL" "$log_file_path"; then - status="FAIL" - elif grep -q "PASS" "$log_file_path"; then - status="PASS" - else - status="ERROR" + rc=$?; + trap - SIGINT SIGTERM SIGABRT EXIT + echo "Run test $OPT_LANG: done. Test's exit code: $rc" + for pid in $(ps -o pid --no-headers --ppid $$); do + if [ -n "$(ps -p $pid -o pid=)" ]; then + kill -s HUP $pid fi - echo "$status $OPT_PATH" >> "$OPT_ARTIFACTS_DIR/test.log" - mv "$log_file_path" "$OPT_ARTIFACTS_DIR/${status}_${log_file_name}" - local results="$OPT_ARTIFACTS_DIR/results.yml" - local result=$(echo $status | tr '[:upper:]' '[:lower:]') - test -f "$results" || echo 'results:' > "$results" - echo "- {result: $result, test: $OPT_PATH}" >> "$results" - exit 0 + done + local log_file_name="$STR_TEST_DASHED.log" + local log_file_path="$OPT_ARTIFACTS_DIR/$log_file_name" + local status + if [[ $rc -eq 127 ]]; then + status="ERROR" + elif grep -q "RESULT: WARN" "$log_file_path"; then + status="ERROR" + elif grep -q "RESULT: FAIL" "$log_file_path"; then + status="FAIL" + elif grep -q "RESULT: PASS" "$log_file_path"; then + status="PASS" + elif grep -q "WARN" "$log_file_path"; then + status="ERROR" + elif grep -q "FAIL" "$log_file_path"; then + status="FAIL" + elif grep -q "PASS" "$log_file_path"; then + status="PASS" + else + status="ERROR" + fi + echo "$status $OPT_LANG" >> "$OPT_ARTIFACTS_DIR/test.log" + mv "$log_file_path" "$OPT_ARTIFACTS_DIR/${status}-${log_file_name}" + local results="$OPT_ARTIFACTS_DIR/results.yml" + local result=$(echo $status | tr '[:upper:]' '[:lower:]') + test -f "$results" || echo 'results:' > "$results" + printf '%s\n' '' \ + "- test: $OPT_LANG" \ + " result: $result" \ + " logs:" \ + " - ${status}_${log_file_name}" \ + >> "$results" + exit 0 } trap clean_exit SIGINT SIGTERM SIGABRT EXIT mkdir -p "$OPT_ARTIFACTS_DIR" export OUTPUTFILE="$(realpath "$OPT_ARTIFACTS_DIR")/$STR_TEST_DASHED-out.log" -logfile_stdout="$OPT_ARTIFACTS_DIR/$STR_TEST_DASHED.log" -logfile_stderr="$OPT_ARTIFACTS_DIR/$STR_TEST_DASHED-err.log" -exec 3>&1 4>&2 1> >(tee -a "$logfile_stdout" >&3) 2> >(tee -a "$logfile_stderr" >&4) +logfile="$OPT_ARTIFACTS_DIR/$STR_TEST_DASHED.log" +logfile="$(realpath "$logfile")" +exec > >(tee -a "$logfile") 2>&1 + +expand_regex() { + local p ret=() + local regex="$1" + shift + debug "Expanding $regex" + for p; do + set +f + debug "$p: $regex" + (cd $p; + local x=$(find -regextype posix-egrep -regex "./$regex" -print|sed -e 's,^\./,,g') + debug "$x" + ret+=($x) + set -f + echo -n ${ret[@]} + ) + done + echo -n ${ret[@]} +} + +iv=() +ev=() +x=() +for p in ${OPT_INCLUDE[@]}; do + x=$(expand_regex $p ${OPT_PATH[@]}) + if [ "x$x" == "x" ]; then + echo "RESULT: WARN: No matches on \"$p\". maybe typo or something changed?" + continue + fi + iv=("${iv[@]}" "${x[@]}") +done +for p in ${OPT_EXCLUDE[@]}; do + x=$(expand_regex $p ${OPT_PATH[@]}) + if [ "x$x" == "x" ]; then + echo "RESULT: WARN: No matches on \"$p\". maybe typo or something changed?" + continue + fi + ev=("${ev[@]}" "${x[@]}") +done +OPT_EXCLUDE=(${ev[@]}) +OPT_INCLUDE=(${iv[@]}) + +debug "Path: ${OPT_PATH[@]}" +debug "Lang: $OPT_LANG" +debug "Artifacts dir: $OPT_ARTIFACTS_DIR" +debug "Exclude: ${#OPT_EXCLUDE[@]}: ${OPT_EXCLUDE[@]}" +debug "Include: ${#OPT_INCLUDE[@]}: ${OPT_INCLUDE[@]}" contains() { - local e match="$1" - shift - for e; do [[ "$e" == "$match" ]] && return 1; done - return 0 + local e match="$1" + shift + for e; do [[ "$e" == "$match" ]] && return 1; done + return 0 } debug "Check language coverage" +ret=0 set +f -for i in `find $OPT_PATH -regex '.*/*\.\(t1\)?\(ttf\)?\(otf\)?\(ttc\)?\(pcf.*\)?\(pfa\)?'`; do -set -f +for p in ${OPT_PATH[@]}; do + for i in `find $p -regex '.*/*\.\(t1\)?\(ttf\)?\(otf\)?\(ttc\)?\(pcf.*\)?\(pfa\)?'`; do + set -f debug "$i" if test -f $i; then - n=`basename $i` + n=`basename $i` + set +e + contains "$n" "${OPT_EXCLUDE[@]}" + ret=$? + set -e + if [ $ret -eq 1 ]; then + debug "ignoring $i" + continue + fi + if [ ${#OPT_INCLUDE[@]} -ne 0 ]; then set +e - contains "$n" "${OPT_EXCLUDE[@]}" + contains "$n" "${OPT_INCLUDE[@]}" ret=$? set -e - if [ $ret -eq 1 ]; then - debug "ignoring $i" - continue - fi - if [ ${#OPT_INCLUDE[@]} -ne 0 ]; then - set +e - contains "$n" "${OPT_INCLUDE[@]}" - ret=$? - set -e - if [ $ret -eq 0 ]; then - debug "$i isn't targeted file" - continue - fi - fi - debug " $i" - res=`fc-validate -l $OPT_LANG $i` - if echo $res | grep -q Missing; then - echo "RESULT: FAIL: $i doesn't satisfy $OPT_LANG language coverage." - else - echo "RESULT: PASS: $i satisfy $OPT_LANG language coverage." + if [ $ret -eq 0 ]; then + debug "$i isn't targeted file" + continue fi + NOT_MATCHED=("${NOT_MATCHED[@]/$n}") + fi + debug " $i" + res=`fc-validate -l $OPT_LANG $i || :` + if echo $res | grep -q Missing; then + echo "RESULT: FAIL: $i doesn't satisfy $OPT_LANG language coverage." + ret=1 + else + echo "RESULT: PASS: $i satisfy $OPT_LANG language coverage." + fi fi + done done +exit $ret diff --git a/tests/roles/custom-test-fonts/tasks/main.yml b/tests/roles/custom-test-fonts/tasks/main.yml index 981d3aa..2665795 100644 --- a/tests/roles/custom-test-fonts/tasks/main.yml +++ b/tests/roles/custom-test-fonts/tasks/main.yml @@ -2,15 +2,23 @@ - block: - name: language coverage - script: run-lang-coverage-test --lang "{{ item }}" --path "{{ path_prefix }}" --artifactsdir "{{ remote_artifacts }}" {{ "" if coverage.values is not defined or coverage[item].name is not defined else "--name " + coverage[item].name }} {{ "" if coverage.values is not defined or coverage[item].exclude is not defined else '--exclude "' + (coverage[item].exclude | join('" --exclude "')) + '"'}} {{ "" if coverage.values is not defined or coverage[item].include is not defined else '--include "' + (coverage[item].include | join('" --include "')) + '"'}} + environment: + LANG: "en_US.UTF-8" + script: run-lang-coverage-test --lang "{{ item }}" {% if coverage.values is not defined or coverage[item].path_prefix is not defined %} --path {{ path_prefix }} {% else %} {{ '--path "' + (coverage[item].path_prefix | join('" --path "')) + '"' }} {% endif %} --artifactsdir "{{ remote_artifacts }}" {{ "" if coverage.values is not defined or coverage[item].name is not defined else "--name " + coverage[item].name }} {{ "" if coverage.values is not defined or coverage[item].exclude is not defined else '--exclude "' + (coverage[item].exclude | join('" --exclude "')) + '"'}} {{ "" if coverage.values is not defined or coverage[item].include is not defined else '--include "' + (coverage[item].include | join('" --include "')) + '"'}} with_items: - "{{ coverage if coverage.keys is not defined else coverage.keys()|list }}" - name: generic family assignment + environment: + LANG: "en_US.UTF-8" when: families is defined script: run-family-test --lang {{ item.lang }} --family '{{ item.family }}' --alias {{ item.alias }} --artifactsdir {{ remote_artifacts }} --package {{ package if item.package is not defined else item.package }} with_items: - "{{ families }}" + - name: Collect all of failures into one file + shell: | + grep -v PASS "{{ remote_artifacts }}"/FAIL_*.log > "{{ remote_artifacts }}"/FAIL-all.log || : + - name: Check the results shell: | log="{{ remote_artifacts }}/test.log" @@ -38,3 +46,7 @@ - include_role: name: str-common-final + + - name: Validate the result + shell: echo "test_results.stdout" + failed_when: test_results.stdout != 'PASS' From a6eb69db5a80ca2a76f6be00bc99a51b85360dd9 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Wed, 20 Nov 2019 20:08:47 +0900 Subject: [PATCH 57/66] Exclude LinLibertine_I.otf for en language coverage LinLibertine_I is "Linux Libertine Initials" not the italic version of Linux Libertine. It is LinLibertine_RI.otf. --- tests/tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/tests.yml b/tests/tests.yml index 2176b3e..484fca9 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -8,7 +8,9 @@ - linux-libertine-biolinum-fonts path_prefix: /usr/share/fonts/linux-libertine coverage: - - en + en: + exclude: + - LinLibertine_I.otf families: - lang: en alias: serif From 2aa3b7208c6d3427580d586d99bd2185c54c8d22 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 11:05:05 +0000 Subject: [PATCH 58/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- linux-libertine-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index b95c4a3..60065d7 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -14,7 +14,7 @@ proprietary standard fonts. Name: %{fontname}-fonts Version: 5.3.0 -Release: 16.%{posttag}%{?dist} +Release: 17.%{posttag}%{?dist} Summary: Linux Libertine Open Fonts License: GPLv2+ with exceptions or OFL @@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml %{_metainfodir}/biolinum.metainfo.xml %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 5.3.0-17.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 5.3.0-16.2012_07_02 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 1ada6ae994d665f84b05b82e347ad3c90672db1e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 06:08:32 +0000 Subject: [PATCH 59/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- linux-libertine-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index 60065d7..f37978e 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -14,7 +14,7 @@ proprietary standard fonts. Name: %{fontname}-fonts Version: 5.3.0 -Release: 17.%{posttag}%{?dist} +Release: 18.%{posttag}%{?dist} Summary: Linux Libertine Open Fonts License: GPLv2+ with exceptions or OFL @@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml %{_metainfodir}/biolinum.metainfo.xml %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 5.3.0-18.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jan 29 2020 Fedora Release Engineering - 5.3.0-17.2012_07_02 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 45996ab45d341ab9839b8aa2d63c72eb2fc023c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 18:33:02 +0000 Subject: [PATCH 60/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- linux-libertine-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index f37978e..95e7aa0 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -14,7 +14,7 @@ proprietary standard fonts. Name: %{fontname}-fonts Version: 5.3.0 -Release: 18.%{posttag}%{?dist} +Release: 19.%{posttag}%{?dist} Summary: Linux Libertine Open Fonts License: GPLv2+ with exceptions or OFL @@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml %{_metainfodir}/biolinum.metainfo.xml %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 5.3.0-19.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 5.3.0-18.2012_07_02 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From a492e37912bebfbd0f1963f30322d4e939e297f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 12:59:26 +0000 Subject: [PATCH 61/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- linux-libertine-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index 95e7aa0..57b416e 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -14,7 +14,7 @@ proprietary standard fonts. Name: %{fontname}-fonts Version: 5.3.0 -Release: 19.%{posttag}%{?dist} +Release: 20.%{posttag}%{?dist} Summary: Linux Libertine Open Fonts License: GPLv2+ with exceptions or OFL @@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml %{_metainfodir}/biolinum.metainfo.xml %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 5.3.0-20.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 5.3.0-19.2012_07_02 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 87443c0ffd1e69dbd6a160ba2d56a70e5fe22a48 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 17:53:33 +0000 Subject: [PATCH 62/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- linux-libertine-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index 57b416e..215fa80 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -14,7 +14,7 @@ proprietary standard fonts. Name: %{fontname}-fonts Version: 5.3.0 -Release: 20.%{posttag}%{?dist} +Release: 21.%{posttag}%{?dist} Summary: Linux Libertine Open Fonts License: GPLv2+ with exceptions or OFL @@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml %{_metainfodir}/biolinum.metainfo.xml %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 5.3.0-21.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 5.3.0-20.2012_07_02 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From f5be7db21fb9acf5eec579e2cc01c8b6728204ac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 19:40:11 +0000 Subject: [PATCH 63/66] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- linux-libertine-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index 215fa80..397fafb 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -14,7 +14,7 @@ proprietary standard fonts. Name: %{fontname}-fonts Version: 5.3.0 -Release: 21.%{posttag}%{?dist} +Release: 22.%{posttag}%{?dist} Summary: Linux Libertine Open Fonts License: GPLv2+ with exceptions or OFL @@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml %{_metainfodir}/biolinum.metainfo.xml %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 5.3.0-22.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 5.3.0-21.2012_07_02 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 37c83efecb31ee9f50a3ac9667320006af2bc5d3 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Fri, 2 Dec 2022 21:56:00 +0900 Subject: [PATCH 64/66] Convert License tag to SPDX. --- linux-libertine-fonts.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index 397fafb..3d96a4a 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -14,10 +14,10 @@ proprietary standard fonts. Name: %{fontname}-fonts Version: 5.3.0 -Release: 22.%{posttag}%{?dist} +Release: 23.%{posttag}%{?dist} Summary: Linux Libertine Open Fonts -License: GPLv2+ with exceptions or OFL +License: GPL-2.0-or-later WITH Font-exception-2.0 OR OFL-1.1 URL: http://linuxlibertine.sf.net Source0: http://download.sourceforge.net/sourceforge/linuxlibertine/LinLibertineOTF_%{version}_%{posttag}.tgz Source1: %{name}-libertine-fontconfig.conf @@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml %{_metainfodir}/biolinum.metainfo.xml %changelog +* Fri Dec 2 2022 Akira TAGOH - 5.3.0-23.2012_07_02 +- Convert License tag to SPDX. + * Thu Jul 21 2022 Fedora Release Engineering - 5.3.0-22.2012_07_02 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 0d2d8c2ea65eec6b74b5350b89ceb4a1f6f2f81e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 18:05:16 +0000 Subject: [PATCH 65/66] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- linux-libertine-fonts.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec index 3d96a4a..0351c26 100644 --- a/linux-libertine-fonts.spec +++ b/linux-libertine-fonts.spec @@ -14,7 +14,7 @@ proprietary standard fonts. Name: %{fontname}-fonts Version: 5.3.0 -Release: 23.%{posttag}%{?dist} +Release: 24.%{posttag}%{?dist} Summary: Linux Libertine Open Fonts License: GPL-2.0-or-later WITH Font-exception-2.0 OR OFL-1.1 @@ -108,6 +108,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml %{_metainfodir}/biolinum.metainfo.xml %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 5.3.0-24.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Dec 2 2022 Akira TAGOH - 5.3.0-23.2012_07_02 - Convert License tag to SPDX. From 714f0a29105d029c57d7e19a7838774c266e94ee Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 22 Nov 2023 16:37:41 +0300 Subject: [PATCH 66/66] Remove unnecessary files --- SPECS/linux-libertine-fonts.spec | 273 ++++++++++++++++++ sources | 1 - .../roles/custom-test-fonts/defaults/main.yml | 7 - .../custom-test-fonts/files/run-family-test | 162 ----------- .../files/run-lang-coverage-test | 233 --------------- tests/roles/custom-test-fonts/meta/main.yml | 4 - tests/roles/custom-test-fonts/tasks/main.yml | 52 ---- tests/tests.yml | 22 -- 8 files changed, 273 insertions(+), 481 deletions(-) create mode 100644 SPECS/linux-libertine-fonts.spec delete mode 100644 sources delete mode 100644 tests/roles/custom-test-fonts/defaults/main.yml delete mode 100755 tests/roles/custom-test-fonts/files/run-family-test delete mode 100755 tests/roles/custom-test-fonts/files/run-lang-coverage-test delete mode 100644 tests/roles/custom-test-fonts/meta/main.yml delete mode 100644 tests/roles/custom-test-fonts/tasks/main.yml delete mode 100644 tests/tests.yml diff --git a/SPECS/linux-libertine-fonts.spec b/SPECS/linux-libertine-fonts.spec new file mode 100644 index 0000000..0351c26 --- /dev/null +++ b/SPECS/linux-libertine-fonts.spec @@ -0,0 +1,273 @@ +%global fontname linux-libertine +%global prio_libertine 60 +%global prio_biolinum 61 +%global fontconf_libertine %{prio_libertine}-%{fontname}-libertine.conf +%global fontconf_biolinum %{prio_biolinum}-%{fontname}-biolinum.conf +%global fontconf_metrics 29-%{fontname}-metrics-alias.conf +%global archivename LinLibertine +%global posttag 2012_07_02 + +%define common_desc \ +The Linux Libertine Open Fonts are a TrueType font family for practical \ +use in documents. They were created to provide a free alternative to \ +proprietary standard fonts. + +Name: %{fontname}-fonts +Version: 5.3.0 +Release: 24.%{posttag}%{?dist} +Summary: Linux Libertine Open Fonts + +License: GPL-2.0-or-later WITH Font-exception-2.0 OR OFL-1.1 +URL: http://linuxlibertine.sf.net +Source0: http://download.sourceforge.net/sourceforge/linuxlibertine/LinLibertineOTF_%{version}_%{posttag}.tgz +Source1: %{name}-libertine-fontconfig.conf +Source2: %{name}-biolinum-fontconfig.conf +Source3: %{name}-libertine-metrics-alias-fontconfig.conf +Source4: libertine.metainfo.xml +Source5: biolinum.metainfo.xml + +BuildArch: noarch +BuildRequires: fontpackages-devel libappstream-glib +#BuildRequires: fontforge +Requires: %{name}-common = %{version}-%{release} + +%description +%common_desc + +This package contains Serif fonts. + +%package -n %{fontname}-biolinum-fonts +Summary: Sans-serif fonts from Linux Libertine Open Fonts +Requires: %{name}-common = %{version}-%{release} + +%description -n %{fontname}-biolinum-fonts +%common_desc + +This package contains Sans fonts. + +%package common +Summary: Common files for Linux Libertine Open Fonts +Requires: fontpackages-filesystem + +%description common +%common_desc + +This package consists of files used by other %{name} packages. + +%prep +%setup -q -c +sed -i -e 's/\r//' OFL-1.1.txt + +%build +#for i in $(find -name '*.sfd'); do +# (cd scripts; +# ./bailly-2.sh "../$i" ttf +# ) +#done +#mv scripts/*.ttf . + +%install +install -m 0755 -d %{buildroot}%{_fontdir} +install -m 0644 -p *.otf %{buildroot}%{_fontdir} + +install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ + %{buildroot}%{_fontconfig_confdir} + +install -m 0644 -p %{SOURCE1} \ + %{buildroot}%{_fontconfig_templatedir}/%{fontconf_libertine} +install -m 0644 -p %{SOURCE2} \ + %{buildroot}%{_fontconfig_templatedir}/%{fontconf_biolinum} +install -m 0644 -p %{SOURCE3} \ + %{buildroot}%{_fontconfig_templatedir}/%{fontconf_metrics} + +for fconf in %{fontconf_libertine} %{fontconf_metrics} %{fontconf_biolinum}; do + ln -s %{_fontconfig_templatedir}/$fconf \ + %{buildroot}%{_fontconfig_confdir}/$fconf +done + +# Add AppStream metadata +install -Dm 0644 -p %{SOURCE4} \ + %{buildroot}%{_metainfodir}/libertine.metainfo.xml +install -Dm 0644 -p %{SOURCE5} \ + %{buildroot}%{_metainfodir}/biolinum.metainfo.xml + +%check +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml + +%files common +%license GPL.txt LICENCE.txt OFL-1.1.txt +%doc Bugs.txt ChangeLog.txt Readme-TEX.txt README + +%_font_pkg -f %{fontconf_libertine} LinLibertine*.otf +%{_metainfodir}/libertine.metainfo.xml + +%{_fontconfig_templatedir}/%{fontconf_metrics} +%{_fontconfig_confdir}/%{fontconf_metrics} + +%_font_pkg -n biolinum -f %{fontconf_biolinum} LinBiolinum*.otf +%{_metainfodir}/biolinum.metainfo.xml + +%changelog +* Thu Jan 19 2023 Fedora Release Engineering - 5.3.0-24.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Dec 2 2022 Akira TAGOH - 5.3.0-23.2012_07_02 +- Convert License tag to SPDX. + +* Thu Jul 21 2022 Fedora Release Engineering - 5.3.0-22.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 5.3.0-21.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 5.3.0-20.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 5.3.0-19.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 5.3.0-18.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 5.3.0-17.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 5.3.0-16.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Jun 5 2019 Akira TAGOH - 5.3.0-15.2012_07_02 +- Install metainfo files under %%{_metainfodir}. + +* Fri Feb 01 2019 Fedora Release Engineering - 5.3.0-14.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 5.3.0-13.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jul 09 2018 Akira TAGOH - 5.3.0-12.2012_07_02 +- Modernize the spec file. +- Fix bogus date in the spec file. + +* Wed Feb 07 2018 Fedora Release Engineering - 5.3.0-11.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 5.3.0-10.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 5.3.0-9.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 5.3.0-8.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Jan 4 2016 Akira TAGOH +- Use %%global instead of %%define. + +* Wed Jun 17 2015 Fedora Release Engineering - 5.3.0-7.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Oct 15 2014 Richard Hughes - 5.3.0-6.2012_07_02 +- Add a MetaInfo file for the software center; this is a font we want to show. + +* Sat Jun 07 2014 Fedora Release Engineering - 5.3.0-5.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 5.3.0-4.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 5.3.0-3.2012_07_02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Jul 31 2012 Akira TAGOH - 5.3.0-2.2012_07_02 +- Use OTF version of fonts. + +* Tue Jul 24 2012 Akira TAGOH - 5.3.0-1.2012_07_02 +- New upstream release. +- Giving up to build fonts from the source due to lacking of the build script. + +* Thu Jul 19 2012 Fedora Release Engineering - 5.1.3-3.2011_06_21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Jun 13 2012 Akira TAGOH - 5.1.3-2.2011_06_21 +- Fix the order for substitute of Times New Roman. (#830849) + +* Thu Apr 19 2012 Akira TAGOH - 5.1.3-1.2011_06_21 +- New upstream release. (#813730) + +* Fri Jan 13 2012 Fedora Release Engineering - 4.7.5-2.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Feb 17 2011 Akira TAGOH - 4.7.5-1.2 +- Improve the spec file to meet the packaging guidelines. (#477418) +- Updates to 4.7.5-2 (#628540) + +* Tue Feb 08 2011 Fedora Release Engineering - 4.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Jul 25 2009 Fedora Release Engineering - 4.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Jul 14 2009 Kevin Fenzi - 4.4.1-1 +- Upgrade to 4.4.1 +- Fix to match current font guidelines + +* Sun Mar 15 2009 Nicolas Mailhot - 4.1.8-3 +— Make sure F11 font packages have been built with F11 fontforge + +* Wed Feb 25 2009 Fedora Release Engineering - 4.1.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Nov 21 2008 Frank Arnold 4.1.8-1 +- Updated to 4.1.8 +- Modified build procedure according to GENERATING.txt + +* Wed Sep 3 2008 Nicolas Mailhot +- 2.7.9-2 +⚙ Rebuild with pre-F10-freeze fontforge + +* Sun Feb 03 2008 Frank Arnold 2.7.9-1 +- Updated to 2.7.9 +- Drop generated PDF files to save space + +* Sun Sep 16 2007 Kevin Fenzi - 2.6.9-1 +- Updated to 2.6.9 +- Update License tag + +* Sat Mar 17 2007 Frank Arnold 2.4.9-1 +- Updated to 2.4.9 +- Reenabled generation of PDF files + +* Sun Oct 01 2006 Frank Arnold 2.2.0-1 +- Updated to 2.2.0 +- Removed ghosted cache file as it's no longer stored in tree +- Disabled generation of PDF files because fontforge will segfault +- Added OFL to License field + +* Tue Sep 19 2006 Kevin Fenzi 2.1.9-2 +- Upload proper 2.1.9 sources and rebuild + +* Tue Sep 19 2006 Kevin Fenzi 2.1.9-1 +- Update to 2.1.9 + +* Tue Aug 29 2006 Frank Arnold 2.1.0-1 +- Updated to 2.1.0 + +* Tue Feb 28 2006 Frank Arnold 2.0.4-2 +- Named back to linux-libertine-fonts + +* Mon Feb 13 2006 Frank Arnold 2.0.4-1 +- Updated to 2.0.4 +- Removed handling of fonts.cache-2 + +* Wed Feb 01 2006 Frank Arnold 2.0.1-3 +- Nuked separate fontforge build script, now in %%build section + +* Tue Jan 31 2006 Frank Arnold 2.0.1-2 +- Fixed the following issues addressed by Ignacio Vazquez-Abrams +- Package renaming to font-linux-libertine +- Generate fonts from sources +- Sample sheets for each font in PDF format + +* Mon Jan 30 2006 Frank Arnold 2.0.1-1 +- Initial RPM release +- Spec derived from other font packages diff --git a/sources b/sources deleted file mode 100644 index 5ade67c..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -e859a19401464097ab35226fdea64c3e LinLibertineOTF_5.3.0_2012_07_02.tgz diff --git a/tests/roles/custom-test-fonts/defaults/main.yml b/tests/roles/custom-test-fonts/defaults/main.yml deleted file mode 100644 index fe09145..0000000 --- a/tests/roles/custom-test-fonts/defaults/main.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -role_pkgs_req: - - fontconfig - - fontconfig-devel - - pkg-config - - rsync diff --git a/tests/roles/custom-test-fonts/files/run-family-test b/tests/roles/custom-test-fonts/files/run-family-test deleted file mode 100755 index bbbed73..0000000 --- a/tests/roles/custom-test-fonts/files/run-family-test +++ /dev/null @@ -1,162 +0,0 @@ -#! /bin/bash -efu - -debug() { - if [ -n "$DEBUG" ]; then - echo "$*" >&2 - fi -} - -msg_usage() { - cat <<_EOF_ -Run family test. - -Usage: -$PROG - -Options: --h, --help Display this help and exit --v, --verbose Turn on debug --l, --lang=LANG Test LANG language coverage (default: en) --f, --family=FILE Set a family name supposed to be assigned for alias. --g, --alias=STR Set an alias name. (default: sans-serif) --a, --artifactsdir=DIR Set environment dir to store artifacts --k, --package=NAME Set a package name for fonts. -_EOF_ -} - -PROG="${PROG:-${0##*/}}" -DEBUG="${DEBUG:-}" -OPT_LANG="${OPT_LANG:-en}" -OPT_FAMILY="${OPT_FAMILY:-}" -OPT_ARTIFACTS_DIR="${OPT_ARTIFACTS_DIR:-}" -OPT_ALIAS="${OPT_ALIAS:-sans-serif}" -OPT_PACKAGE="${OPT_PACKAGE:-}" - -opt=$(getopt -n "$0" --options "hvl:f:t:a:g:k:" --longoptions "help,verbose,lang:,family:,test:,artifactsdir:,alias:,package:" -- "$@") -eval set -- "$opt" -while [[ $# -gt 0 ]]; do - case "$1" in - -k|--package) - OPT_PACKAGE="$2" - shift 2 - ;; - -g|--alias) - OPT_ALIAS="$2" - shift 2 - ;; - -a|--artifactsdir) - OPT_ARTIFACTS_DIR="$2" - shift 2 - ;; - -f|--family) - OPT_FAMILY="$2" - shift 2 - ;; - -l|--lang) - OPT_LANG="$2" - shift 2 - ;; - -v|--verbose) - DEBUG="-v" - shift - ;; - -h|--help) - msg_usage - exit 0 - ;; - --) - shift - ;; - *) - msg_usage - exit 1 - esac -done - -if [ -z "$OPT_ARTIFACTS_DIR" ] || [ -z "$OPT_LANG" ] || [ -z "$OPT_FAMILY" ]; then - echo "Use: $PROG -h for help." - exit 0 -fi - -debug "Alias: $OPT_ALIAS" -debug "Family: $OPT_FAMILY" -debug "Lang: $OPT_LANG" -debug "Artifacts dir: $OPT_ARTIFACTS_DIR" -debug "Package name: $OPT_PACKAGE" -STR_TEST_DASHED=$(echo "${OPT_PACKAGE}_${OPT_ALIAS}_${OPT_LANG}" | sed -e 's/\//-/g' -e 's/ /-/g') -debug "Log file: $STR_TEST_DASHED.log" - -clean_exit() { - rc=$?; - trap - SIGINT SIGTERM SIGABRT EXIT - echo "Run test $OPT_ALIAS: done. Test's exit code: $rc" - for pid in $(ps -o pid --no-headers --ppid $$); do - if [ -n "$(ps -p $pid -o pid=)" ]; then - kill -s HUP $pid - fi - done - local log_file_name="$STR_TEST_DASHED.log" - local log_file_path="$OPT_ARTIFACTS_DIR/$log_file_name" - local status - if [[ $rc -eq 127 ]]; then - status="ERROR" - elif grep -q "RESULT: WARN" "$log_file_path"; then - status="ERROR" - elif grep -q "RESULT: FAIL" "$log_file_path"; then - status="FAIL" - elif grep -q "RESULT: PASS" "$log_file_path"; then - status="PASS" - elif grep -q "FAIL" "$log_file_path"; then - status="FAIL" - elif grep -q "PASS" "$log_file_path"; then - status="PASS" - else - status="ERROR" - fi - echo "$status $OPT_ALIAS" >> "$OPT_ARTIFACTS_DIR/test.log" - mv "$log_file_path" "$OPT_ARTIFACTS_DIR/${status}-${log_file_name}" - local results="$OPT_ARTIFACTS_DIR/results.yml" - local result=$(echo $status | tr '[:upper:]' '[:lower:]') - test -f "$results" || echo 'results:' > "$results" - printf '%s\n' '' \ - "- test: $OPT_ALIAS" \ - " result: $result" \ - " logs:" \ - " - ${status}_${log_file_name}" \ - >> "$results" - exit 0 -} -trap clean_exit SIGINT SIGTERM SIGABRT EXIT - -cachedir=`pkg-config --variable cachedir fontconfig` -tmpconfd=`mktemp --tmpdir -d fontsci.XXXXXXXX` -conf=$(for i in `rpm -ql $OPT_PACKAGE | grep conf.d`; do - echo "$i" -done) -cat <<_EOF_> $tmpconfd/fonts.conf - - /usr/share/fonts - $conf - $cachedir - -_EOF_ -debug "Config: `cat $tmpconfd/fonts.conf`" - -mkdir -p "$OPT_ARTIFACTS_DIR" -export OUTPUTFILE="$(realpath "$OPT_ARTIFACTS_DIR")/$STR_TEST_DASHED-out.log" -logfile="$OPT_ARTIFACTS_DIR/$STR_TEST_DASHED.log" -logfile="$(realpath "$logfile")" -exec > >(tee -a "$logfile") 2>&1 - -debug "Check family assignment" -res=`FONTCONFIG_FILE=$tmpconfd/fonts.conf fc-match -f "%{family[0]}" :family=$OPT_ALIAS:lang=$OPT_LANG` -ret=0 -if [ "x$res" = "x$OPT_FAMILY" ]; then - echo "RESULT: PASS: $OPT_FAMILY was assigned to $OPT_ALIAS as expected" -else - echo "RESULT: FAIL: $OPT_FAMILY wasn't assigned to $OPT_ALIAS (actual result: $res)" - ret=1 -fi -rm -rf $tmpconfd - -exit $ret diff --git a/tests/roles/custom-test-fonts/files/run-lang-coverage-test b/tests/roles/custom-test-fonts/files/run-lang-coverage-test deleted file mode 100755 index 299f06b..0000000 --- a/tests/roles/custom-test-fonts/files/run-lang-coverage-test +++ /dev/null @@ -1,233 +0,0 @@ -#! /bin/bash -efu - -debug() { - if [ -n "$DEBUG" ]; then - echo "$*" >&2 - fi -} - -msg_usage() { - cat <<_EOF_ -Run language coverage test. - -Usage: -$PROG - -Options: --h, --help Display this help and exit --v, --verbose Turn on debug --l, --lang=LANG Test LANG language coverage (default: en) --p, --path=PATH Test fonts on PATH --n, --name=NAME Set NAME to store a log file. --a, --artifactsdir=DIR test environment dir to store artifacts --e, --exclude=FILE Exclude FILE to check. --i, --include=FILE Include File to check. -_EOF_ -} - -PROG="${PROG:-${0##*/}}" -DEBUG="${DEBUG:-}" -OPT_LANG="${OPT_LANG:-en}" -OPT_PATH=() -OPT_ARTIFACTS_DIR="${OPT_ARTIFACTS_DIR:-}" -OPT_EXCLUDE=() -OPT_INCLUDE=() -OPT_NAME="${OPT_NAME:-}" - -opt=$(getopt -n "$0" --options "hvl:p:n:a:e:i:" --longoptions "help,verbose,lang:,path:,name:,artifactsdir:,exclude:,include:" -- "$@") -eval set -- "$opt" -while [[ $# -gt 0 ]]; do - case "$1" in - -n|--name) - OPT_NAME="$2" - shift 2 - ;; - -i|--include) - OPT_INCLUDE+=("$2") - shift 2 - ;; - -e|--exclude) - OPT_EXCLUDE+=("$2") - shift 2 - ;; - -a|--artifactsdir) - OPT_ARTIFACTS_DIR="$2" - shift 2 - ;; - -p|--path) - OPT_PATH+=("$2") - shift 2 - ;; - -l|--lang) - OPT_LANG="$2" - shift 2 - ;; - -v|--verbose) - DEBUG="-v" - shift - ;; - -h|--help) - msg_usage - exit 0 - ;; - --) - shift - ;; - *) - msg_usage - exit 1 - esac -done - -if [ -z "$OPT_ARTIFACTS_DIR" ] || [ -z "$OPT_LANG" ] || [ -z "$OPT_PATH" ]; then - echo "Use: $PROG -h for help." - exit 0 -fi - -STR_TEST_DASHED=$(echo "${OPT_NAME:-$OPT_LANG}" | sed -e 's/\//-/g') - -clean_exit() { - rc=$?; - trap - SIGINT SIGTERM SIGABRT EXIT - echo "Run test $OPT_LANG: done. Test's exit code: $rc" - for pid in $(ps -o pid --no-headers --ppid $$); do - if [ -n "$(ps -p $pid -o pid=)" ]; then - kill -s HUP $pid - fi - done - local log_file_name="$STR_TEST_DASHED.log" - local log_file_path="$OPT_ARTIFACTS_DIR/$log_file_name" - local status - if [[ $rc -eq 127 ]]; then - status="ERROR" - elif grep -q "RESULT: WARN" "$log_file_path"; then - status="ERROR" - elif grep -q "RESULT: FAIL" "$log_file_path"; then - status="FAIL" - elif grep -q "RESULT: PASS" "$log_file_path"; then - status="PASS" - elif grep -q "WARN" "$log_file_path"; then - status="ERROR" - elif grep -q "FAIL" "$log_file_path"; then - status="FAIL" - elif grep -q "PASS" "$log_file_path"; then - status="PASS" - else - status="ERROR" - fi - echo "$status $OPT_LANG" >> "$OPT_ARTIFACTS_DIR/test.log" - mv "$log_file_path" "$OPT_ARTIFACTS_DIR/${status}-${log_file_name}" - local results="$OPT_ARTIFACTS_DIR/results.yml" - local result=$(echo $status | tr '[:upper:]' '[:lower:]') - test -f "$results" || echo 'results:' > "$results" - printf '%s\n' '' \ - "- test: $OPT_LANG" \ - " result: $result" \ - " logs:" \ - " - ${status}_${log_file_name}" \ - >> "$results" - exit 0 -} -trap clean_exit SIGINT SIGTERM SIGABRT EXIT - -mkdir -p "$OPT_ARTIFACTS_DIR" -export OUTPUTFILE="$(realpath "$OPT_ARTIFACTS_DIR")/$STR_TEST_DASHED-out.log" -logfile="$OPT_ARTIFACTS_DIR/$STR_TEST_DASHED.log" -logfile="$(realpath "$logfile")" -exec > >(tee -a "$logfile") 2>&1 - -expand_regex() { - local p ret=() - local regex="$1" - shift - debug "Expanding $regex" - for p; do - set +f - debug "$p: $regex" - (cd $p; - local x=$(find -regextype posix-egrep -regex "./$regex" -print|sed -e 's,^\./,,g') - debug "$x" - ret+=($x) - set -f - echo -n ${ret[@]} - ) - done - echo -n ${ret[@]} -} - -iv=() -ev=() -x=() -for p in ${OPT_INCLUDE[@]}; do - x=$(expand_regex $p ${OPT_PATH[@]}) - if [ "x$x" == "x" ]; then - echo "RESULT: WARN: No matches on \"$p\". maybe typo or something changed?" - continue - fi - iv=("${iv[@]}" "${x[@]}") -done -for p in ${OPT_EXCLUDE[@]}; do - x=$(expand_regex $p ${OPT_PATH[@]}) - if [ "x$x" == "x" ]; then - echo "RESULT: WARN: No matches on \"$p\". maybe typo or something changed?" - continue - fi - ev=("${ev[@]}" "${x[@]}") -done -OPT_EXCLUDE=(${ev[@]}) -OPT_INCLUDE=(${iv[@]}) - -debug "Path: ${OPT_PATH[@]}" -debug "Lang: $OPT_LANG" -debug "Artifacts dir: $OPT_ARTIFACTS_DIR" -debug "Exclude: ${#OPT_EXCLUDE[@]}: ${OPT_EXCLUDE[@]}" -debug "Include: ${#OPT_INCLUDE[@]}: ${OPT_INCLUDE[@]}" - -contains() { - local e match="$1" - shift - for e; do [[ "$e" == "$match" ]] && return 1; done - return 0 -} - -debug "Check language coverage" -ret=0 -set +f -for p in ${OPT_PATH[@]}; do - for i in `find $p -regex '.*/*\.\(t1\)?\(ttf\)?\(otf\)?\(ttc\)?\(pcf.*\)?\(pfa\)?'`; do - set -f - debug "$i" - if test -f $i; then - n=`basename $i` - set +e - contains "$n" "${OPT_EXCLUDE[@]}" - ret=$? - set -e - if [ $ret -eq 1 ]; then - debug "ignoring $i" - continue - fi - if [ ${#OPT_INCLUDE[@]} -ne 0 ]; then - set +e - contains "$n" "${OPT_INCLUDE[@]}" - ret=$? - set -e - if [ $ret -eq 0 ]; then - debug "$i isn't targeted file" - continue - fi - NOT_MATCHED=("${NOT_MATCHED[@]/$n}") - fi - debug " $i" - res=`fc-validate -l $OPT_LANG $i || :` - if echo $res | grep -q Missing; then - echo "RESULT: FAIL: $i doesn't satisfy $OPT_LANG language coverage." - ret=1 - else - echo "RESULT: PASS: $i satisfy $OPT_LANG language coverage." - fi - fi - done -done - -exit $ret diff --git a/tests/roles/custom-test-fonts/meta/main.yml b/tests/roles/custom-test-fonts/meta/main.yml deleted file mode 100644 index f6d273c..0000000 --- a/tests/roles/custom-test-fonts/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -dependencies: - - role: str-common-init diff --git a/tests/roles/custom-test-fonts/tasks/main.yml b/tests/roles/custom-test-fonts/tasks/main.yml deleted file mode 100644 index 2665795..0000000 --- a/tests/roles/custom-test-fonts/tasks/main.yml +++ /dev/null @@ -1,52 +0,0 @@ ---- - -- block: - - name: language coverage - environment: - LANG: "en_US.UTF-8" - script: run-lang-coverage-test --lang "{{ item }}" {% if coverage.values is not defined or coverage[item].path_prefix is not defined %} --path {{ path_prefix }} {% else %} {{ '--path "' + (coverage[item].path_prefix | join('" --path "')) + '"' }} {% endif %} --artifactsdir "{{ remote_artifacts }}" {{ "" if coverage.values is not defined or coverage[item].name is not defined else "--name " + coverage[item].name }} {{ "" if coverage.values is not defined or coverage[item].exclude is not defined else '--exclude "' + (coverage[item].exclude | join('" --exclude "')) + '"'}} {{ "" if coverage.values is not defined or coverage[item].include is not defined else '--include "' + (coverage[item].include | join('" --include "')) + '"'}} - with_items: - - "{{ coverage if coverage.keys is not defined else coverage.keys()|list }}" - - name: generic family assignment - environment: - LANG: "en_US.UTF-8" - when: families is defined - script: run-family-test --lang {{ item.lang }} --family '{{ item.family }}' --alias {{ item.alias }} --artifactsdir {{ remote_artifacts }} --package {{ package if item.package is not defined else item.package }} - with_items: - - "{{ families }}" - - - name: Collect all of failures into one file - shell: | - grep -v PASS "{{ remote_artifacts }}"/FAIL_*.log > "{{ remote_artifacts }}"/FAIL-all.log || : - - - name: Check the results - shell: | - log="{{ remote_artifacts }}/test.log" - if [ ! -f "$log" ]; then - echo ERROR - echo "Test results not found." 1>&2 - elif grep ^ERROR "$log" 1>&2; then - echo ERROR - elif grep ^FAIL "$log" 1>&2; then - echo FAIL - elif grep -q ^PASS "$log"; then - echo PASS - else - echo ERROR - echo "No test results found." 1>&2 - fi - register: test_results - - - name: Set role result - set_fact: - role_result: "{{ test_results.stdout }}" - role_message: "{{ test_results.stderr|d('test execution error.') }}" - role_result_failed: "{{ test_results.stdout != 'PASS' }}" - role_result_msg: "{{ test_results.stderr|d('test execution error.') }}" - - - include_role: - name: str-common-final - - - name: Validate the result - shell: echo "test_results.stdout" - failed_when: test_results.stdout != 'PASS' diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 484fca9..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,22 +0,0 @@ -- hosts: localhost - tags: - - classic - roles: - - role: custom-test-fonts - required_packages: - - linux-libertine-fonts - - linux-libertine-biolinum-fonts - path_prefix: /usr/share/fonts/linux-libertine - coverage: - en: - exclude: - - LinLibertine_I.otf - families: - - lang: en - alias: serif - family: Linux Libertine O - package: linux-libertine-fonts - - lang: en - alias: sans-serif - family: Linux Biolinum O - package: linux-libertine-biolinum-fonts