diff --git a/61-oxygen-mono.conf b/61-oxygen-mono.conf index 835ed38..5659008 100644 --- a/61-oxygen-mono.conf +++ b/61-oxygen-mono.conf @@ -1,5 +1,5 @@ - + monospace diff --git a/61-oxygen-sans.conf b/61-oxygen-sans.conf index 2e5fc2f..2d97aec 100644 --- a/61-oxygen-sans.conf +++ b/61-oxygen-sans.conf @@ -1,5 +1,5 @@ - + sans-serif diff --git a/oxygen-fonts.spec b/oxygen-fonts.spec index bc7f41d..7e74ee1 100644 --- a/oxygen-fonts.spec +++ b/oxygen-fonts.spec @@ -2,8 +2,8 @@ %global fontconf 61-%{fontname} Name: %{fontname}-fonts -Version: 5.4.3 -Release: 14%{?dist} +Version: 5.4.3 +Release: 15%{?dist} Summary: Oxygen fonts created by the KDE Community # See LICENSE-GPL+FE for details about the exception @@ -63,15 +63,12 @@ developing applications that use %{name}. %setup -q -n %{name}-%{version} %build -mkdir %{_target_platform} -pushd %{_target_platform} -%{cmake_kf5} .. %{?fontforge} -DOXYGEN_FONT_INSTALL_DIR=%{_fontdir} -popd +%{cmake_kf5} %{?fontforge} -DOXYGEN_FONT_INSTALL_DIR=%{_fontdir} +%cmake_build -make %{?_smp_mflags} -C %{_target_platform} %install -make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +%cmake_install install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ %{buildroot}%{_fontconfig_confdir} @@ -99,6 +96,10 @@ ln -s %{_fontconfig_templatedir}/%{fontconf}-mono.conf \ %{_libdir}/cmake/OxygenFont/ %changelog +* Wed Aug 12 2020 Parag Nemade - 5.4.3-15 +- Update for new cmake macros (out of source builds) +- Update to use new DTD id in fontconfig files + * Sat Aug 01 2020 Fedora Release Engineering - 5.4.3-14 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild