From 41452c8304a2bc6775f311458e6bb13a242c86ec Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Tue, 26 Mar 2024 11:22:18 +0000 Subject: [PATCH] Switch from the Fedora 40 to the RHEL 9 metadata template --- .gitignore | 74 +++++----- appstream-data.spec | 342 +++++++++++++++++++++++++++++++++++++++----- rhel.repo | 17 +++ sources | 6 +- 4 files changed, 362 insertions(+), 77 deletions(-) create mode 100644 rhel.repo diff --git a/.gitignore b/.gitignore index 3ddfacb..6ab8f02 100644 --- a/.gitignore +++ b/.gitignore @@ -1,38 +1,36 @@ -/fedora-21-icons.tar.gz -/fedora-21.xml.gz -/fedora-22-icons.tar.gz -/fedora-22.xml.gz -/fedora-23.xml.gz -/fedora-23-icons.tar.gz -/fedora-24.xml.gz -/fedora-24-icons.tar.gz -/fedora-25.xml.gz -/fedora-25-icons.tar.gz -/fedora-26.xml.gz -/fedora-26-icons.tar.gz -/fedora-27.xml.gz -/fedora-27-icons.tar.gz -/fedora-28.xml.gz -/fedora-28-icons.tar.gz -/fedora-29.xml.gz -/fedora-29-icons.tar.gz -/fedora-30.xml.gz -/fedora-30-icons.tar.gz -/fedora-31.xml.gz -/fedora-31-icons.tar.gz -/fedora-32.xml.gz -/fedora-32-icons.tar.gz -/fedora-33.xml.gz -/fedora-33-icons.tar.gz -/fedora-35.xml.gz -/fedora-35-icons.tar.gz -/fedora-36.xml.gz -/fedora-36-icons.tar.gz -/fedora-37.xml.gz -/fedora-37-icons.tar.gz -/fedora-38.xml.gz -/fedora-38-icons.tar.gz -/fedora-39.xml.gz -/fedora-39-icons.tar.gz -/fedora-40-icons.tar.gz -/fedora-40.xml.gz +/rhel-8-20180720-icons.tar.gz +/rhel-8-20180720.xml.gz +/rhel-8-20180721-icons.tar.gz +/rhel-8-20180721.xml.gz +/rhel-8-20190719-icons.tar.gz +/rhel-8-20190719.xml.gz +/rhel-8-20190805-icons.tar.gz +/rhel-8-20190805.xml.gz +/rhel-8-20191129-icons.tar.gz +/rhel-8-20191129.xml.gz +/rhel-8-20200630-icons.tar.gz +/rhel-8-20200630.xml.gz +/rhel-8-20200724-icons.tar.gz +/rhel-8-20200724.xml.gz +/epel-8-20200724-icons.tar.gz +/epel-8-20200724.xml.gz +/rhel-9-20210805.xml.gz +/rhel-9-20210805-icons.tar.gz +/rhel-9-20211101.xml.gz +/rhel-9-20211101-icons.tar.gz +/rhel-9-20220302-icons.tar.gz +/rhel-9-20220302.xml.gz +/epel-9-20220302-icons.tar.gz +/epel-9-20220302.xml.gz +/rhel-9-20230426-icons.tar.gz +/rhel-9-20230426.xml.gz +/epel-9-20230426-icons.tar.gz +/epel-9-20230426.xml.gz +/rhel-9-20230504-icons.tar.gz +/rhel-9-20230504.xml.gz +/epel-9-20230504-icons.tar.gz +/epel-9-20230504.xml.gz +/rhel-10-20230504-icons.tar.gz +/rhel-10-20230504.xml.gz +/epel-10-20230504-icons.tar.gz +/epel-10-20230504.xml.gz diff --git a/appstream-data.spec b/appstream-data.spec index 2631a52..16ac693 100644 --- a/appstream-data.spec +++ b/appstream-data.spec @@ -1,53 +1,321 @@ -Summary: Fedora AppStream metadata +%define gitdate 20230504 +%global enable_epel 1 + +Summary: Cached AppStream metadata Name: appstream-data -Version: 40 -Release: %autorelease +Epoch: 1 +Version: 10 +Release: %{gitdate}%{?dist} BuildArch: noarch -License: CC0-1.0 AND CC-BY-1.0 AND CC-BY-SA-1.0 AND GFDL-1.1-or-later -URL: https://github.com/hughsie/appstream-glib -Source1: https://dl.fedoraproject.org/pub/alt/screenshots/f%{version}/fedora-%{version}.xml.gz -Source2: https://dl.fedoraproject.org/pub/alt/screenshots/f%{version}/fedora-%{version}-icons.tar.gz +License: CC0 and CC-BY and CC-BY-SA and GFDL +URL: http://people.redhat.com/rhughes/metadata/ +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 Source3: https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/adobe-flash.xml -Source4: https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/google-chrome.xml -Source5: https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/gstreamer-non-free.xml -Source6: https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/other-repos.xml -Source7: https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/fedora-categories.xml -Source8: https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/fedora-popular.xml +Source4: https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/gstreamer-non-free.xml +Source5: https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/other-repos.xml +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 +%if 0%{?enable_epel} +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 +%endif + +# This is built using: +# sudo dnf makecache --enablerepo rhel-9-baseos --enablerepo rhel-9-appstream --enablerepo rhel-9-crb +# export ARCHIVE_PATH=/run/media/hughsie/Backup/mirror +# 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-9-appstream -p ${ARCHIVE_PATH}/RHEL/ &> rhel-9-appstream.log +# dnf reposync --setopt=*.module_hotfixes=1 --repo rhel-9-crb -p ${ARCHIVE_PATH}/RHEL/ &> rhel-9-crb.log +# https://github.com/hughsie/appstream-scripts/blob/master/rhel/rhel-9-candidate.sh +# then the sources need to be uploaded to people.redhat.com/rhughes/metadata/ BuildRequires: libappstream-glib %description This package provides the distribution specific AppStream metadata required -for the GNOME and KDE software centers. The appstream data is built weekly with -/usr/bin/appstream-builder, combining the data from RPM packages in official -repositories and the extra data in fedora-appstream. +for the GNOME and KDE software centers. %install -DESTDIR=%{buildroot} appstream-util install-origin fedora %{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} +%endif DESTDIR=%{buildroot} appstream-util install \ - %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} - -# 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 - - -%check -if ! gunzip -c %{buildroot}%{_datadir}/swcatalog/xml/fedora.xml.gz | grep -q 'gstreamer1-plugin-openh264' ; then - echo "missing gstreamer1-plugin-openh264" - exit 1 -fi + %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %files -%attr(0644,root,root) %{_datadir}/swcatalog/xml/* -%{_datadir}/swcatalog/icons/fedora/*/*.png -%dir %{_datadir}/swcatalog -%dir %{_datadir}/swcatalog/icons -%dir %{_datadir}/swcatalog/icons/fedora -%dir %{_datadir}/swcatalog/icons/fedora/64x64 -%dir %{_datadir}/swcatalog/icons/fedora/128x128 -%dir %{_datadir}/swcatalog/xml +%attr(0644,root,root) %{_datadir}/app-info/xmls/* +%{_datadir}/app-info/icons/rhel-%{version}/*/*.png +%if 0%{?enable_epel} +%{_datadir}/app-info/icons/epel-%{version}/*/*.png +%endif +%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 +%if 0%{?enable_epel} +%dir %{_datadir}/app-info/icons/epel-%{version}/64x64 +%dir %{_datadir}/app-info/icons/epel-%{version}/128x128 +%endif +%dir %{_datadir}/app-info/xmls %changelog -%autochangelog +* Tue Mar 26 2024 Richard Hughes 1:10-20230504 +- Switch from the Fedora 40 to the RHEL 9 metadata template + +* Thu May 04 2023 Richard Hughes 1:9-20230504 +- New metadata version +- Resolves: rhbz#2062807 + +* Wed Apr 26 2023 Richard Hughes 1:9-20230426 +- New metadata version +- Resolves: rhbz#2062807 + +* Thu Mar 03 2022 Richard Hughes 1:9-20220302 +- New metadata version +- Resolves: rhbz#2062807 + +* Mon Nov 01 2021 Richard Hughes 1:9-20211101 +- New metadata version +- Resolves: rhbz#2005266 + +* Mon Aug 09 2021 Mohan Boddu - 1:9-20210805.1 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* Thu Aug 05 2021 Richard Hughes 1:9-20210805 +- New metadata version +- Resolves: rhbz#1926838 + +* Thu Apr 15 2021 Mohan Boddu - 34-2 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 + +* Wed Mar 31 2021 Richard Hughes 34-1 +- New metadata version + +* Tue Jan 26 2021 Fedora Release Engineering - 33-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Oct 15 2020 Richard Hughes 33-1 +- New metadata version + +* Mon Jul 27 2020 Fedora Release Engineering - 32-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Apr 13 2020 Richard Hughes 32-6 +- New metadata version + +* Tue Jan 28 2020 Fedora Release Engineering - 32-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jan 02 2020 Kalev Lember - 32-4 +- New metadata version + +* Mon Oct 14 2019 Kalev Lember - 32-3 +- New metadata version + +* Thu Sep 19 2019 Kalev Lember - 32-2 +- Update webapps.xml + +* Thu Sep 19 2019 Kalev Lember - 32-1 +- New metadata version + +* Wed Sep 18 2019 Kalev Lember - 31-4 +- Update categories and popular xmls with renamed app ids + +* Wed Sep 18 2019 Kalev Lember - 31-3 +- New metadata version + +* Wed Jul 24 2019 Fedora Release Engineering - 31-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Jul 12 2019 Richard Hughes 31-1 +- New metadata version + +* Thu Apr 18 2019 Kalev Lember - 30-5 +- New metadata version + +* Thu Apr 11 2019 Kalev Lember - 30-4 +- New metadata version +- Update changed app IDs in categories and popular xml files + +* Mon Apr 01 2019 Kalev Lember - 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 - 30-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Jan 21 2019 Kalev Lember - 30-1 +- New metadata version + +* Thu Dec 13 2018 Kalev Lember - 29-8 +- New metadata version + +* Wed Oct 10 2018 Kalev Lember - 29-7 +- New metadata version + +* Thu Jul 12 2018 Fedora Release Engineering - 29-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri May 25 2018 Kalev Lember - 29-5 +- New metadata version + +* Thu Apr 19 2018 Kalev Lember - 29-4 +- New metadata version + +* Wed Apr 04 2018 Kalev Lember - 29-3 +- New metadata version + +* Tue Mar 27 2018 Kalev Lember - 29-2 +- New metadata version + +* Fri Mar 02 2018 Kalev Lember - 29-1 +- New metadata version + +* Thu Feb 15 2018 Kalev Lember - 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 - 28-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Dec 28 2017 Kalev Lember - 28-2 +- New metadata version + +* Tue Dec 12 2017 Kalev Lember - 28-1 +- New metadata version + +* Wed Nov 29 2017 Kalev Lember - 27-7 +- New metadata version + +* Mon Oct 16 2017 Kalev Lember - 27-6 +- New metadata version + +* Thu Aug 31 2017 Kalev Lember - 27-5 +- New metadata version + +* Thu Aug 03 2017 Kalev Lember - 27-4 +- New metadata version + +* Wed Jul 26 2017 Fedora Release Engineering - 27-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Jul 21 2017 Kalev Lember 27-2 +- New metadata version + +* Wed Jun 14 2017 Kalev Lember 27-1 +- New metadata version + +* Tue Apr 11 2017 Kalev Lember 26-11 +- New metadata version + +* Mon Mar 06 2017 Kalev Lember 26-10 +- New metadata version + +* Tue Feb 07 2017 Kalev Lember 26-9 +- New metadata version + +* Mon Jan 23 2017 Kalev Lember 26-8 +- New metadata version + +* Mon Jan 09 2017 Kalev Lember 26-7 +- New metadata version + +* Fri Dec 30 2016 Kalev Lember 26-6 +- New metadata version + +* Tue Dec 20 2016 Kalev Lember 26-5 +- New metadata version + +* Fri Dec 02 2016 Kalev Lember 26-4 +- New metadata version + +* Fri Oct 14 2016 Richard Hughes 26-3 +- New metadata version + +* Mon Sep 19 2016 Richard Hughes 26-2 +- New metadata version +- Add Steam OARS overrides + +* Tue Aug 09 2016 Richard Hughes 26-1 +- New metadata version + +* Sun Jun 12 2016 Richard Hughes 25-4 +- New metadata version + +* Thu May 26 2016 Richard Hughes 25-3 +- Add the Fedora-specific popular metadata + +* Thu May 26 2016 Kalev Lember 25-2 +- New metadata version +- Add a test for gstreamer1-plugin-openh264 + +* Wed Apr 27 2016 Richard Hughes 25-1 +- New metadata version + +* Mon Feb 15 2016 Richard Hughes 24-4 +- New metadata version + +* Wed Feb 03 2016 Fedora Release Engineering - 24-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Dec 16 2015 Richard Hughes 24-2 +- New metadata version + +* Wed Aug 19 2015 Richard Hughes 24-1 +- New metadata version + +* Wed Jun 17 2015 Fedora Release Engineering - 23-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue May 26 2015 Richard Hughes 23-2 +- New metadata version +- Fix the installed icon location for the new origin value + +* Mon May 11 2015 Richard Hughes 23-1 +- New metadata version +- Debundle the appstream-extra files + +* Thu Apr 23 2015 Richard Hughes 22-7 +- New metadata version. + +* Fri Mar 20 2015 Kalev Lember 22-6 +- New metadata version. + +* Wed Mar 04 2015 Richard Hughes 22-5 +- New metadata version, this time with all the icons. + +* Tue Feb 24 2015 Richard Hughes 22-4 +- New metadata version. + +* Mon Sep 29 2014 Richard Hughes 22-3 +- Ship HiDPI icons, harder + +* Mon Sep 29 2014 Richard Hughes 22-2 +- Ship HiDPI icons + +* Thu Jul 17 2014 Richard Hughes 22-1 +- New metadata version number, data unchanged. + +* Wed Jul 02 2014 Richard Hughes 21-5 +- New metadata version with source screenshots. + +* Mon Jun 30 2014 Richard Hughes 21-4 +- New metadata version that passes xmllint. + +* Thu Jun 19 2014 Richard Hughes 21-3 +- New metadata version. + +* Wed Jun 11 2014 Richard Hughes 21-2 +- Own the correct directories +- Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1107802#c5 + +* Tue Jun 10 2014 Richard Hughes 21-1 +- Initial version for Fedora package review diff --git a/rhel.repo b/rhel.repo new file mode 100644 index 0000000..83fb3fe --- /dev/null +++ b/rhel.repo @@ -0,0 +1,17 @@ +[rhel-10-baseos] +name=Nightly Packages for Enterprise Linux 10 +baseurl=http://download.eng.brq.redhat.com/rhel-10/nightly/RHEL109/latest-RHEL-10/compose/BaseOS/x86_64/os/ +enabled=1 +gpgcheck=0 + +[rhel-10-appstream] +name=Nightly Packages for Enterprise Linux 10 +baseurl=http://download.eng.brq.redhat.com/rhel-10/nightly/RHEL-10/latest-RHEL-10/compose/AppStream/x86_64/os/ +enabled=1 +gpgcheck=0 + +[rhel-10-crb] +name=Nightly Packages for Enterprise Linux 10 +baseurl=http://download.eng.brq.redhat.com/rhel-10/nightly/RHEL-10/latest-RHEL-10/compose/CRB/x86_64/os/ +enabled=1 +gpgcheck=0 diff --git a/sources b/sources index ef08c15..803b7b7 100644 --- a/sources +++ b/sources @@ -1,2 +1,4 @@ -SHA512 (fedora-40-icons.tar.gz) = 597060c457d6c459bc0350ff1baee7a930bb4474ece8d6073465941528ad8196ff868f722e14e169481415b9013361ca3c34ca83a884d1e7edfe76efc13cb607 -SHA512 (fedora-40.xml.gz) = 899e4007d68120c6cfb5ed50cbcc5ac1b160dcbb11f2014843cead4391811c90b48f0aa09b483fc696d231e5527d0ddb4716234b1c984cc5a60a8aea24abccc9 +SHA512 (rhel-10-20230504-icons.tar.gz) = 34eeeb24bdcef50d7ceaecc014b1bd45d462cc1ab0d8df806cb8316187cd5bf949f27871d561d9597b236342439fab31b961aa13e7dc838358149efa457851a3 +SHA512 (rhel-10-20230504.xml.gz) = 130ee33ec58e09f702eb8f779dfcd65842cb4573136e553d2bb5468869c295225532c23ac5fb074a725b2026d110f494b90fe58a27b2acc6fe9cad5eefc609f5 +SHA512 (epel-10-20230504-icons.tar.gz) = 8aead728755d92ab1a8e4d0fb7a0b77b6fbdbd1654d1de99490de7997979aa2bfbcb0918e3a3d1ddbd82926161e85632318ab4a6600a41ced1b9f8bd6b6dfeeb +SHA512 (epel-10-20230504.xml.gz) = e95ef4b79b6e9f18de257640235d7fa823c839254723b3917f9d683a56b7bf719e51b8d8c24b047143021d477d017c8e319d0e75bba09b1d8fb0c971f864f3c0