| |
@@ -1,5 +1,5 @@
|
| |
Version: 4.0.0
|
| |
- Release: 4%{?dist}
|
| |
+ Release: 5%{?dist}
|
| |
URL: https://google.github.io/material-design-icons/
|
| |
|
| |
%global fontlicense ASL 2.0
|
| |
@@ -8,6 +8,7 @@
|
| |
%global fontfamily Material Icons
|
| |
%global fontsummary Google material design system icons
|
| |
%global fonts font/*.otf font/*.ttf
|
| |
+ %global fontorg com.google
|
| |
%global fontconfs %{SOURCE1}
|
| |
|
| |
%global fontdescription %{expand:
|
| |
@@ -17,7 +18,7 @@
|
| |
Source0: https://github.com/google/material-design-icons/archive/%{version}/material-design-icons-%{version}.tar.gz
|
| |
Source1: 65-%{fontpkgname}.conf
|
| |
|
| |
- BuildRequires: libappstream-glib
|
| |
+ BuildRequires: appstream
|
| |
|
| |
%fontpkg
|
| |
|
| |
@@ -29,7 +30,7 @@
|
| |
|
| |
%install
|
| |
%fontinstall
|
| |
- metainfo=%{buildroot}%{_metainfodir}/org.fedoraproject.%{name}.metainfo.xml
|
| |
+ metainfo=%{buildroot}%{_metainfodir}/%{fontorg}.%{name}.metainfo.xml
|
| |
|
| |
# The Fedora font macros generate invalid metainfo; see bz 1943727.
|
| |
sed -e 's,ASL 2\.0,Apache-2.0,' \
|
| |
@@ -38,7 +39,7 @@
|
| |
-e 's,<font></font>,<font>Material Icons Outlined Regular</font>\n <font>Material Icons Round Regular</font>\n <font>Material Icons Sharp Regular</font>\n <font>Material Icons Two Tone Regular</font>,' \
|
| |
-i $metainfo
|
| |
|
| |
- appstream-util validate-relax --nonet $metainfo
|
| |
+ appstreamcli validate --no-net $metainfo
|
| |
|
| |
%check
|
| |
# FIXME: This should not be necessary
|
| |
@@ -49,6 +50,10 @@
|
| |
%fontfiles
|
| |
|
| |
%changelog
|
| |
+ * Fri Jan 14 2022 Jerry James <loganjerry@gmail.com> - 4.0.0-5
|
| |
+ - Add a font organization
|
| |
+ - Validate metadata with appstream
|
| |
+
|
| |
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.0-4
|
| |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
| |
|
| |
Hi, I cherry-picked your last commit into f35 branch and did a local mockbuild to see if it build without errors.