From b3e4a8ecfbd9b0a911f2054a3f91b1b752b7a6b2 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 01 2017 03:38:46 +0000 Subject: import appstream-data-7-20170301.el7 --- diff --git a/.appstream-data.metadata b/.appstream-data.metadata index 0898860..d654c20 100644 --- a/.appstream-data.metadata +++ b/.appstream-data.metadata @@ -1,6 +1,6 @@ -e737a0510b2d3fc72be3e42d9e27282fd281998b SOURCES/epel-7-icons.tar.gz -0c679841f59e44bd26f5e72538a69bdbb192252c SOURCES/epel-7.xml.gz +9364f525bedf030f94a2feb74b04aed4ec4ee65f SOURCES/epel-7-20170301-icons.tar.gz +d1221736d0b82ce2a287e31617419a1a4c4b6b34 SOURCES/epel-7-20170301.xml.gz 59c507ca5e5884ad502ab151a927349dbfd5b3dc SOURCES/fonts-icons.tar.gz 008d965daad9583f1083999b7e10388059edabcc SOURCES/fonts.xml.gz -d58abb9e55b12d9a5a7c9bfbec404aa736f4554e SOURCES/rhel-7-icons.tar.gz -9bc99356e06449906977b70970dfa4317681799e SOURCES/rhel-7.xml.gz +896d5fe0a38bc59ec64938bb745c41e2d238ee55 SOURCES/rhel-7-20170301-icons.tar.gz +1e07a78f0b1527ff49228da5b0789c956a758ed3 SOURCES/rhel-7-20170301.xml.gz diff --git a/.gitignore b/.gitignore index 0583592..0711d98 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ -SOURCES/epel-7-icons.tar.gz -SOURCES/epel-7.xml.gz +SOURCES/epel-7-20170301-icons.tar.gz +SOURCES/epel-7-20170301.xml.gz SOURCES/fonts-icons.tar.gz SOURCES/fonts.xml.gz -SOURCES/rhel-7-icons.tar.gz -SOURCES/rhel-7.xml.gz +SOURCES/rhel-7-20170301-icons.tar.gz +SOURCES/rhel-7-20170301.xml.gz diff --git a/SPECS/appstream-data.spec b/SPECS/appstream-data.spec index 33b7fa3..d99ed99 100644 --- a/SPECS/appstream-data.spec +++ b/SPECS/appstream-data.spec @@ -1,12 +1,14 @@ +%define gitdate 20170301 + Summary: Cached AppStream metadata Name: appstream-data Version: 7 -Release: 6%{?dist} +Release: %{gitdate}%{?dist} BuildArch: noarch License: CC0 and CC-BY and CC-BY-SA and GFDL URL: http://people.redhat.com/rhughes/metadata/ -Source1: http://people.redhat.com/rhughes/metadata/rhel-%{version}.xml.gz -Source2: http://people.redhat.com/rhughes/metadata/rhel-%{version}-icons.tar.gz +Source1: http://people.redhat.com/rhughes/metadata/rhel-%{version}-%{gitdate}.xml.gz +Source2: http://people.redhat.com/rhughes/metadata/rhel-%{version}-%{gitdate}-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 @@ -17,15 +19,31 @@ Source7: fonts.xml.gz Source8: fonts-icons.tar.gz # extra applications not in RHEL -Source9: http://people.redhat.com/rhughes/metadata/epel-%{version}.xml.gz -Source10: http://people.redhat.com/rhughes/metadata/epel-%{version}-icons.tar.gz +Source9: http://people.redhat.com/rhughes/metadata/epel-%{version}-%{gitdate}.xml.gz +Source10: http://people.redhat.com/rhughes/metadata/epel-%{version}-%{gitdate}-icons.tar.gz # This is built using: -# sshfs user@host:/media/mirror/RHEL /media/mirror/ -# reposync -r rhel-7.2-candidate -p /media/mirror/ -# https://github.com/hughsie/appstream-scripts/blob/master/rhel/rhel-7.2-candidate.sh +# sshfs user@host:/media/bulk/mirror/RHEL /media/mirror/ +# reposync -r rhel-7.4-candidate -p /media/mirror/ +# https://github.com/hughsie/appstream-scripts/blob/master/rhel/rhel-7.4-candidate.sh +# +# For a long time (but not long enough to be older than the original release of +# RHEL 7) we require applications to ship with AppData files if they want to +# show up in the software center. +# +# Do avoid dropping important apps without .appdata.xml files we will grab +# metadata from Fedora 23,24,25 for the missing components. +# +# So we never drop applications from one RHEL release to the next we'll also do: +# +# appstream-util merge-appstream rhel-7-new.xml.gz old/rhel-7.xml.gz new/rhel-7.xml.gz +# appstream-util merge-appstream epel-7-new.xml.gz old/epel-7.xml.gz new/epel-7.xml.gz # -# Be sure to use appstream-glib 0.4.1 or newer when generating! +# ...and then you must manually MERGE the icon tarballs rather than replacing +# the tarball with the generated copy. +# +# You can also verify what was added or removed using: +# appstream-util compare old/epel-7.xml.gz new/epel-7.xml.gz BuildRequires: libappstream-glib @@ -35,10 +53,17 @@ for the GNOME and KDE software centers. %install -DESTDIR=%{buildroot} appstream-util install %{SOURCE1} %{SOURCE2} +# we can't use `install-origin` as appstream-glib in RHEL is too old, and the +# tarball name has to match the origin :/ +cp %{SOURCE1} rhel-%{version}.xml.gz +cp %{SOURCE2} rhel-%{version}-icons.tar.gz +cp %{SOURCE9} epel-%{version}.xml.gz +cp %{SOURCE10} epel-%{version}-icons.tar.gz + +DESTDIR=%{buildroot} appstream-util install rhel-%{version}.xml.gz rhel-%{version}-icons.tar.gz +DESTDIR=%{buildroot} appstream-util install epel-%{version}.xml.gz epel-%{version}-icons.tar.gz DESTDIR=%{buildroot} appstream-util install \ - %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} \ - %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE10} + %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} # work around the not-yet-in-rhel install-origin mv %{buildroot}/usr/share/app-info/icons/fonts/64x64/* %{buildroot}/usr/share/app-info/icons/rhel-%{version}/64x64/ @@ -58,6 +83,14 @@ rmdir %{buildroot}/usr/share/app-info/icons/fonts %dir %{_datadir}/app-info/xmls %changelog +* Wed Mar 01 2017 Richard Hughes 7-20170301 +- Rename the generated metadata files to placate RPMDiff. +- Resolves: RHBZ#1386778 + +* Wed Mar 01 2017 Richard Hughes 7-7 +- Regenerate the RHEL metadata using rhel-7.4-candidate +- Resolves: RHBZ#1386778 + * Wed Jul 29 2015 Richard Hughes 7-6 - Use a Red Hat screenshot mirror location - Resolves: #1237362