From e6ef959ef052e34d7ff59daa1b6555bfbe63d5d1e178394b5c0d1d9bfba66cd1 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 3 Apr 2017 16:10:14 +0000 Subject: [PATCH] bsc#1031678 OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=125 --- ft2demos.changes | 6 ++ ft2demos.spec | 162 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 165 insertions(+), 3 deletions(-) diff --git a/ft2demos.changes b/ft2demos.changes index c48bf04..edde3b1 100644 --- a/ft2demos.changes +++ b/ft2demos.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 3 16:08:34 UTC 2017 - fstrba@suse.com + +- Package the tools separately to avoid unnecessary dependencies + on X11 and/or Qt5 (bsc#1031678) + ------------------------------------------------------------------- Sun Jan 1 12:04:31 UTC 2017 - idonmez@suse.com diff --git a/ft2demos.spec b/ft2demos.spec index a3be32c..5332dcd 100644 --- a/ft2demos.spec +++ b/ft2demos.spec @@ -31,25 +31,137 @@ Source1004: bnc629447_sigsegv31.ttf Source1013: bnc633938_badbdf.0 Source1015: bug-641580_CVE-2010-3311.cff Source1016: bug-647375_tt2.ttf +# silence our clamav check +NoSource: 1000 # PATCH-FIX-UPSTREAM overflow.patch -- I: Statement is overflowing a buffer Patch201: overflow.patch # PATCH-FIX-OPENSUSE don-t-mark-libpng-as-required-library.patch -- it is private in .pc Patch202: don-t-mark-libpng-as-required-library.patch Patch308961: bugzilla-308961-cmex-workaround.patch BuildRequires: libpng-devel +BuildRequires: pkgconfig BuildRequires: xorg-x11-devel BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(harfbuzz) +Requires: ftbench = %{version}-%{release} +Requires: ftdiff = %{version}-%{release} +Requires: ftdump = %{version}-%{release} +Requires: ftgamma = %{version}-%{release} +Requires: ftgrid = %{version}-%{release} +Requires: ftinspect = %{version}-%{release} +Requires: ftlint = %{version}-%{release} +Requires: ftmulti = %{version}-%{release} +Requires: ftstring = %{version}-%{release} +Requires: ftvalid = %{version}-%{release} +Requires: ftview = %{version}-%{release} Supplements: fonts-config Conflicts: dtc < 1.4.0 -# silence our clamav check -NoSource: 1000 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Freetype2 utilities and demo programs. +%package -n ftbench +Summary: Run FreeType benchmarks +Group: Productivity/Publishing/Other +Conflicts: %{name} < %{version}-%{release} + +%description -n ftbench +Run FreeType benchmarks +This tool is part of the FreeType project + +%package -n ftdiff +Summary: Compare font hinting modes +Group: Productivity/Publishing/Other +Conflicts: %{name} < %{version}-%{release} + +%description -n ftdiff +Compare font hinting modes +This tool is part of the FreeType project + +%package -n ftdump +Summary: Simple font dumper +Group: Productivity/Publishing/Other +Conflicts: %{name} < %{version}-%{release} + +%description -n ftdump +Simple font dumper +This tool is part of the FreeType project + +%package -n ftgamma +Summary: Screen gamma calibration helper +Group: Productivity/Publishing/Other +Conflicts: %{name} < %{version}-%{release} + +%description -n ftgamma +Screen gamma calibration helper +This tool is part of the FreeType project + +%package -n ftgrid +Summary: Simple glyph grid viewer +Group: Productivity/Publishing/Other +Conflicts: %{name} < %{version}-%{release} + +%description -n ftgrid +Simple glyph grid viewer +This tool is part of the FreeType project + +%package -n ftinspect +Summary: Shows how a font gets rendered by FreeType +Group: Productivity/Publishing/Other +Conflicts: %{name} < %{version}-%{release} + +%description -n ftinspect +Shows how a font gets rendered by FreeType, allowing +control over virtually all rendering parameters +This tool is part of the FreeType project + +%package -n ftlint +Summary: Simple font tester +Group: Productivity/Publishing/Other +Conflicts: %{name} < %{version}-%{release} + +%description -n ftlint +Simple font tester +This tool is part of the FreeType project + +%package -n ftmulti +Summary: Multiple masters font viewer +Group: Productivity/Publishing/Other +Conflicts: %{name} < %{version}-%{release} + +%description -n ftmulti +Multiple masters font viewer +This tool is part of the FreeType project + +%package -n ftstring +Summary: String viewer +Group: Productivity/Publishing/Other +Conflicts: %{name} < %{version}-%{release} + +%description -n ftstring +String viewer +This tool is part of the FreeType project + +%package -n ftvalid +Summary: Layout table validator +Group: Productivity/Publishing/Other +Conflicts: %{name} < %{version}-%{release} + +%description -n ftvalid +Layout table validator +This tool is part of the FreeType project + +%package -n ftview +Summary: Simple glyph viewer +Group: Productivity/Publishing/Other +Conflicts: %{name} < %{version}-%{release} + +%description -n ftview +Simple glyph viewer +This tool is part of the FreeType project + %prep %setup -q -n freetype-%{freetype_version} -b 1 @@ -92,6 +204,50 @@ popd %files %defattr(-,root,root) -%{_bindir}/ft* +%doc README + +%files -n ftbench +%defattr(-,root,root) +%{_bindir}/ftbench + +%files -n ftdiff +%defattr(-,root,root) +%{_bindir}/ftdiff + +%files -n ftdump +%defattr(-,root,root) +%{_bindir}/ftdump + +%files -n ftgamma +%defattr(-,root,root) +%{_bindir}/ftgamma + +%files -n ftgrid +%defattr(-,root,root) +%{_bindir}/ftgrid + +%files -n ftinspect +%defattr(-,root,root) +%{_bindir}/ftinspect + +%files -n ftlint +%defattr(-,root,root) +%{_bindir}/ftlint + +%files -n ftmulti +%defattr(-,root,root) +%{_bindir}/ftmulti + +%files -n ftstring +%defattr(-,root,root) +%{_bindir}/ftstring + +%files -n ftvalid +%defattr(-,root,root) +%{_bindir}/ftvalid + +%files -n ftview +%defattr(-,root,root) +%{_bindir}/ftview %changelog