From 9a3013c3494c8e441df4eccb471988a2738961b9 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Tue, 16 Jan 2024 13:28:58 -0500
Subject: [PATCH] Fix appstream data

While the upstream appdata passes appstream-util validate-relax
(mandated by packaging guidelines), appstreamcli validate shows issues.
Since the latter's library is used in Software and Discover nowadays,
this may be why neither our package nor the Flathub flatpak are listed.

Resolves: rhbz#2258611
---
 appdata.patch | 19 +++++++++++++++++++
 vlc.spec      | 11 +++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 appdata.patch

diff --git a/appdata.patch b/appdata.patch
new file mode 100644
index 0000000..2002a13
--- /dev/null
+++ b/appdata.patch
@@ -0,0 +1,19 @@
+diff --git a/share/vlc.appdata.xml.in.in b/share/vlc.appdata.xml.in.in
+index cc9c39a..3c55620 100644
+--- a/share/vlc.appdata.xml.in.in
++++ b/share/vlc.appdata.xml.in.in
+@@ -18,7 +18,7 @@
+     <url type="bugtracker">https://trac.videolan.org/vlc/</url>
+     <url type="donation">https://www.videolan.org/contribute.html</url>
+     <releases>
+-        <release version="@VERSION@" />
++        <release version="@VERSION@" date="@DATE@" />
+     </releases>
+     <provides>
+         <library>libvlc.so.5</library>
+@@ -38,4 +38,5 @@
+             <image>http://images.videolan.org/vlc/screenshots/2.0.0/vlc-2.0-gnome3-debian.jpg</image>
+         </screenshot>
+     </screenshots>
++    <content_rating type="oars-1.1" />
+ </component>
diff --git a/vlc.spec b/vlc.spec
index 38ce111..0701355 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -40,7 +40,9 @@ Patch:		fdk-aac2.patch
 # separate avcodec-vaapi conditional from other vaapi modules
 Patch:		vaapi-without-ffmepg4.patch
 # port from intel-mediasdk to oneVPL
-Patch:          oneVPL.patch
+Patch:		oneVPL.patch
+# fix appstreamcli validate to show in Software (rhbz#2258611)
+Patch:		appdata.patch
 
 %{load:%{S:1}}
 %global __provides_exclude_from ^%{vlc_plugindir}/.*$
@@ -474,7 +476,12 @@ rm -f aclocal.m4 m4/lib*.m4 m4/lt*.m4
 sed -i -e 's|\("qt-icon-change",\) true|\1 false|' modules/gui/qt/qt.cpp
 
 # sync appstream app-id with Flathub
-sed -i -e 's|org\.videolan\.vlc|org.videolan.VLC|' share/vlc.appdata.xml.in.in
+# fill in release date from appstream.patch
+# https: https://code.videolan.org/videolan/vlc/-/merge_requests/1555 (4.0)
+sed -e 's|org\.videolan\.vlc|org.videolan.VLC|' \
+    -e 's|@DATE@|%(date +%F -r %{S:0})|' \
+    -e 's|http:|https:|g' \
+    -i share/vlc.appdata.xml.in.in
 
 %if 0%{?flatpak}
 # icons are renamed in order to be exported