Remove content_rating attributes that F27 appstream can't handle

'appstream-util refresh' on F27 crashes for empty content_rating attributes, but the appstream package is FTBFS so I can't backport the fix for that. This is a new metadata that just takes the empty content_rating attributes out that make 'appstream-util refresh' crash.
New metadata version
2018-10-12 13:10:19 +02:00 · 2018-10-10 20:04:15 +02:00 · 2018-10-10 20:01:24 +02:00 · 2018-08-08 16:54:37 +02:00 · 2018-04-19 19:07:45 +02:00 · 2018-03-27 12:24:43 +02:00
7 changed files with 87 additions and 85 deletions
--- a/appstream-data.spec
+++ b/appstream-data.spec
@ -1,19 +1,20 @@
 Summary:   Fedora AppStream metadata
 Name:      appstream-data
 Version:   27
-Release:   7%{?dist}
+Release:   14%{?dist}
 BuildArch: noarch
 License:   CC0 and CC-BY and CC-BY-SA and GFDL
 URL:       https://github.com/hughsie/createrepo_as
 Source1:   https://dl.fedoraproject.org/pub/alt/screenshots/f27/fedora-%{version}.xml.gz
 Source2:   https://dl.fedoraproject.org/pub/alt/screenshots/f27/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/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/webapps.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
-Source9:   https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/steam-oars.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
+Source10   https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/steam-oars.xml

 BuildRequires: libappstream-glib

@ -26,7 +27,7 @@ createrepo_as 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} %{SOURCE9}
+	%{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE10}

 %check
 if ! gunzip -c %{buildroot}%{_datadir}/app-info/xmls/fedora.xml.gz | grep -q '<pkgname>gstreamer1-plugin-openh264</pkgname>' ; then
@ -45,6 +46,29 @@ fi
 %dir %{_datadir}/app-info/xmls

 %changelog
+* Fri Oct 12 2018 Kalev Lember <klember@redhat.com> - 27-14
+- Remove content_rating attributes that F27 appstream can't handle
+
+* Wed Oct 10 2018 Kalev Lember <klember@redhat.com> - 27-13
+- New metadata version
+
+* Wed Aug 08 2018 Kalev Lember <klember@redhat.com> - 27-12
+- New metadata version
+
+* Thu Apr 19 2018 Kalev Lember <klember@redhat.com> - 27-11
+- New metadata version
+
+* Tue Mar 27 2018 Kalev Lember <klember@redhat.com> - 27-10
+- New metadata version
+
+* Fri Mar 02 2018 Kalev Lember <klember@redhat.com> - 27-9
+- New metadata version
+- Sync other-repos.xml and webapps.xml with fedora-appstream
+- Add google-chrome.xml with Google Chrome metadata
+
+* Thu Dec 28 2017 Kalev Lember <klember@redhat.com> - 27-8
+- New metadata version
+
 * Wed Nov 29 2017 Kalev Lember <klember@redhat.com> - 27-7
 - New metadata version

--- a/fedora-categories.xml
+++ b/fedora-categories.xml
@ -3,7 +3,7 @@

  <!-- Apps that show up as featured in GNOME Software category view -->
  <component type="desktop">
-    <id>amarok.desktop</id>
+    <id>org.kde.amarok.desktop</id>
    <categories>
      <category>Featured</category>
    </categories>
@ -39,7 +39,7 @@
    </categories>
  </component>
  <component type="desktop">
-    <id>gnome-music.desktop</id>
+    <id>org.gnome.Music.desktop</id>
    <categories>
      <category>Featured</category>
    </categories>
@ -51,25 +51,13 @@
    </categories>
  </component>
  <component type="desktop">
-    <id>rosegarden.desktop</id>
+    <id>com.rosegardenmusic.rosegarden.desktop</id>
    <categories>
      <category>Featured</category>
    </categories>
  </component>
  <component type="desktop">
-    <id>sound-juicer.desktop</id>
-    <categories>
-      <category>Featured</category>
-    </categories>
-  </component>
-  <component type="desktop">
-    <id>anjuta.desktop</id>
-    <categories>
-      <category>Featured</category>
-    </categories>
-  </component>
-  <component type="desktop">
-    <id>devassistant.desktop</id>
+    <id>org.gnome.SoundJuicer.desktop</id>
    <categories>
      <category>Featured</category>
    </categories>
@ -309,7 +297,7 @@
    </categories>
  </component>
  <component type="desktop">
-    <id>epiphany.desktop</id>
+    <id>org.gnome.Epiphany.desktop</id>
    <categories>
      <category>Featured</category>
    </categories>
@ -321,7 +309,7 @@
    </categories>
  </component>
  <component type="desktop">
-    <id>geary.desktop</id>
+    <id>org.gnome.Geary.desktop</id>
    <categories>
      <category>Featured</category>
    </categories>
