Compare commits

...

No commits in common. "c8" and "imports/c9-beta/appstream-data-9-20220302.el9_0.1" have entirely different histories.

6 changed files with 284 additions and 109 deletions

View File

@ -1,4 +1,4 @@
c01fab7926a0fd4f2b1196600b5dd1b2ad4b5425 SOURCES/epel-8-20200724-icons.tar.gz 945a81c837e7ceb6de59b5545f2d26e0cdd2a953 SOURCES/epel-9-20220302-icons.tar.gz
6b08557071ff73d81cc4a4bbab5908ef3e21238f SOURCES/epel-8-20200724.xml.gz df43dcab6d05e249072cf02f1694b481de44c8ac SOURCES/epel-9-20220302.xml.gz
d22ded3cd4471c1db4835f7cdf01a4b8317f69f1 SOURCES/rhel-8-20200724-icons.tar.gz 1fd191053f827964a4699f8cfc64ad6f53cdc1a9 SOURCES/rhel-9-20220302-icons.tar.gz
811c4fe5e36dde125dfb0d3a48a6fc9dce80192c SOURCES/rhel-8-20200724.xml.gz 377af4c8f51274c470702e41734b8b016cef47b5 SOURCES/rhel-9-20220302.xml.gz

8
.gitignore vendored
View File

@ -1,4 +1,4 @@
SOURCES/epel-8-20200724-icons.tar.gz SOURCES/epel-9-20220302-icons.tar.gz
SOURCES/epel-8-20200724.xml.gz SOURCES/epel-9-20220302.xml.gz
SOURCES/rhel-8-20200724-icons.tar.gz SOURCES/rhel-9-20220302-icons.tar.gz
SOURCES/rhel-8-20200724.xml.gz SOURCES/rhel-9-20220302.xml.gz

View File

@ -38,7 +38,7 @@
</categories> </categories>
</component> </component>
<component type="desktop"> <component type="desktop">
<id>ardour5.desktop</id> <id>ardour6.desktop</id>
<categories> <categories>
<category>AudioVideo</category> <category>AudioVideo</category>
<category>Featured</category> <category>Featured</category>
@ -129,7 +129,7 @@
</categories> </categories>
</component> </component>
<component type="desktop"> <component type="desktop">
<id>glade.desktop</id> <id>org.gnome.Glade</id>
<categories> <categories>
<category>Development</category> <category>Development</category>
<category>Featured</category> <category>Featured</category>
@ -163,13 +163,6 @@
<category>Featured</category> <category>Featured</category>
</categories> </categories>
</component> </component>
<component type="desktop">
<id>btanks.desktop</id>
<categories>
<category>Game</category>
<category>Featured</category>
</categories>
</component>
<component type="desktop"> <component type="desktop">
<id>io.github.endless_sky.endless_sky</id> <id>io.github.endless_sky.endless_sky</id>
<categories> <categories>
@ -339,7 +332,7 @@
</categories> </categories>
</component> </component>
<component type="desktop"> <component type="desktop">
<id>mypaint.desktop</id> <id>org.mypaint.mypaint</id>
<categories> <categories>
<category>Graphics</category> <category>Graphics</category>
<category>Featured</category> <category>Featured</category>
@ -584,14 +577,14 @@
</categories> </categories>
</component> </component>
<component type="desktop"> <component type="desktop">
<id>workrave.desktop</id> <id>org.workrave.workrave</id>
<categories> <categories>
<category>Utility</category> <category>Utility</category>
<category>Featured</category> <category>Featured</category>
</categories> </categories>
</component> </component>
<component type="desktop"> <component type="desktop">
<id>openshot-qt</id> <id>org.openshot.OpenShot</id>
<categories> <categories>
<category>Utility</category> <category>Utility</category>
<category>Featured</category> <category>Featured</category>

View File

@ -32,12 +32,6 @@
<kudo>GnomeSoftware::popular</kudo> <kudo>GnomeSoftware::popular</kudo>
</kudos> </kudos>
</component> </component>
<component type="desktop">
<id>musique.desktop</id>
<kudos>
<kudo>GnomeSoftware::popular</kudo>
</kudos>
</component>
<component type="desktop"> <component type="desktop">
<id>org.gnome.Geary.desktop</id> <id>org.gnome.Geary.desktop</id>
<kudos> <kudos>

View File

