Notification time stamped 2020-08-31 23:17:20 UTC
From c8f71ff58cacfedd68a8f084336e2a956a575654 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils(a)tiptoe.de>
Date: Aug 31 2020 23:13:36 +0000
Subject: Use correct font path in Fedora >= 32
Signed-off-by: Nils Philippsen <nils(a)tiptoe.de>
---
diff --git a/setBfree.spec b/setBfree.spec
index 75055da..7e1758d 100644
--- a/setBfree.spec
+++ b/setBfree.spec
@@ -1,6 +1,12 @@
+%if ! 0%{?fedora}%{?rhel} || 0%{?fedora} >= 32 || 0%{?rhel} >= 9
+%global fontfile %{_datadir}/fonts/bitstream-vera-sans-fonts/VeraBd.ttf
+%else
+%global fontfile %{_datadir}/fonts/bitstream-vera/VeraBd.ttf
+%endif
+
Name: setBfree
Version: 0.8.11
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: A DSP Tonewheel Organ emulator
License: GPLv2+ and GPLv3+ and ISC
@@ -68,12 +74,12 @@ CC=gcc; export CC
%set_build_flags
%make_build OPTIMIZATIONS="%{optflags} ${flags}" \
- PREFIX=%{_prefix} FONTFILE=%{_datadir}/fonts/bitstream-vera/VeraBd.ttf \
+ PREFIX=%{_prefix} FONTFILE=%{fontfile} \
lv2dir=%{_libdir}/lv2
%install
%make_install PREFIX=%{_prefix} \
- FONTFILE=%{_datadir}/fonts/bitstream-vera/VeraBd.ttf lv2dir=%{_libdir}/lv2
+ FONTFILE=%{fontfile} lv2dir=%{_libdir}/lv2
# install desktop file
desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
@@ -114,6 +120,9 @@ install -p -m644 doc/jboverdrive.1 doc/setBfree.1 doc/setBfreeUI.1
doc/x42-whirl
%license COPYING
%changelog
+* Tue Sep 01 2020 Nils Philippsen <nils(a)tiptoe.de> - 0.8.11-5
+- Use correct font path in Fedora >= 32
+
* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.8.11-4
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
https://src.fedoraproject.org/rpms/setBfree/c/c8f71ff58cacfedd68a8f084336...