From a2ba9bfc61519542925704c890d6ef97fabdf1a6 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jul 28 2020 18:59:13 +0000 Subject: import appstream-data-8-20200724.el8 --- diff --git a/.appstream-data.metadata b/.appstream-data.metadata index 09a18c0..4902fba 100644 --- a/.appstream-data.metadata +++ b/.appstream-data.metadata @@ -1,2 +1,4 @@ -8717d3f969c3691a0425c150a03d1b226200625f SOURCES/rhel-8-20200630-icons.tar.gz -18abd8606245c48feadd169c71204ec70d99fa48 SOURCES/rhel-8-20200630.xml.gz +c01fab7926a0fd4f2b1196600b5dd1b2ad4b5425 SOURCES/epel-8-20200724-icons.tar.gz +6b08557071ff73d81cc4a4bbab5908ef3e21238f SOURCES/epel-8-20200724.xml.gz +d22ded3cd4471c1db4835f7cdf01a4b8317f69f1 SOURCES/rhel-8-20200724-icons.tar.gz +811c4fe5e36dde125dfb0d3a48a6fc9dce80192c SOURCES/rhel-8-20200724.xml.gz diff --git a/.gitignore b/.gitignore index 9799f38..6af2f1b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ -SOURCES/rhel-8-20200630-icons.tar.gz -SOURCES/rhel-8-20200630.xml.gz +SOURCES/epel-8-20200724-icons.tar.gz +SOURCES/epel-8-20200724.xml.gz +SOURCES/rhel-8-20200724-icons.tar.gz +SOURCES/rhel-8-20200724.xml.gz diff --git a/SPECS/appstream-data.spec b/SPECS/appstream-data.spec index aea4e70..e38f8db 100644 --- a/SPECS/appstream-data.spec +++ b/SPECS/appstream-data.spec @@ -1,4 +1,4 @@ -%define gitdate 20200630 +%define gitdate 20200724 Summary: Cached AppStream metadata Name: appstream-data @@ -15,6 +15,10 @@ Source5: https://raw.githubusercontent.com/hughsie/fedora-appstream/master/app Source6: https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/fedora-categories.xml Source7: https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/fedora-popular.xml +# extra applications not in RHEL +Source9: http://people.redhat.com/rhughes/metadata/epel-%{version}-%{gitdate}.xml.gz +Source10: http://people.redhat.com/rhughes/metadata/epel-%{version}-%{gitdate}-icons.tar.gz + # This is built using: # dnf install fuse-sshfs -y # sshfs user@host:/mnt/mirror/RHEL mnt @@ -49,20 +53,28 @@ for the GNOME and KDE software centers. %install -DESTDIR=%{buildroot} appstream-util install-origin rhel-8 %{SOURCE1} %{SOURCE2} +DESTDIR=%{buildroot} appstream-util install-origin rhel-%{version} %{SOURCE1} %{SOURCE2} +DESTDIR=%{buildroot} appstream-util install-origin epel-%{version} %{SOURCE9} %{SOURCE10} DESTDIR=%{buildroot} appstream-util install \ %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %files %attr(0644,root,root) %{_datadir}/app-info/xmls/* %{_datadir}/app-info/icons/rhel-%{version}/*/*.png +%{_datadir}/app-info/icons/epel-%{version}/*/*.png %dir %{_datadir}/app-info %dir %{_datadir}/app-info/icons %dir %{_datadir}/app-info/icons/rhel-%{version}/64x64 %dir %{_datadir}/app-info/icons/rhel-%{version}/128x128 +%dir %{_datadir}/app-info/icons/epel-%{version}/64x64 +%dir %{_datadir}/app-info/icons/epel-%{version}/128x128 %dir %{_datadir}/app-info/xmls %changelog +* Fri Jul 24 2020 Richard Hughes 8-20200724 +- Regenerate the RHEL metadata to include the EPEL apps too +- Resolves: #1844488 + * Tue Jun 30 2020 Richard Hughes 8-20200630 - Regenerate the RHEL metadata - Resolves: #1844488