From 238c14d80fe6de1a99044604c4c59145dde94968 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 3 Nov 2020 06:43:10 -0500 Subject: [PATCH] import appstream-data-8-20200724.el8 --- .appstream-data.metadata | 6 +- .gitignore | 6 +- SOURCES/fedora-categories.xml | 1027 ++++++++++++++++++--------------- SOURCES/fedora-popular.xml | 14 +- SPECS/appstream-data.spec | 21 +- 5 files changed, 581 insertions(+), 493 deletions(-) diff --git a/.appstream-data.metadata b/.appstream-data.metadata index 7c27c1d..4902fba 100644 --- a/.appstream-data.metadata +++ b/.appstream-data.metadata @@ -1,2 +1,4 @@ -1f5e5c34af15ec7d180e6a4c5f5603b483ab75e0 SOURCES/rhel-8-20191129-icons.tar.gz -a8a6a3f8c4dc5007cf819469a0622879af380104 SOURCES/rhel-8-20191129.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 7204a5a..6af2f1b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ -SOURCES/rhel-8-20191129-icons.tar.gz -SOURCES/rhel-8-20191129.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/SOURCES/fedora-categories.xml b/SOURCES/fedora-categories.xml index 6793d41..ea5f39a 100644 --- a/SOURCES/fedora-categories.xml +++ b/SOURCES/fedora-categories.xml @@ -5,522 +5,595 @@ org.kde.amarok.desktop - Featured - - - - ardour5.desktop - - Featured - - - - audacity.desktop - - Featured - - - - banshee.desktop - - Featured - - - - brasero.desktop - - Featured - - - - easytag.desktop - - Featured - - - - org.gnome.Music.desktop - - Featured - - - - rhythmbox.desktop - - Featured - - - - com.rosegardenmusic.rosegarden.desktop - - Featured - - - - org.gnome.SoundJuicer.desktop - - Featured - - - - org.gnome.Devhelp.desktop - - Featured - - - - d-feet.desktop - - Featured - - - - eclipse.desktop - - Featured - - - - gitg.desktop - - Featured - - - - glade.desktop - - Featured - - - - monodevelop.desktop - - Featured - - - - org.gnome.gedit.desktop - - Featured - - - - celestia.desktop - - Featured - - - - 0ad.desktop - - Featured - - - - btanks.desktop - - Featured - - - - frozen-bubble.desktop - - Featured - - - - gnome-chess.desktop - - Featured - - - - gnome-mahjongg.desktop - - Featured - - - - gnome-mines.desktop - - Featured - - - - gnome-sudoku.desktop - - Featured - - - - gnome-tetravex.desktop - - Featured - - - - iagno.desktop - - Featured - - - - lightsoff.desktop - - Featured - - - - neverball.desktop - - Featured - - - - openarena.desktop - - Featured - - - - quadrapassel.desktop - - Featured - - - - redeclipse.desktop - - Featured - - - - sol.desktop - - Featured - - - - supertuxkart.desktop - - Featured - - - - swell-foop.desktop - - Featured - - - - tremulous.desktop - - Featured - - - - wesnoth.desktop - - Featured - - - - xonotic.desktop - - Featured - - - - blender.desktop - - Featured - - - - darktable.desktop - - Featured - - - - gimp.desktop - - Featured - - - - inkscape.desktop - - Featured - - - - libreoffice-draw.desktop - - Featured - - - - mypaint.desktop - - Featured - - - - org.gnome.font-viewer.desktop - - Featured - - - - scribus.desktop - - Featured - - - - shotwell.desktop - - Featured - - - - simple-scan.desktop - - Featured - - - - chromium-browser.desktop - - Featured - - - - org.gnome.Epiphany.desktop - - Featured - - - - firefox.desktop - - Featured - - - - org.gnome.Geary.desktop - - Featured - - - - mozilla-thunderbird.desktop - - Featured - - - - org.gnome.Polari.desktop - - Featured - - - - pidgin.desktop - - Featured - - - - transmission-gtk.desktop - - Featured - - - - vinagre.desktop - - Featured - - - - abiword.desktop - - Featured - - - - org.gnome.Evolution.desktop - - Featured - - - - org.gnome.Geary.desktop - - Featured - - - - gnucash.desktop - - Featured - - - - gnumeric.desktop - - Featured - - - - gramps.desktop - - Featured - - - - libreoffice-calc.desktop - - Featured - - - - libreoffice-impress.desktop - - Featured - - - - libreoffice-writer.desktop - - Featured - - - - lyx.desktop - - Featured - - - - www.octave.org-octave.desktop - - Featured - - - - saoimage.desktop - - Featured - - - - stellarium.desktop - - Featured - - - - org.gnome.DiskUtility.desktop - - Featured - - - - gparted.desktop - - Featured - - - - org.gnome.Boxes.desktop - - Featured - - - - virt-manager.desktop - - Featured - - - - org.gnome.bijiben.desktop - - Featured - - - - org.gnome.clocks.desktop - - Featured - - - - org.gnome.Documents.desktop - - Featured - - - - org.gnome.Photos.desktop - - Featured - - - - workrave.desktop - - Featured - - - - openshot-qt.desktop - + AudioVideo Featured org.gnome.Cheese.desktop + AudioVideo Featured org.gnome.Totem.desktop + AudioVideo Featured - pitivi.desktop + org.pitivi.Pitivi + AudioVideo Featured - vlc.desktop + org.videolan.vlc + AudioVideo + Featured + + + + ardour5.desktop + + AudioVideo + Featured + + + + org.audacityteam.Audacity + + AudioVideo + Featured + + + + brasero.desktop + + AudioVideo + Featured + + + + easytag.desktop + + AudioVideo + Featured + + + + org.gnome.Music.desktop + + AudioVideo + Featured + + + + rhythmbox.desktop + + AudioVideo + Featured + + + + com.rosegardenmusic.rosegarden.desktop + + AudioVideo + Featured + + + + org.gnome.SoundJuicer.desktop + + AudioVideo Featured org.gnome.Builder.desktop + Development + Featured + + + + org.gnome.Devhelp.desktop + + Development + Featured + + + + org.gnome.dfeet.desktop + + Development + Featured + + + + eclipse.desktop + + Development + Featured + + + + org.gnome.gitg + + Development + Featured + + + + glade.desktop + + Development + Featured + + + + monodevelop.desktop + + Development + Featured + + + + org.gnome.gedit.desktop + + Development + Featured + + + + celestia.desktop + + Science + Featured + + + + com.play0ad.zeroad + + Game + Featured + + + + btanks.desktop + + Game + Featured + + + + io.github.endless_sky.endless_sky + + Game + Featured + + + + frozen-bubble.desktop + + Game + Featured + + + + org.gnome.Chess + + Game + Featured + + + + org.gnome.Mahjongg + + Game + Featured + + + + org.gnome.Mines + + Game + Featured + + + + org.gnome.Sudoku + + Game + Featured + + + + org.gnome.Tetravex + + Game + Featured + + + + org.gnome.Reversi + + Game + Featured + + + + org.gnome.LightsOff + + Game + Featured + + + + neverball.desktop + + Game + Featured + + + + openarena.desktop + + Game + Featured + + + + org.gnome.Quadrapassel + + Game + Featured + + + + redeclipse.desktop + + Game + Featured + + + + sol.desktop + + Game + Featured + + + + supertuxkart.desktop + + Game + Featured + + + + org.gnome.SwellFoop.desktop + + Game + Featured + + + + tremulous.desktop + + Game + Featured + + + + org.wesnoth.Wesnoth.desktop + + Game + Featured + + + + xonotic.desktop + + Game + Featured + + + + org.blender.Blender + + Graphics + Featured + + + + darktable.desktop + + Graphics + Featured + + + + org.gimp.GIMP + + Graphics + Featured + + + + org.inkscape.Inkscape + + Graphics + Featured + + + + libreoffice-draw.desktop + + Graphics + Featured + + + + mypaint.desktop + + Graphics + Featured + + + + org.gnome.font-viewer.desktop + + Graphics + Featured + + + + scribus.desktop + + Graphics + Featured + + + + org.gnome.Shotwell.desktop + + Graphics + Featured + + + + simple-scan.desktop + + Graphics + Featured + + + + chromium-browser.desktop + + Network + Featured + + + + org.gnome.Epiphany.desktop + + Network + Featured + + + + firefox.desktop + + Network + Featured + + + + org.gnome.Geary.desktop + + Network + Featured + + + + mozilla-thunderbird.desktop + + Network + Featured + + + + org.gnome.Polari.desktop + + Network + Featured + + + + pidgin.desktop + + Network + Featured + + + + transmission-gtk.desktop + + Network + Featured + + + + vinagre.desktop + + Network + Featured + + + + abiword.desktop + + Office Featured homebank.desktop + Office Featured - endless-sky.desktop + org.gnome.Evolution.desktop + Office + Featured + + + + org.gnome.Geary.desktop + + Office + Featured + + + + org.gnucash.GnuCash + + Office + Featured + + + + gnumeric.desktop + + Office + Featured + + + + org.gramps.gramps + + Office + Featured + + + + libreoffice-calc.desktop + + Office + Featured + + + + libreoffice-impress.desktop + + Office + Featured + + + + libreoffice-writer.desktop + + Office + Featured + + + + lyx.desktop + + Office + Featured + + + + org.octave.Octave.desktop + + Education + Featured + + + + org.stellarium.Stellarium + + Education + Featured + + + + org.gnome.DiskUtility.desktop + + Utility + Featured + + + + gparted.desktop + + Utility + Featured + + + + org.gnome.Boxes.desktop + + Utility + Featured + + + + virt-manager.desktop + + Utility + Featured + + + + org.gnome.Notes.desktop + + Utility + Featured + + + + org.gnome.clocks.desktop + + Utility + Featured + + + + org.gnome.Documents.desktop + + Utility + Featured + + + + org.gnome.Photos.desktop + + Utility + Featured + + + + workrave.desktop + + Utility + Featured + + + + openshot-qt + + Utility Featured diff --git a/SOURCES/fedora-popular.xml b/SOURCES/fedora-popular.xml index fd9bc55..79c003f 100644 --- a/SOURCES/fedora-popular.xml +++ b/SOURCES/fedora-popular.xml @@ -3,7 +3,7 @@ - org.gnome.bijiben.desktop + org.gnome.Notes.desktop GnomeSoftware::popular @@ -15,19 +15,13 @@ - gnucash.desktop + org.gnucash.GnuCash GnomeSoftware::popular - gtg.desktop - - GnomeSoftware::popular - - - - inkscape.desktop + org.inkscape.Inkscape GnomeSoftware::popular @@ -81,7 +75,7 @@ - stellarium.desktop + org.stellarium.Stellarium GnomeSoftware::popular diff --git a/SPECS/appstream-data.spec b/SPECS/appstream-data.spec index 6a32d30..e38f8db 100644 --- a/SPECS/appstream-data.spec +++ b/SPECS/appstream-data.spec @@ -1,4 +1,4 @@ -%define gitdate 20191129 +%define gitdate 20200724 Summary: Cached AppStream metadata Name: appstream-data @@ -15,7 +15,12 @@ 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 # dnf reposync --setopt=*.module_hotfixes=1 --repo rhel-8-baseos -p mnt/ &> rhel-8-baseos.log # dnf reposync --setopt=*.module_hotfixes=1 --repo rhel-8-appstream -p mnt/ &> rhel-8-appstream.log @@ -48,20 +53,32 @@ 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 + * Fri Nov 29 2019 Richard Hughes 8-20191129 - Regenerate the RHEL metadata to include the latest evince changes - Resolves: #1768461