@ -1,52 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<components version="0.8" origin=""> <components version="0.8" origin="">
<component type="source"> <component type="generic">
<id>adobe-release-x86_64</id> <id>adobe-release-x86_64</id>
<pkgname>adobe-release-x86_64</pkgname> <pkgname>adobe-release-x86_64</pkgname>
<metadata_license>CC0-1.0</metadata_license> <metadata_license>CC0-1.0</metadata_license>
<name>Adobe</name> <name>Adobe</name>
<summary>Adobe Repository Configuration</summary> <summary>Adobe Repository Configuration</summary>
</component> </component>
<component type="source"> <component type="generic">
<id>bjnplugin</id> <id>livna-release</id>
<pkgname>bjnplugin</pkgname> <pkgname>livna-release</pkgname>
<metadata_license>CC0-1.0</metadata_license> <metadata_license>CC0-1.0</metadata_license>
<name>Blue Jeans</name> <name>Livna</name>
<summary>Blue Jeans Repository Configuration</summary> <summary>Livna Repository Configuration</summary>
</component> </component>
<component type="source"> <component type="generic">
<id>google-chrome</id> <id>rpmfusion-free-release</id>
<pkgname>google-chrome</pkgname> <pkgname>rpmfusion-free-release</pkgname>
<metadata_license>CC0-1.0</metadata_license> <metadata_license>CC0-1.0</metadata_license>
<name>Google Chrome</name> <name>RPM Fusion Free</name>
<summary>Google Chrome Repository Configuration</summary> <summary>RPM Fusion Repository Configuration</summary>
</component> </component>
<component type="source"> <component type="generic">
<id>google-earth-stable</id> <id>rpmfusion-nonfree-release</id>
<pkgname>google-earth-stable</pkgname> <pkgname>rpmfusion-nonfree-release</pkgname>
<metadata_license>CC0-1.0</metadata_license> <metadata_license>CC0-1.0</metadata_license>
<name>Google Earth</name> <name>RPM Fusion Non-Free</name>
<summary>Google Earth Repository Configuration</summary> <summary>RPM Fusion Repository Configuration</summary>
</component>
<component type="source">
<id>google-musicmanager-beta</id>
<pkgname>google-musicmanager-beta</pkgname>
<metadata_license>CC0-1.0</metadata_license>
<name>Google MusicManager</name>
<summary>Google MusicManager Repository Configuration</summary>
</component>
<component type="source">
<id>google-talkplugin</id>
<pkgname>google-talkplugin</pkgname>
<metadata_license>CC0-1.0</metadata_license>
<name>Google Talk</name>
<summary>Google Talk Repository Configuration</summary>
</component>
<component type="source">
<id>nautilus-dropbox</id>
<pkgname>nautilus-dropbox</pkgname>
<metadata_license>CC0-1.0</metadata_license>
<name>Dropbox</name>
<summary>Dropbox Repository Configuration</summary>
</component> </component>
</components> </components>

View File

