From 192bb9d26ca28436561bfe3c631256be8ab6395d Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 5 Aug 2021 15:54:20 +0100 Subject: [PATCH] New metadata version --- .gitignore | 46 +++--- appstream-data.spec | 74 ++++++---- rhel.repo | 17 +++ sources | 4 +- webapps.xml | 341 -------------------------------------------- 5 files changed, 84 insertions(+), 398 deletions(-) create mode 100644 rhel.repo delete mode 100644 webapps.xml diff --git a/.gitignore b/.gitignore index 83269c0..49e9b98 100644 --- a/.gitignore +++ b/.gitignore @@ -1,28 +1,18 @@ -/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-34.xml.gz -/fedora-34-icons.tar.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 diff --git a/appstream-data.spec b/appstream-data.spec index b12d718..9387a65 100644 --- a/appstream-data.spec +++ b/appstream-data.spec @@ -1,51 +1,71 @@ -Summary: Fedora AppStream metadata +%define gitdate 20210805 +%global enable_epel 0 + +Summary: Cached AppStream metadata Name: appstream-data -Version: 34 -Release: 2%{?dist} +Epoch: 1 +Version: 9 +Release: %{gitdate}%{?dist} BuildArch: noarch License: CC0 and CC-BY and CC-BY-SA and GFDL -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 +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/webapps.xml -Source8: https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/fedora-categories.xml -Source9: 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: +# 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 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} %{SOURCE9} - -%check -if ! gunzip -c %{buildroot}%{_datadir}/app-info/xmls/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}/app-info/xmls/* -%{_datadir}/app-info/icons/fedora/*/*.png +%{_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/fedora -%dir %{_datadir}/app-info/icons/fedora/64x64 -%dir %{_datadir}/app-info/icons/fedora/128x128 +%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 +* 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 diff --git a/rhel.repo b/rhel.repo new file mode 100644 index 0000000..407ec0e --- /dev/null +++ b/rhel.repo @@ -0,0 +1,17 @@ +[rhel-9-baseos] +name=Nightly Packages for Enterprise Linux 9 +baseurl=http://download.eng.brq.redhat.com/rhel-9/development/RHEL-9/latest-RHEL-9/compose/BaseOS/x86_64/os/ +enabled=1 +gpgcheck=0 + +[rhel-9-appstream] +name=Nightly Packages for Enterprise Linux 9 +baseurl=http://download.eng.brq.redhat.com/rhel-9/development/RHEL-9/latest-RHEL-9/compose/AppStream/x86_64/os/ +enabled=1 +gpgcheck=0 + +[rhel-9-crb] +name=Nightly Packages for Enterprise Linux 9 +baseurl=http://download.eng.brq.redhat.com/rhel-9/development/RHEL-9/latest-RHEL-9/compose/CRB/x86_64/os/ +enabled=1 +gpgcheck=0 diff --git a/sources b/sources index 92cd678..ebad984 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fedora-34.xml.gz) = f66ede272a2a6522ebd58ce319b2de58c12af95986ae92621cfcbfa91801017ea85613dfd1146e79306de2ce21475e5e5be0c75e9b9840b1004ab9b23b47fbf3 -SHA512 (fedora-34-icons.tar.gz) = df2a6cdd4df64f1931c561f93239861cc18514f972327b1502639d77d90f97b5efaa544b4180f33083e01ab8ef7912cc81e5c914ceb66b8440aa4b0a2db09c7a +SHA512 (rhel-9-20210805.xml.gz) = 5610e4d58221f88c484226794ffb483123b0358922d6780f4badcc6d3c6b699aef4c04a2293f1c8b23c3f883d5ce61a82163f214ca6857d2d53be032213d8c79 +SHA512 (rhel-9-20210805-icons.tar.gz) = b86e111419cce4f48db99f76a35976783949ea7d9acc6def160c6718d672d72e6c12a6f24c4d8075cfbe3f7b3c9314d6cafe154163df7793f224a9ce7d275b7f diff --git a/webapps.xml b/webapps.xml deleted file mode 100644 index 197d05f..0000000 --- a/webapps.xml +++ /dev/null @@ -1,341 +0,0 @@ - - - - epiphany-kindlecloud.desktop - CC0-1.0 - proprietary - Kindle Cloud Reader - Read instantly in your browser - -

- Buy Once, Read Everywhere: You don't need to own a Kindle device to - enjoy Kindle books. - Automatically save and synchronize your furthest page read, bookmarks, - notes, and highlights across all your devices. - That means you can start reading a book on one device, and pick up where - you left off on another device. -

-

- Read the first chapter of a book before you decide whether to buy it. - Read thousands of free books with a Kindle app, including popular - classics like The Adventures of Sherlock Holmes, Pride and Prejudice, - and Treasure Island. -

-

- To use the Kindle Cloud reader you must have Amazon.com account. -

- - http://g-ecx.images-amazon.com/images/G/01/kindle/www/ariel/kindle-icon-kcp120._SL90_.png - - Education - Literature - - - book - ebook - reader - - https://read.amazon.com - - - - - - - epiphany-askfedora.desktop - CC0-1.0 - GPL-3.0+ - Ask Fedora - A community knowledge base and support forum - -

