diff --git a/.gitignore b/.gitignore index 1290c6d..87a344b 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,13 @@ /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 dbdb6ff..32d14a3 100644 --- a/appstream-data.spec +++ b/appstream-data.spec @@ -1,18 +1,14 @@ Summary: Fedora AppStream metadata Name: appstream-data -Version: 39 +Version: 44 Release: %autorelease 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 -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,23 +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 %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 d531d89..3ab09d4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fedora-39.xml.gz) = 0051523f6366ea89e1dfde81f8ce6cfe1a1aae2227121a4f69cd78982c5f98b4f89b13fd6da9bafa7d6281233463f7c7c1ac92895f5a52b1ec18e7194146761a -SHA512 (fedora-39-icons.tar.gz) = c41cc753f7280f98c5410368d7aabfb219906932f23709b3e57b1b99e8703f9fe8c514e6a2564e2affc3b722b599b324cab6c5b7e702d14b4bbd74b57556e1ed +SHA512 (fedora-44-icons.tar.gz) = 6f03862755d51bf1677205fe3557419c0e6e0ee780d66373b148a1c76e5c76d044e7668280ec2ca9bfa0cd518badebaa57253b0c6b0fc00d7595bf284060ec14 +SHA512 (fedora-44.xml.gz) = 35f5180757e9c37056f551070806aaf0106d17deef7101c61cc375c5dd37117a6c354bd8afcdab524a324f7f89213961984a18b91f29e29aea140216180bdca6