diff --git a/blender.spec b/blender.spec index d53bc41..ed1ac4d 100644 --- a/blender.spec +++ b/blender.spec @@ -113,9 +113,13 @@ BuildRequires: libvorbis-devel BuildRequires: fontpackages-devel BuildRequires: freetype-devel +%if 0%{?fedora} || 0%{?rhel} >= 8 + # Appstream stuff BuildRequires: libappstream-glib +%endif + Requires: google-droid-sans-fonts Requires: %{name}-fonts = %{?epoch:%{epoch}:}%{version}-%{release} Requires: fontpackages-filesystem @@ -234,9 +238,13 @@ rm -rf %{buildroot}%{_docdir}/%{name}/* mkdir -p %{buildroot}%{macrosdir} sed -e 's/@VERSION@/%{blender_api}/g' %{SOURCE10} > %{buildroot}%{macrosdir}/macros.%{name} +%if 0%{?fedora} || 0%{?rhel} >= 8 + # AppData -install -p -m 644 -D %{SOURCE6} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml -install -p -m 644 -D %{SOURCE2} %{buildroot}%{_datadir}/metainfo/%{name}-fonts.metainfo.xml +install -p -m 644 -D %{SOURCE6} %{buildroot}%{_metainfodir}/%{name}.appdata.xml +install -p -m 644 -D %{SOURCE2} %{buildroot}%{_metainfodir}/%{name}-fonts.metainfo.xml + +%endif # Localization %find_lang %{name} @@ -248,9 +256,13 @@ rm -fr %{buildroot}%{_datadir}/%{blender_api}/locale/languages find %{buildroot}%{_datadir}/%{name}/%{blender_api}/scripts -name "*.py" -exec chmod 755 {} \; #find %{buildroot}%{_datadir}/%{name}/scripts -type f -exec sed -i -e 's/\r$//g' {} \; +%if 0%{?fedora} || 0%{?rhel} >= 8 + %check -appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml -appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}-fonts.metainfo.xml +appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/%{name}.appdata.xml +appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/%{name}-fonts.metainfo.xml + +%endif %if 0%{?rhel} == 7 @@ -280,13 +292,15 @@ fi %doc release/text/readme.html %{_bindir}/%{name} %{_bindir}/%{name}-thumbnailer.py -%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/%{name}/ %{_datadir}/icons/hicolor/*/apps/%{name}*.* %{_datadir}/mime/packages/%{name}.xml %{_datadir}/thumbnailers/%{name}.thumbnailer %{_mandir}/man1/%{name}.* +%if 0%{?fedora} || 0%{?rhel} >= 8 +%{_metainfodir}/%{name}.appdata.xml +%endif #%%files -n %%{name}player #%%license COPYING @@ -300,8 +314,10 @@ fi %files fonts %license release/datafiles/LICENSE-*.ttf.txt -%{_datadir}/metainfo/%{name}-fonts.metainfo.xml %{_fontbasedir}/%{name}/ +%if 0%{?fedora} || 0%{?rhel} >= 8 +%{_metainfodir}/%{name}-fonts.metainfo.xml +%endif %changelog * Sun Aug 18 2019 Simone Caronni - 1:2.80-5