- Ask Fedora is a community knowledge base and support forum and - designed to be the primary place for community support in Fedora. -

- - /usr/share/icons/hicolor/256x256/apps/fedora-logo-icon.png - - Documentation - System - - - help - question - troubleshooting - - https://ask.fedoraproject.org - - - - - - epiphany-bbciplayer.desktop - CC0-1.0 - proprietary - BBC iPlayer - Catch up on BBC TV and Radio programmes, or watch/listen live - -

- Watch live BBC channels, listen to BBC radios, or catch up on programmes - from the last 7 days. - Drama, soaps, news, sport and currents affairs, or comedy, whatever your - mood, you will find a BBC programme to suit you. -

-

- To use BBC iPlayer you must be located in the UK and pay a TV licence. -

- - http://www.bbc.co.uk/terms/images/stock/bbciplayer_logo_black.jpg - - TV - Video - - - drama - entertainment - iplayer - news - - http://www.bbc.co.uk/iplayer/bigscreen - - - - - - - - devdocs-io.desktop - CC0-1.0 - MPL-2.0 - Devdocs.io - Easily view and search developer documentation - -

- Devdocs.io is a small application that allows you to quickly search and view - developer documentation for various programming langauges and libraries. -

- - http://devdocs.io/images/webapp-icon-256.png - - Development - - - developer - documentation - programming - - http://devdocs.io/ - - - - - - epiphany-dropbox.desktop - CC0-1.0 - proprietary - Dropbox - A free service that shares your documents easily - -

- Dropbox is a free service that lets you bring your photos, docs, and - videos anywhere and share them easily. -

-

- To use Dropbox you need to be over the age of 13. -

- - https://www.dropbox.com/s/hi2dcyswjhcj5yr/dropbox-linux.png?dl=1 - - dropbox - sync - - http://www.dropbox.com/ - - - - - - epiphany-facebook.desktop - CC0-1.0 - proprietary - Facebook - Give people the power to share - -

- Facebook is the world's most popular social networking website. - It makes it easy for you to connect and share with your family and - friends online. -

-

- To use Facebook you need a Facebook login and be over the age of 13. -

- - https://www.facebook.com/images/fb_icon_325x325.png - - InstantMessaging - Network - - - facebook - - http://www.facebook.com/ - - - - - - epiphany-googledrive.desktop - CC0-1.0 - proprietary - Google Drive - Everything you need, everywhere you go - -

- Google Drive allows you to upload photos, videos, documents, and other - files that are important to you to Google Drive. - Get going with up to 15GB of storage. - With Drive, your stuff goes where you go. - You can organize, edit and share it from any computer at drive.google.com, - or on the go with the Drive mobile app. -

-

- Drive comes with built in apps to help you get stuff done. - Write a short story. Create a shared budget with your roommates. - Sign and fax an important document. - Everything you make is automatically saved in Drive. -

-

- To use Google Drive you need to be over the age of 13. -

- - http://www.google.com/images/icons/product/drive-64.png - - drive - - http://drive.google.com/ - - - - - - epiphany-googlemaps.desktop - CC0-1.0 - proprietary - Google Maps - A web mapping service application and technology - -

- Offers street maps, a route planner for traveling by foot, car, bike, - or with public transportation and a locator for urban businesses in - numerous countries around the world. -

-

- Google Maps satellite images are not updated in real time, but rather - they are several months or years old. -

-

- To use Google Maps you need to be over the age of 13. -

- - https://developers.google.com/maps/web/images/embed-places-icon.png - - Maps - Science - - - directions - - https://www.google.com/maps - - - - - - libnpgoogletalk.so - google-talkplugin - CC0-1.0 - proprietary - Google Talk - Bring your conversations to life with video calls for free - -

- Have voice and video conversations from your computer. - The plugin is free and installs in seconds. -

-

- Send photos or emoji, see when people are engaged in the Hangout and - message friends anytime, even if they're not connected right now. -

-

- Hangouts works on computers, Android and Apple devices, so you can - connect with everyone, and no one gets left out. -

- - application-x-executable - - google - talk - - https://www.google.com/tools/dlpage/hangoutplugin - epiphany.desktop - firefox.desktop - midori.desktop - - - - - - epiphany-twitter.desktop - CC0-1.0 - proprietary - Twitter - Start a conversation, explore your interests, and be in the know - -

- Twitter is a micro-blogging website that lets you 'Tweet' messages of - up to 140 characters in length. -

-

- To use Twitter you need a twitter account and be over the age of 13. -

- - https://abs.twimg.com/a/1381897480/images/resources/twitter-bird-blue-on-white.png - - InstantMessaging - Network - - - tweet - twitter - - http://www.twitter.com/ - - - - - - epiphany-telegram.desktop - CC0-1.0 - proprietary - Telegram Web - Telegram is an instant messaging app focused on speed and security - -

- Telegram is an instant messaging app focused on speed and security. -

- - https://web.telegram.org/img/icons/icon128.png - - InstantMessaging - Network - - - telegram - - https://web.telegram.org/ - https://web.telegram.org/ - - - - -