Fix SPDX license tags and use the new appstream file paths
This commit is contained in:
parent
6e85fc6fe4
commit
0f05a9d91d
@ -5,9 +5,9 @@ Summary: Cached AppStream metadata
|
|||||||
Name: appstream-data
|
Name: appstream-data
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 10
|
Version: 10
|
||||||
Release: %{gitdate}%{?dist}
|
Release: %{gitdate}.1%{?dist}
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
License: CC0 and CC-BY and CC-BY-SA and GFDL
|
License: CC0-1.0 AND CC-BY-1.0 AND CC-BY-SA-1.0 AND GFDL-1.1-or-later
|
||||||
URL: http://people.redhat.com/rhughes/metadata/
|
URL: http://people.redhat.com/rhughes/metadata/
|
||||||
Source1: http://people.redhat.com/rhughes/metadata/rhel-%{version}-%{gitdate}.xml.gz
|
Source1: http://people.redhat.com/rhughes/metadata/rhel-%{version}-%{gitdate}.xml.gz
|
||||||
Source2: http://people.redhat.com/rhughes/metadata/rhel-%{version}-%{gitdate}-icons.tar.gz
|
Source2: http://people.redhat.com/rhughes/metadata/rhel-%{version}-%{gitdate}-icons.tar.gz
|
||||||
@ -44,26 +44,32 @@ DESTDIR=%{buildroot} appstream-util install-origin rhel-%{version} %{SOURCE1} %{
|
|||||||
%if 0%{?enable_epel}
|
%if 0%{?enable_epel}
|
||||||
DESTDIR=%{buildroot} appstream-util install-origin epel-%{version} %{SOURCE9} %{SOURCE10}
|
DESTDIR=%{buildroot} appstream-util install-origin epel-%{version} %{SOURCE9} %{SOURCE10}
|
||||||
%endif
|
%endif
|
||||||
DESTDIR=%{buildroot} appstream-util install \
|
DESTDIR=%{buildroot} appstream-util install %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}
|
||||||
%{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}
|
|
||||||
|
# Move to the "correct" path for appstream 0.16 / 1.0
|
||||||
|
mv %{buildroot}%{_datadir}/app-info %{buildroot}%{_datadir}/swcatalog
|
||||||
|
mv %{buildroot}%{_datadir}/swcatalog/xmls %{buildroot}%{_datadir}/swcatalog/xml
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%attr(0644,root,root) %{_datadir}/app-info/xmls/*
|
%attr(0644,root,root) %{_datadir}/swcatalog/xml/*
|
||||||
%{_datadir}/app-info/icons/rhel-%{version}/*/*.png
|
%{_datadir}/swcatalog/icons/rhel-%{version}/*/*.png
|
||||||
%if 0%{?enable_epel}
|
%if 0%{?enable_epel}
|
||||||
%{_datadir}/app-info/icons/epel-%{version}/*/*.png
|
%{_datadir}/swcatalog/icons/epel-%{version}/*/*.png
|
||||||
%endif
|
%endif
|
||||||
%dir %{_datadir}/app-info
|
%dir %{_datadir}/swcatalog
|
||||||
%dir %{_datadir}/app-info/icons
|
%dir %{_datadir}/swcatalog/icons
|
||||||
%dir %{_datadir}/app-info/icons/rhel-%{version}/64x64
|
%dir %{_datadir}/swcatalog/icons/rhel-%{version}/64x64
|
||||||
%dir %{_datadir}/app-info/icons/rhel-%{version}/128x128
|
%dir %{_datadir}/swcatalog/icons/rhel-%{version}/128x128
|
||||||
%if 0%{?enable_epel}
|
%if 0%{?enable_epel}
|
||||||
%dir %{_datadir}/app-info/icons/epel-%{version}/64x64
|
%dir %{_datadir}/swcatalog/icons/epel-%{version}/64x64
|
||||||
%dir %{_datadir}/app-info/icons/epel-%{version}/128x128
|
%dir %{_datadir}/swcatalog/icons/epel-%{version}/128x128
|
||||||
%endif
|
%endif
|
||||||
%dir %{_datadir}/app-info/xmls
|
%dir %{_datadir}/swcatalog/xml
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Mar 28 2024 Richard Hughes <richard@hughsie.com> 1:10-20240326.1
|
||||||
|
- Fix SPDX license tags and use the new appstream file paths
|
||||||
|
|
||||||
* Tue Mar 26 2024 Richard Hughes <richard@hughsie.com> 1:10-20240326
|
* Tue Mar 26 2024 Richard Hughes <richard@hughsie.com> 1:10-20240326
|
||||||
- New metadata version
|
- New metadata version
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user