@ -1,9 +1,11 @@
%define gitdate 20200724 %define gitdate 20220302
%global enable_epel 1
Summary: Cached AppStream metadata Summary: Cached AppStream metadata
Name: appstream-data Name: appstream-data
Version: 8 Epoch: 1
Release: %{gitdate}%{?dist} Version: 9
Release: %{gitdate}%{?dist}.1
BuildArch: noarch BuildArch: noarch
License: CC0 and CC-BY and CC-BY-SA and GFDL License: CC0 and CC-BY and CC-BY-SA and GFDL
URL: http://people.redhat.com/rhughes/metadata/ URL: http://people.redhat.com/rhughes/metadata/
@ -16,34 +18,17 @@ Source6: https://raw.githubusercontent.com/hughsie/fedora-appstream/master/app
Source7: https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/fedora-popular.xml Source7: https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/fedora-popular.xml
# extra applications not in RHEL # extra applications not in RHEL
%if 0%{?enable_epel}
Source9: http://people.redhat.com/rhughes/metadata/epel-%{version}-%{gitdate}.xml.gz 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 Source10: http://people.redhat.com/rhughes/metadata/epel-%{version}-%{gitdate}-icons.tar.gz
%endif
# This is built using: # This is built using:
# dnf install fuse-sshfs -y # export ARCHIVE_PATH=/run/media/hughsie/Backup/mirror
# sshfs user@host:/mnt/mirror/RHEL mnt # dnf reposync --setopt=*.module_hotfixes=1 --repo rhel-9-baseos -p ${ARCHIVE_PATH}/RHEL/ &> rhel-9-baseos.log
# dnf reposync --setopt=*.module_hotfixes=1 --repo rhel-8-baseos -p mnt/ &> rhel-8-baseos.log # dnf reposync --setopt=*.module_hotfixes=1 --repo rhel-9-appstream -p ${ARCHIVE_PATH}/RHEL/ &> rhel-9-appstream.log
# dnf reposync --setopt=*.module_hotfixes=1 --repo rhel-8-appstream -p mnt/ &> rhel-8-appstream.log # dnf reposync --setopt=*.module_hotfixes=1 --repo rhel-9-crb -p ${ARCHIVE_PATH}/RHEL/ &> rhel-9-crb.log
# dnf reposync --setopt=*.module_hotfixes=1 --repo rhel-8-crb -p mnt/ &> rhel-8-crb.log # https://github.com/hughsie/appstream-scripts/blob/master/rhel/rhel-9-candidate.sh
# https://github.com/hughsie/appstream-scripts/blob/master/rhel/rhel-8.1-candidate.sh
#
# [rhel-8-baseos]
# name=Nightly Packages for Enterprise Linux 8
# baseurl=http://download.eng.brq.redhat.com/composes/nightly/latest-RHEL-8/compose/BaseOS/x86_64/os/
# enabled=1
# gpgcheck=0
#
# [rhel-8-appstream]
# name=Nightly Packages for Enterprise Linux 8
# baseurl=http://download.eng.brq.redhat.com/composes/nightly/latest-RHEL-8/compose/AppStream/x86_64/os/
# enabled=1
# gpgcheck=0
#
# [rhel-8-crb]
# name=Nightly Packages for Enterprise Linux 8
# baseurl=http://download.eng.brq.redhat.com/composes/nightly/latest-RHEL-8/compose/CRB/x86_64/os/
# enabled=1
# gpgcheck=0
BuildRequires: libappstream-glib BuildRequires: libappstream-glib
@ -54,46 +39,270 @@ for the GNOME and KDE software centers.
%install %install
DESTDIR=%{buildroot} appstream-util install-origin rhel-%{version} %{SOURCE1} %{SOURCE2} DESTDIR=%{buildroot} appstream-util install-origin rhel-%{version} %{SOURCE1} %{SOURCE2}
%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
DESTDIR=%{buildroot} appstream-util install \ DESTDIR=%{buildroot} appstream-util install \
%{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}
%files %files
%attr(0644,root,root) %{_datadir}/app-info/xmls/* %attr(0644,root,root) %{_datadir}/app-info/xmls/*
%{_datadir}/app-info/icons/rhel-%{version}/*/*.png %{_datadir}/app-info/icons/rhel-%{version}/*/*.png
%if 0%{?enable_epel}
%{_datadir}/app-info/icons/epel-%{version}/*/*.png %{_datadir}/app-info/icons/epel-%{version}/*/*.png
%endif
%dir %{_datadir}/app-info %dir %{_datadir}/app-info
%dir %{_datadir}/app-info/icons %dir %{_datadir}/app-info/icons
%dir %{_datadir}/app-info/icons/rhel-%{version}/64x64 %dir %{_datadir}/app-info/icons/rhel-%{version}/64x64
%dir %{_datadir}/app-info/icons/rhel-%{version}/128x128 %dir %{_datadir}/app-info/icons/rhel-%{version}/128x128
%if 0%{?enable_epel}
%dir %{_datadir}/app-info/icons/epel-%{version}/64x64 %dir %{_datadir}/app-info/icons/epel-%{version}/64x64
%dir %{_datadir}/app-info/icons/epel-%{version}/128x128 %dir %{_datadir}/app-info/icons/epel-%{version}/128x128
%endif
%dir %{_datadir}/app-info/xmls %dir %{_datadir}/app-info/xmls
%changelog %changelog
* Fri Jul 24 2020 Richard Hughes <richard@hughsie.com> 8-20200724 * Thu Mar 03 2022 Richard Hughes <richard@hughsie.com> 1:9-20220302
- Regenerate the RHEL metadata to include the EPEL apps too - New metadata version
- Resolves: #1844488 - Resolves: rhbz#1994416
* Tue Jun 30 2020 Richard Hughes <richard@hughsie.com> 8-20200630 * Mon Nov 01 2021 Richard Hughes <richard@hughsie.com> 1:9-20211101
- Regenerate the RHEL metadata - New metadata version
- Resolves: #1844488 - Resolves: rhbz#2005266
* Fri Nov 29 2019 Richard Hughes <richard@hughsie.com> 8-20191129 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:9-20210805.1
- Regenerate the RHEL metadata to include the latest evince changes - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
- Resolves: #1768461 Related: rhbz#1991688
* Mon Aug 05 2019 Richard Hughes <richard@hughsie.com> 8-20190805 * Thu Aug 05 2021 Richard Hughes <richard@hughsie.com> 1:9-20210805
- Regenerate the RHEL metadata to include the latest cockpit changes - New metadata version
- Resolves: #1673011 - Resolves: rhbz#1926838
* Fri Jul 19 2019 Richard Hughes <richard@hughsie.com> 8-20190719 * Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 34-2
- Regenerate the RHEL metadata - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
- Resolves: #1673011
* Fri Jul 20 2018 Richard Hughes <richard@hughsie.com> 8-20180721 * Wed Mar 31 2021 Richard Hughes <richard@hughsie.com> 34-1
- Regenerate the RHEL metadata using rhel-8.0-appstream - New metadata version
* Thu Jul 19 2018 Richard Hughes <richard@hughsie.com> 8-20180720 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 33-2
- Regenerate the RHEL metadata using rhel-8.0-candidate - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Thu Oct 15 2020 Richard Hughes <richard@hughsie.com> 33-1
- New metadata version
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 32-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Apr 13 2020 Richard Hughes <richard@hughsie.com> 32-6
- New metadata version
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 32-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jan 02 2020 Kalev Lember <klember@redhat.com> - 32-4
- New metadata version
* Mon Oct 14 2019 Kalev Lember <klember@redhat.com> - 32-3
- New metadata version
* Thu Sep 19 2019 Kalev Lember <klember@redhat.com> - 32-2
- Update webapps.xml
* Thu Sep 19 2019 Kalev Lember <klember@redhat.com> - 32-1
- New metadata version
* Wed Sep 18 2019 Kalev Lember <klember@redhat.com> - 31-4
- Update categories and popular xmls with renamed app ids
* Wed Sep 18 2019 Kalev Lember <klember@redhat.com> - 31-3
- New metadata version
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 31-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Jul 12 2019 Richard Hughes <richard@hughsie.com> 31-1
- New metadata version
* Thu Apr 18 2019 Kalev Lember <klember@redhat.com> - 30-5
- New metadata version
* Thu Apr 11 2019 Kalev Lember <klember@redhat.com> - 30-4
- New metadata version
- Update changed app IDs in categories and popular xml files
* Mon Apr 01 2019 Kalev Lember <klember@redhat.com> - 30-3
- New metadata version
- Update fedora-categories.xml and fedora-popular.xml with changed app IDs
- Remove steam-oars.xml now that gnome-software no longer ships the steam plugin
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 30-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Jan 21 2019 Kalev Lember <klember@redhat.com> - 30-1
- New metadata version
* Thu Dec 13 2018 Kalev Lember <klember@redhat.com> - 29-8
- New metadata version
* Wed Oct 10 2018 Kalev Lember <klember@redhat.com> - 29-7
- New metadata version
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 29-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri May 25 2018 Kalev Lember <klember@redhat.com> - 29-5
- New metadata version
* Thu Apr 19 2018 Kalev Lember <klember@redhat.com> - 29-4
- New metadata version
* Wed Apr 04 2018 Kalev Lember <klember@redhat.com> - 29-3
- New metadata version
* Tue Mar 27 2018 Kalev Lember <klember@redhat.com> - 29-2
- New metadata version
* Fri Mar 02 2018 Kalev Lember <klember@redhat.com> - 29-1
- New metadata version
* Thu Feb 15 2018 Kalev Lember <klember@redhat.com> - 28-4
- New metadata version
- Sync other-repos.xml and webapps.xml with fedora-appstream
- Add google-chrome.xml with Google Chrome metadata
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 28-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Dec 28 2017 Kalev Lember <klember@redhat.com> - 28-2
- New metadata version
* Tue Dec 12 2017 Kalev Lember <klember@redhat.com> - 28-1
- New metadata version
* Wed Nov 29 2017 Kalev Lember <klember@redhat.com> - 27-7
- New metadata version
* Mon Oct 16 2017 Kalev Lember <klember@redhat.com> - 27-6
- New metadata version
* Thu Aug 31 2017 Kalev Lember <klember@redhat.com> - 27-5
- New metadata version
* Thu Aug 03 2017 Kalev Lember <klember@redhat.com> - 27-4
- New metadata version
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 27-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Fri Jul 21 2017 Kalev Lember <klember@redhat.com> 27-2
- New metadata version
* Wed Jun 14 2017 Kalev Lember <klember@redhat.com> 27-1
- New metadata version
* Tue Apr 11 2017 Kalev Lember <klember@redhat.com> 26-11
- New metadata version
* Mon Mar 06 2017 Kalev Lember <klember@redhat.com> 26-10
- New metadata version
* Tue Feb 07 2017 Kalev Lember <klember@redhat.com> 26-9
- New metadata version
* Mon Jan 23 2017 Kalev Lember <klember@redhat.com> 26-8
- New metadata version
* Mon Jan 09 2017 Kalev Lember <klember@redhat.com> 26-7
- New metadata version
* Fri Dec 30 2016 Kalev Lember <klember@redhat.com> 26-6
- New metadata version
* Tue Dec 20 2016 Kalev Lember <klember@redhat.com> 26-5
- New metadata version
* Fri Dec 02 2016 Kalev Lember <klember@redhat.com> 26-4
- New metadata version
* Fri Oct 14 2016 Richard Hughes <richard@hughsie.com> 26-3
- New metadata version
* Mon Sep 19 2016 Richard Hughes <richard@hughsie.com> 26-2
- New metadata version
- Add Steam OARS overrides
* Tue Aug 09 2016 Richard Hughes <richard@hughsie.com> 26-1
- New metadata version
* Sun Jun 12 2016 Richard Hughes <richard@hughsie.com> 25-4
- New metadata version
* Thu May 26 2016 Richard Hughes <richard@hughsie.com> 25-3
- Add the Fedora-specific popular metadata
* Thu May 26 2016 Kalev Lember <klember@redhat.com> 25-2
- New metadata version
- Add a test for gstreamer1-plugin-openh264
* Wed Apr 27 2016 Richard Hughes <richard@hughsie.com> 25-1
- New metadata version
* Mon Feb 15 2016 Richard Hughes <richard@hughsie.com> 24-4
- New metadata version
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 24-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Wed Dec 16 2015 Richard Hughes <richard@hughsie.com> 24-2
- New metadata version
* Wed Aug 19 2015 Richard Hughes <richard@hughsie.com> 24-1
- New metadata version
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 23-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Tue May 26 2015 Richard Hughes <richard@hughsie.com> 23-2
- New metadata version
- Fix the installed icon location for the new origin value
* Mon May 11 2015 Richard Hughes <richard@hughsie.com> 23-1
- New metadata version
- Debundle the appstream-extra files
* Thu Apr 23 2015 Richard Hughes <richard@hughsie.com> 22-7
- New metadata version.
* Fri Mar 20 2015 Kalev Lember <kalevlember@gmail.com> 22-6
- New metadata version.
* Wed Mar 04 2015 Richard Hughes <richard@hughsie.com> 22-5
- New metadata version, this time with all the icons.
* Tue Feb 24 2015 Richard Hughes <richard@hughsie.com> 22-4
- New metadata version.
* Mon Sep 29 2014 Richard Hughes <richard@hughsie.com> 22-3
- Ship HiDPI icons, harder
* Mon Sep 29 2014 Richard Hughes <richard@hughsie.com> 22-2
- Ship HiDPI icons
* Thu Jul 17 2014 Richard Hughes <richard@hughsie.com> 22-1
- New metadata version number, data unchanged.
* Wed Jul 02 2014 Richard Hughes <richard@hughsie.com> 21-5
- New metadata version with source screenshots.
* Mon Jun 30 2014 Richard Hughes <richard@hughsie.com> 21-4
- New metadata version that passes xmllint.
* Thu Jun 19 2014 Richard Hughes <richard@hughsie.com> 21-3
- New metadata version.
* Wed Jun 11 2014 Richard Hughes <richard@hughsie.com> 21-2
- Own the correct directories
- Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1107802#c5
* Tue Jun 10 2014 Richard Hughes <richard@hughsie.com> 21-1
- Initial version for Fedora package review