From 17f2751410b42a4f8edc52a8e8f2f920f6de00c5 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 19 Sep 2024 10:27:41 +0100 Subject: [PATCH 01/12] Stop installing app recommendations data Resolves: rh#2313369 --- appstream-data.spec | 4 +- fedora-categories.xml | 594 ------------------------------------------ fedora-popular.xml | 83 ------ 3 files changed, 1 insertion(+), 680 deletions(-) delete mode 100644 fedora-categories.xml delete mode 100644 fedora-popular.xml diff --git a/appstream-data.spec b/appstream-data.spec index 62370cb..591a6e0 100644 --- a/appstream-data.spec +++ b/appstream-data.spec @@ -10,8 +10,6 @@ Source2: https://dl.fedoraproject.org/pub/alt/screenshots/f%{version}/fedora-% Source3: https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/adobe-flash.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 BuildRequires: libappstream-glib @@ -25,7 +23,7 @@ repositories and the extra data in fedora-appstream. DESTDIR=%{buildroot} appstream-util install-origin fedora %{SOURCE1} %{SOURCE2} DESTDIR=%{buildroot} appstream-util install \ - %{SOURCE3} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} + %{SOURCE3} %{SOURCE5} %{SOURCE6} # Move to the "correct" path for appstream 0.16 / 1.0 mv %{buildroot}%{_datadir}/app-info %{buildroot}%{_datadir}/swcatalog diff --git a/fedora-categories.xml b/fedora-categories.xml deleted file mode 100644 index 4875d2d..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 86cf2a4..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 - - - From 0efc52472ec187fa4e322417ed24796edc642da7 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Tue, 8 Oct 2024 15:53:55 +0100 Subject: [PATCH 02/12] New metadata version --- .gitignore | 2 ++ appstream-data.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f4f744e..0b445e4 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,5 @@ /fedora-40.xml.gz /fedora-41-icons.tar.gz /fedora-41.xml.gz +/fedora-42-icons.tar.gz +/fedora-42.xml.gz diff --git a/appstream-data.spec b/appstream-data.spec index 591a6e0..324a9a7 100644 --- a/appstream-data.spec +++ b/appstream-data.spec @@ -1,6 +1,6 @@ Summary: Fedora AppStream metadata Name: appstream-data -Version: 41 +Version: 42 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 diff --git a/sources b/sources index 4022eab..55eac63 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fedora-41-icons.tar.gz) = 0664e80a78de35cd5050050bf96c1d63b82140a392b350707bd6b8ad7ac8f18b39ff069b0561c7acfa22ee5881adc441168f142b33726f9b588f1bcc20baafb2 -SHA512 (fedora-41.xml.gz) = 29ee053d60345cc7a6cf706f696111a75517acac062e9ff6c3fc4f4beb2330ed7c5c4447c35eac97b1e55fed0b76118126d939dd89598036ee75a699ee7f16df +SHA512 (fedora-42-icons.tar.gz) = 3c290d275e3f8b010732300aaed784db2b4c26b02c674a6c60b8fdf68113e7a62edaa22e19f2f07d78962d785e49d37d2a8b832c7547c6be2de790a4245ffd86 +SHA512 (fedora-42.xml.gz) = b88443c941620a63184a3d2a71f2e57c64cf2e1ffed1c1307aa12489fa12d41e4515e4deba2523533299e1a0f32df01821bab180d1fe75e05f8918a0bc33052b From 7f6b12e92a14d84b8b3f9cd18dd87d6bfede0601 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Wed, 18 Dec 2024 14:19:09 +0000 Subject: [PATCH 03/12] New metadata version --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 55eac63..eb5b2df 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fedora-42-icons.tar.gz) = 3c290d275e3f8b010732300aaed784db2b4c26b02c674a6c60b8fdf68113e7a62edaa22e19f2f07d78962d785e49d37d2a8b832c7547c6be2de790a4245ffd86 -SHA512 (fedora-42.xml.gz) = b88443c941620a63184a3d2a71f2e57c64cf2e1ffed1c1307aa12489fa12d41e4515e4deba2523533299e1a0f32df01821bab180d1fe75e05f8918a0bc33052b +SHA512 (fedora-42-icons.tar.gz) = 18b6f1a86224eec25de1f02be654cea08716df18b0fe548838f47718ef3175db960526154986bdc042d04aeb17d86897acc35c917c08cf393f416ce9eee5e69f +SHA512 (fedora-42.xml.gz) = aa4ff8767539b060a4985c7491b3bf712636eb196738c8191059595a04f31dd3207c8ff0aed40b81c855e8c7731ce54aad31fd17e2ac39b749f8598f4639994b From 028ebf80dfd42f535ad514939057d3790a5520a0 Mon Sep 17 00:00:00 2001 From: Daniel Rusek Date: Mon, 13 Jan 2025 22:52:35 +0000 Subject: [PATCH 04/12] Remove obsolete adobe-flash.xml Also remove the Adobe repo in other-repos.xml --- adobe-flash.xml | 21 --------------------- appstream-data.spec | 7 +++---- other-repos.xml | 7 ------- 3 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 adobe-flash.xml 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 324a9a7..d64da6b 100644 --- a/appstream-data.spec +++ b/appstream-data.spec @@ -7,9 +7,8 @@ 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 -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 +Source3: https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/gstreamer-non-free.xml +Source4: https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/other-repos.xml BuildRequires: libappstream-glib @@ -23,7 +22,7 @@ repositories and the extra data in fedora-appstream. DESTDIR=%{buildroot} appstream-util install-origin fedora %{SOURCE1} %{SOURCE2} DESTDIR=%{buildroot} appstream-util install \ - %{SOURCE3} %{SOURCE5} %{SOURCE6} + %{SOURCE3} %{SOURCE4} # Move to the "correct" path for appstream 0.16 / 1.0 mv %{buildroot}%{_datadir}/app-info %{buildroot}%{_datadir}/swcatalog diff --git a/other-repos.xml b/other-repos.xml index 4342ef3..ce0f02a 100644 --- a/other-repos.xml +++ b/other-repos.xml @@ -1,12 +1,5 @@ - - adobe-release-x86_64 - adobe-release-x86_64 - CC0-1.0 - Adobe - Adobe Repository Configuration - rpmfusion-free-release rpmfusion-free-release From b312371eb31306e3586f3a3f37c962c36a027a70 Mon Sep 17 00:00:00 2001 From: AsciiWolf Date: Tue, 14 Jan 2025 13:10:24 +0100 Subject: [PATCH 05/12] Use local sources for extra xml files --- appstream-data.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appstream-data.spec b/appstream-data.spec index d64da6b..1b4f685 100644 --- a/appstream-data.spec +++ b/appstream-data.spec @@ -7,8 +7,8 @@ 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/gstreamer-non-free.xml -Source4: https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/other-repos.xml +Source3: gstreamer-non-free.xml +Source4: other-repos.xml BuildRequires: libappstream-glib From d13a5358ff0e41fae004db97aaab627b62799fa5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:22:08 +0000 Subject: [PATCH 06/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 14c5cf68a25474bb17c7b59f822d8d7e69b40911 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Mon, 24 Mar 2025 20:35:38 +0000 Subject: [PATCH 07/12] New metadata version --- .gitignore | 2 ++ appstream-data.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0b445e4..47d4a6d 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,5 @@ /fedora-41.xml.gz /fedora-42-icons.tar.gz /fedora-42.xml.gz +/fedora-43-icons.tar.gz +/fedora-43.xml.gz diff --git a/appstream-data.spec b/appstream-data.spec index 1b4f685..8d3cf23 100644 --- a/appstream-data.spec +++ b/appstream-data.spec @@ -1,6 +1,6 @@ Summary: Fedora AppStream metadata Name: appstream-data -Version: 42 +Version: 43 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 diff --git a/sources b/sources index eb5b2df..291d78b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fedora-42-icons.tar.gz) = 18b6f1a86224eec25de1f02be654cea08716df18b0fe548838f47718ef3175db960526154986bdc042d04aeb17d86897acc35c917c08cf393f416ce9eee5e69f -SHA512 (fedora-42.xml.gz) = aa4ff8767539b060a4985c7491b3bf712636eb196738c8191059595a04f31dd3207c8ff0aed40b81c855e8c7731ce54aad31fd17e2ac39b749f8598f4639994b +SHA512 (fedora-43-icons.tar.gz) = 6168f01ab805c953909ce724d0a433cf0b5726d5e0b777fb47b5e25f5128e6ec7e5d0f9bf66edb5de6c8171ddb7dd6b54657465d66e48a47bdfe2f63c29cfe98 +SHA512 (fedora-43.xml.gz) = 6fdf0c19d015933f7a7fb9f59a2fd794539d16ec266d9fe7d914e24499dcfc789c31339d7950bd63a23edadbbbffc2e7af9f4d2b74ddfb4dcff0a40eef120b82 From 8cfb858213cf6344762525fcd10e071465d70193 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:08:55 +0000 Subject: [PATCH 08/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 55cd979c49063863385bedc50c11cecb49514075 Mon Sep 17 00:00:00 2001 From: Daniel Rusek Date: Wed, 24 Sep 2025 19:02:28 +0000 Subject: [PATCH 09/12] Update links in gstreamer-non-free.xml http -> https --- gstreamer-non-free.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gstreamer-non-free.xml b/gstreamer-non-free.xml index 74f99fb..3c64ac1 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 @@ -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 From 9225a7a58ad4dc5bd8e5322e658db8da787f92ff Mon Sep 17 00:00:00 2001 From: Daniel Rusek Date: Fri, 26 Sep 2025 16:38:33 +0000 Subject: [PATCH 10/12] Update remaining links in gstreamer-non-free.xml --- gstreamer-non-free.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gstreamer-non-free.xml b/gstreamer-non-free.xml index 3c64ac1..dac5594 100644 --- a/gstreamer-non-free.xml +++ b/gstreamer-non-free.xml @@ -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 From fea0c6e0fc16d63d3ef00e9318f4be462492a267 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Wed, 1 Oct 2025 18:08:41 +0100 Subject: [PATCH 11/12] New metadata version --- .gitignore | 2 ++ appstream-data.spec | 2 +- sources | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 47d4a6d..87a344b 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,5 @@ /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/appstream-data.spec b/appstream-data.spec index 8d3cf23..32d14a3 100644 --- a/appstream-data.spec +++ b/appstream-data.spec @@ -1,6 +1,6 @@ Summary: Fedora AppStream metadata Name: appstream-data -Version: 43 +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 diff --git a/sources b/sources index 291d78b..3ab09d4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (fedora-43-icons.tar.gz) = 6168f01ab805c953909ce724d0a433cf0b5726d5e0b777fb47b5e25f5128e6ec7e5d0f9bf66edb5de6c8171ddb7dd6b54657465d66e48a47bdfe2f63c29cfe98 -SHA512 (fedora-43.xml.gz) = 6fdf0c19d015933f7a7fb9f59a2fd794539d16ec266d9fe7d914e24499dcfc789c31339d7950bd63a23edadbbbffc2e7af9f4d2b74ddfb4dcff0a40eef120b82 +SHA512 (fedora-44-icons.tar.gz) = 6f03862755d51bf1677205fe3557419c0e6e0ee780d66373b148a1c76e5c76d044e7668280ec2ca9bfa0cd518badebaa57253b0c6b0fc00d7595bf284060ec14 +SHA512 (fedora-44.xml.gz) = 35f5180757e9c37056f551070806aaf0106d17deef7101c61cc375c5dd37117a6c354bd8afcdab524a324f7f89213961984a18b91f29e29aea140216180bdca6 From 8f12c562d69e95b57c322846ecffdc0ecc6745f2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:50:07 +0000 Subject: [PATCH 12/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild