From 5bef068930ce82aa5a0e60bff284dd25857a1cd7 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 6 Mar 2020 16:42:10 +0100 Subject: [PATCH] Replace path requires on dejavu with Requires: font(dejavusans) (rhbz#1731701) Adjust -demo font paths for F32+ font path changes (rhbz#1806272) --- sdljava.spec | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/sdljava.spec b/sdljava.spec index 2a3bd20..ecfa9eb 100644 --- a/sdljava.spec +++ b/sdljava.spec @@ -7,7 +7,7 @@ Name: sdljava Version: 0.9.1 -Release: 46%{?dist} +Release: 47%{?dist} Summary: Java binding to the SDL API License: LGPLv2+ URL: http://sdljava.sourceforge.net/ @@ -63,10 +63,7 @@ Javadoc for %{name}. Summary: Some examples for %{name} BuildArch: noarch Requires: %{name} = %{version}-%{release} -Requires: /usr/share/fonts/dejavu/DejaVuSans.ttf -Requires: /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf -Requires: /usr/share/fonts/dejavu/DejaVuSans-Oblique.ttf -Requires: /usr/share/fonts/dejavu/DejaVuSans-BoldOblique.ttf +Requires: font(dejavusans) Requires: javapackages-tools %description demo @@ -194,13 +191,13 @@ popd #test data cp -a testdata $RPM_BUILD_ROOT%{_datadir}/%{name} -ln -s ../../fonts/dejavu/DejaVuSans.ttf \ +ln -s ../../fonts/dejavu-sans-fonts/DejaVuSans.ttf \ $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arial.ttf -ln -s ../../fonts/dejavu/DejaVuSans-Bold.ttf \ +ln -s ../../fonts/dejavu-sans-fonts/DejaVuSans-Bold.ttf \ $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arialbd.ttf -ln -s ../../fonts/dejavu/DejaVuSans-Oblique.ttf \ +ln -s ../../fonts/dejavu-sans-fonts/DejaVuSans-Oblique.ttf \ $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/ariali.ttf -ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ +ln -s ../../fonts/dejavu-sans-fonts/DejaVuSans-BoldOblique.ttf \ $RPM_BUILD_ROOT%{_datadir}/%{name}/testdata/arialbi.ttf @@ -218,6 +215,10 @@ ln -s ../../fonts/dejavu/DejaVuSans-BoldOblique.ttf \ %changelog +* Fri Mar 6 2020 Hans de Goede - 0.9.1-47 +- Replace path requires on dejavu with Requires: font(dejavusans) (rhbz#1731701) +- Adjust -demo font paths for F32+ font path changes (rhbz#1806272) + * Thu Jan 30 2020 Fedora Release Engineering - 0.9.1-46 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild