diff --git a/.gitignore b/.gitignore index 7b3de68..87a344b 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,17 @@ /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 +/fedora-41-icons.tar.gz +/fedora-41.xml.gz +/fedora-42-icons.tar.gz +/fedora-42.xml.gz +/fedora-43-icons.tar.gz +/fedora-43.xml.gz +/fedora-44-icons.tar.gz +/fedora-44.xml.gz diff --git a/adobe-flash.xml b/adobe-flash.xml deleted file mode 100644 index 92b5948..0000000 --- a/adobe-flash.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - flash-player-properties.desktop - flash-plugin - CC0-1.0 - Adobe Flash - Codec for multimedia and rich content - -

- Adobe Flash Player is for running rich Internet applications and - for watching streaming video and listening to audio. -

- - Proprietary - epiphany.desktop - firefox.desktop - midori.desktop - - diff --git a/appstream-data.spec b/appstream-data.spec index 68d8ff8..32d14a3 100644 --- a/appstream-data.spec +++ b/appstream-data.spec @@ -1,18 +1,14 @@ Summary: Fedora AppStream metadata Name: appstream-data -Version: 37 -Release: 3%{?dist} +Version: 44 +Release: %autorelease BuildArch: noarch -License: CC0 and CC-BY and CC-BY-SA and GFDL +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 -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 +Source3: gstreamer-non-free.xml +Source4: other-repos.xml BuildRequires: libappstream-glib @@ -26,271 +22,28 @@ repositories and the extra data in fedora-appstream. DESTDIR=%{buildroot} appstream-util install-origin fedora %{SOURCE1} %{SOURCE2} DESTDIR=%{buildroot} appstream-util install \ - %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} + %{SOURCE3} %{SOURCE4} + +# 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}/app-info/xmls/fedora.xml.gz | grep -q 'gstreamer1-plugin-openh264' ; then +if ! gunzip -c %{buildroot}%{_datadir}/swcatalog/xml/fedora.xml.gz | grep -q 'gstreamer1-plugin-openh264' ; then echo "missing gstreamer1-plugin-openh264" exit 1 fi %files -%attr(0644,root,root) %{_datadir}/app-info/xmls/* -%{_datadir}/app-info/icons/fedora/*/*.png -%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/xmls +%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 %changelog -* Wed Jul 20 2022 Fedora Release Engineering - 37-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jul 15 2022 Richard Hughes 37-2 -- New metadata version - -* Wed Jun 08 2022 Richard Hughes 37-1 -- New metadata version - -* Wed Mar 02 2022 Richard Hughes 36-1 -- New metadata version - -* Wed Feb 02 2022 Michael Catanzaro - 35-4 -- Remove obsolete webapps.xml (#2037124) - -* Wed Jan 19 2022 Fedora Release Engineering - 35-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 35-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jul 02 2021 Richard Hughes 35-2 -- New metadata version - -* Wed Mar 31 2021 Richard Hughes 35-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 +%autochangelog diff --git a/fedora-categories.xml b/fedora-categories.xml deleted file mode 100644 index 0ada039..0000000 --- a/fedora-categories.xml +++ /dev/null @@ -1,594 +0,0 @@ - - - - - - org.kde.amarok.desktop - - AudioVideo - Featured - - - - org.gnome.Cheese.desktop - - AudioVideo - Featured - - - - org.gnome.Totem.desktop - - AudioVideo - Featured - - - - org.pitivi.Pitivi - - AudioVideo - Featured - - - - org.videolan.vlc - - AudioVideo - Featured - - - - ardour6.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 - - - - org.gnome.Glade - - Development - Featured - - - - monodevelop.desktop - - Development - Featured - - - - org.gnome.gedit.desktop - - Development - Featured - - - - celestia.desktop - - Science - Featured - - - - com.play0ad.zeroad - - 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 - - - - org.mypaint.mypaint - - 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 - - - - 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 - - - - org.workrave.workrave - - Utility - Featured - - - - org.openshot.OpenShot - - Utility - Featured - - - - diff --git a/fedora-popular.xml b/fedora-popular.xml deleted file mode 100644 index 5e545c3..0000000 --- a/fedora-popular.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - org.gnome.Notes.desktop - - GnomeSoftware::popular - - - - calibre-gui.desktop - - GnomeSoftware::popular - - - - org.gnucash.GnuCash - - GnomeSoftware::popular - - - - org.inkscape.Inkscape - - GnomeSoftware::popular - - - - mozilla-thunderbird.desktop - - GnomeSoftware::popular - - - - org.gnome.Geary.desktop - - GnomeSoftware::popular - - - - org.gnome.Maps.desktop - - GnomeSoftware::popular - - - - pdfmod.desktop - - GnomeSoftware::popular - - - - scribus.desktop - - GnomeSoftware::popular - - - - shutter.desktop - - GnomeSoftware::popular - - - - simple-scan.desktop - - GnomeSoftware::popular - - - - org.stellarium.Stellarium - - GnomeSoftware::popular - - - - transmission-gtk.desktop - - GnomeSoftware::popular - - - diff --git a/google-chrome.xml b/google-chrome.xml deleted file mode 100644 index f2624c5..0000000 --- a/google-chrome.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - google-chrome.desktop - google-chrome-stable - - https://lh3.googleusercontent.com/nYhPnY2I-e9rpqnid9u9aAODz4C04OycEGxqHG5vxFnA35OGmLMrrUmhM9eaHKJ7liB-=w300 - chromium-dev@chromium.org - CC0-1.0 - Freeware under Google Chrome Terms of Service - Google Chrome - The web browser from Google - -