@ -363,13 +351,13 @@
    </categories>
  </component>
  <component type="desktop">
-    <id>evolution.desktop</id>
+    <id>org.gnome.Evolution.desktop</id>
    <categories>
      <category>Featured</category>
    </categories>
  </component>
  <component type="desktop">
-    <id>geary.desktop</id>
+    <id>org.gnome.Geary.desktop</id>
    <categories>
      <category>Featured</category>
    </categories>
@ -489,7 +477,7 @@
    </categories>
  </component>
  <component type="desktop">
-    <id>openshot.desktop</id>
+    <id>openshot-qt.desktop</id>
    <categories>
      <category>Featured</category>
    </categories>
--- a/fedora-popular.xml
+++ b/fedora-popular.xml
@ -14,12 +14,6 @@
      <kudo>GnomeSoftware::popular</kudo>
    </kudos>
  </component>
-  <component type="desktop">
-    <id>geary.desktop</id>
-    <kudos>
-      <kudo>GnomeSoftware::popular</kudo>
-    </kudos>
-  </component>
  <component type="desktop">
    <id>gnucash.desktop</id>
    <kudos>
@ -50,6 +44,12 @@
      <kudo>GnomeSoftware::popular</kudo>
    </kudos>
  </component>
+  <component type="desktop">
+    <id>org.gnome.Geary.desktop</id>
+    <kudos>
+      <kudo>GnomeSoftware::popular</kudo>
+    </kudos>
+  </component>
  <component type="desktop">
    <id>org.gnome.Maps.desktop</id>
    <kudos>
--- a/google-chrome.xml
+++ b/google-chrome.xml
@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2017 The Chromium Authors -->
+<components version="0.8" origin="">
+  <component type="desktop">
+    <id>google-chrome.desktop</id>
+    <pkgname>google-chrome-stable</pkgname>
+    <!-- icon from https://play.google.com/store/apps/details?id=com.android.chrome -->
+    <icon type="remote">https://lh3.googleusercontent.com/nYhPnY2I-e9rpqnid9u9aAODz4C04OycEGxqHG5vxFnA35OGmLMrrUmhM9eaHKJ7liB-=w300</icon>
+    <update_contact>chromium-dev@chromium.org</update_contact>
+    <metadata_license>CC0-1.0</metadata_license>
+    <project_license>Freeware under Google Chrome Terms of Service</project_license>
+    <name>Google Chrome</name>
+    <summary>The web browser from Google</summary>
+    <description>
+      <p>
+      Google Chrome is a browser that combines a minimal design with sophisticated technology to make the web faster, safer, and easier.
+     </p>
+    </description>
+    <url type="homepage">https://chrome.google.com/</url>
+    <screenshots>
+      <screenshot type="default">
+        <image>https://www.gstatic.com/chrome/appstream/chrome-2.png</image>
+        <caption/>
+      </screenshot>
+    </screenshots>
+    <translation/>
+    <developer_name>Google</developer_name>
+    <url type="bugtracker">https://support.google.com/chrome/?p=feedback</url>
+    <url type="help">https://support.google.com/chrome</url>
+  </component>
+</components>
--- a/other-repos.xml
+++ b/other-repos.xml
@ -1,69 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <components version="0.8" origin="">
-  <component type="source">
+  <component type="generic">
    <id>adobe-release-x86_64</id>
    <pkgname>adobe-release-x86_64</pkgname>
    <metadata_license>CC0-1.0</metadata_license>
    <name>Adobe</name>
    <summary>Adobe Repository Configuration</summary>
  </component>
-  <component type="source">
-    <id>bjnplugin</id>
-    <pkgname>bjnplugin</pkgname>
-    <metadata_license>CC0-1.0</metadata_license>
-    <name>Blue Jeans</name>
-    <summary>Blue Jeans Repository Configuration</summary>
-  </component>
-  <component type="source">
-    <id>google-chrome</id>
-    <pkgname>google-chrome</pkgname>
-    <metadata_license>CC0-1.0</metadata_license>
-    <name>Google Chrome</name>
-    <summary>Google Chrome Repository Configuration</summary>
-  </component>
-  <component type="source">
-    <id>google-earth-stable</id>
-    <pkgname>google-earth-stable</pkgname>
-    <metadata_license>CC0-1.0</metadata_license>
-    <name>Google Earth</name>
-    <summary>Google Earth Repository Configuration</summary>
-  </component>
-  <component type="source">
-    <id>google-musicmanager-beta</id>
-    <pkgname>google-musicmanager-beta</pkgname>
-    <metadata_license>CC0-1.0</metadata_license>
-    <name>Google MusicManager</name>
-    <summary>Google MusicManager Repository Configuration</summary>
-  </component>
-  <component type="source">
-    <id>google-talkplugin</id>
-    <pkgname>google-talkplugin</pkgname>
-    <metadata_license>CC0-1.0</metadata_license>
-    <name>Google Talk</name>
-    <summary>Google Talk Repository Configuration</summary>
-  </component>
-  <component type="source">
+  <component type="generic">
    <id>livna-release</id>
    <pkgname>livna-release</pkgname>
    <metadata_license>CC0-1.0</metadata_license>
    <name>Livna</name>
    <summary>Livna Repository Configuration</summary>
  </component>
