Remove now-unused flarq.appdata.xml file

We require an AppData file for the software center, so there's no need to merge
applications that only have .desktop files.
This commit is contained in:
Richard Hughes 2015-09-18 14:10:55 +01:00
parent 9afd6729ed
commit bdee92a8ce
1 changed files with 4 additions and 19 deletions

View File

@ -3,7 +3,7 @@
Name: fldigi
Version: 3.22.13
Release: 1%{?prerel:.%{prerel}}%{?dist}
Release: 2%{?prerel:.%{prerel}}%{?dist}
Summary: Digital modem program for Linux
License: GPLv3+
@ -82,23 +82,6 @@ rm -f %{buildroot}%{_bindir}/fldigi-shell
mkdir -p %{buildroot}%{_docdir}/%{name}
install -pm 0644 %{SOURCE1} %{buildroot}%{_docdir}/%{name}/
%if 0%{?fedora}
# Merge applications into one software center item
mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
cat > $RPM_BUILD_ROOT%{_datadir}/appdata/flarq.appdata.xml <<EOF
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
<component type="desktop">
<metadata_license>CC0-1.0</metadata_license>
<id>flarq.desktop</id>
<metadata>
<value key="X-Merge-With-Parent">fldigi.desktop</value>
</metadata>
</component>
EOF
%endif
%files -f %{name}.lang
%if 0%{?rhel} < 7 || 0%{?fedora} < 21
%doc COPYING
@ -111,7 +94,6 @@ EOF
%{_datadir}/pixmaps/flarq.xpm
%{_mandir}/man1/%{name}.1.gz
%{_mandir}/man1/flarq.1.gz
%{?fedora:%{_datadir}/appdata/flarq.appdata.xml}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/applications/flarq.desktop
%{_datadir}/%{name}/
@ -122,6 +104,9 @@ EOF
%changelog
* Fri Sep 18 2015 Richard Hughes <rhughes@redhat.com> - 3.22.13-2
- Remove now-unused AppData file
* Tue Jul 21 2015 Richard Shaw <hobbes1069@gmail.com> - 3.22.13-1
- Update to latest upstream release.