- Google Chrome is a browser that combines a minimal design with sophisticated technology to make the web faster, safer, and easier. -

- - https://chrome.google.com/ - - - https://www.gstatic.com/chrome/appstream/chrome-2.png - - - - - Google - https://support.google.com/chrome/?p=feedback - https://support.google.com/chrome - - diff --git a/gstreamer-non-free.xml b/gstreamer-non-free.xml index 74f99fb..dac5594 100644 --- a/gstreamer-non-free.xml +++ b/gstreamer-non-free.xml @@ -43,8 +43,8 @@ Siren LGPL-2.0 and PatentConcern - http://gstreamer.freedesktop.org/ - http://fedoraproject.org/wiki/Multimedia + https://gstreamer.freedesktop.org/ + https://fedoraproject.org/wiki/Multimedia gstreamer-libav @@ -91,8 +91,8 @@ OGG LGPL-2.0 - http://gstreamer.freedesktop.org/ - http://fedoraproject.org/wiki/Multimedia + https://gstreamer.freedesktop.org/ + https://fedoraproject.org/wiki/Multimedia gstreamer-ugly @@ -137,7 +137,7 @@ RealMedia LGPL-2.0 and PatentConcern - http://gstreamer.freedesktop.org/ - http://fedoraproject.org/wiki/Multimedia + https://gstreamer.freedesktop.org/ + https://fedoraproject.org/wiki/Multimedia diff --git a/other-repos.xml b/other-repos.xml index 27bca92..ce0f02a 100644 --- a/other-repos.xml +++ b/other-repos.xml @@ -1,19 +1,5 @@ - - adobe-release-x86_64 - adobe-release-x86_64 - CC0-1.0 - Adobe - Adobe Repository Configuration - - - livna-release - livna-release - CC0-1.0 - Livna - Livna Repository Configuration - rpmfusion-free-release rpmfusion-free-release diff --git a/sources b/sources index 4fbc314..3ab09d4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fedora-37.xml.gz) = 33e0fb411f0842597333f84ac1f7ae287eef6edcd147d97ced50917c49b5644ad9d3f88b4480c8b0ad3d4200dc49644ddccf6d3d17599a19f934bcb616ce4286 -SHA512 (fedora-37-icons.tar.gz) = f0e9706129ec1a591d735c7ae2c897b520de13e00b5cd983023d6fbf22f59e2df7bdb5172830663bbeec3124ae9fce26a2823b202645a2b694ed3b7aa36ed9a9 +SHA512 (fedora-44-icons.tar.gz) = 6f03862755d51bf1677205fe3557419c0e6e0ee780d66373b148a1c76e5c76d044e7668280ec2ca9bfa0cd518badebaa57253b0c6b0fc00d7595bf284060ec14 +SHA512 (fedora-44.xml.gz) = 35f5180757e9c37056f551070806aaf0106d17deef7101c61cc375c5dd37117a6c354bd8afcdab524a324f7f89213961984a18b91f29e29aea140216180bdca6