-  <component type="source">
-    <id>nautilus-dropbox</id>
-    <pkgname>nautilus-dropbox</pkgname>
-    <metadata_license>CC0-1.0</metadata_license>
-    <name>Dropbox</name>
-    <summary>Dropbox Repository Configuration</summary>
-  </component>
-  <component type="source">
+  <component type="generic">
    <id>rpmfusion-free-release</id>
    <pkgname>rpmfusion-free-release</pkgname>
    <metadata_license>CC0-1.0</metadata_license>
    <name>RPM Fusion Free</name>
    <summary>RPM Fusion Repository Configuration</summary>
  </component>
-  <component type="source">
+  <component type="generic">
    <id>rpmfusion-nonfree-release</id>
    <pkgname>rpmfusion-nonfree-release</pkgname>
    <metadata_license>CC0-1.0</metadata_license>
--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (fedora-27.xml.gz) = fa2578d33b93938018936a8262743f31a1d9c00cd1a578c2a357cc5a03c518bc3d2910c19cc30c2579c245a40ba94c403564e4485a39e0e7e418a71cb2b28f97
-SHA512 (fedora-27-icons.tar.gz) = 71352c603fb2333e24d2f365bcface02d7288eb35a895582cc6451ec409069c5000d4b3448cf84a2d6b8640d22d276308d6eebe80a45dc056b29d63bfaf51f55
+SHA512 (fedora-27.xml.gz) = ad35b229b532507f8fc659a5f521630a476db4a423b9c723617261034c01b64a8b914a079c9130dca6805ed6b0f06d5d65329d0bf645ca64fa5223e7d3453e05
+SHA512 (fedora-27-icons.tar.gz) = 4dd1b05fddc29615c0110f8a18da17f268678f0d3f0e16dbf5263727a76d128629702fbe74d0cd3c6560b87a7edb0ea2cd384625fe39f8e96bb522d021290d0e
--- a/webapps.xml
+++ b/webapps.xml
@ -349,7 +349,7 @@
    <id>epiphany-telegram.desktop</id>
    <metadata_license>CC0-1.0</metadata_license>
    <project_license>proprietary</project_license>
-    <name>Telegram</name>
+    <name>Telegram Web</name>
    <summary>Telegram is an instant messaging app focused on speed and security</summary>
    <description>
      <p>
@ -364,7 +364,8 @@
    <keywords>
      <keyword>telegram</keyword>
    </keywords>
-    <url type="homepage">https://telegram.org/</url>
+    <url type="homepage">https://web.telegram.org/</url>
+    <launchable type="url">https://web.telegram.org/</launchable>
    <metadata>
      <value key="X-Kudo-Popular"/>
    </metadata>
Author	SHA1	Message	Date
Kalev Lember	b693f43737	Remove content_rating attributes that F27 appstream can't handle 'appstream-util refresh' on F27 crashes for empty content_rating attributes, but the appstream package is FTBFS so I can't backport the fix for that. This is a new metadata that just takes the empty content_rating attributes out that make 'appstream-util refresh' crash.	2018-10-12 13:10:19 +02:00
Kalev Lember	3760de0760	New metadata version	2018-10-10 20:04:15 +02:00
Kalev Lember	3815b66345	Update google-chrome.xml	2018-10-10 20:01:24 +02:00
Kalev Lember	31c4ae98dd	New metadata version	2018-08-08 16:54:37 +02:00
Kalev Lember	c6eff4171c	New metadata version	2018-04-19 19:07:45 +02:00
Kalev Lember	3bbf42933a	New metadata version	2018-03-27 12:24:43 +02:00
Kalev Lember	cfe6b5c079	fedora categories: Update renamed app IDs ... and remove anjuta (replaced by gnome-builder) and devassistant (dropped from Fedora).	2018-03-08 09:24:04 +01:00
Kalev Lember	f39fd02883	fedora-popular: Fix geary app ID	2018-03-08 08:58:29 +01:00
Kalev Lember	efdbbef67f	Add google-chrome.xml with Google Chrome metadata	2018-03-02 16:08:51 +01:00
Kalev Lember	2e5eb60f81	Sync other-repos.xml and webapps.xml with fedora-appstream	2018-03-02 16:08:50 +01:00
Kalev Lember	33036cafa4	New metadata version	2018-03-02 16:05:25 +01:00
Kalev Lember	87cb56ce2b	New metadata version	2017-12-28 09:00:32 +01:00