Fix appdata file name to match with desktop file name

These two need to match so that appstream-builder can put the data
together.

https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/TIM6GAMLE537WCSJDHU4YSMFKF2QI3AV/
f40
Kalev Lember 8 years ago
parent 312fc4aaeb
commit 7cbcada4ea

@ -2,7 +2,7 @@
Name: nextcloud-client Name: nextcloud-client
Version: 2.2.4 Version: 2.2.4
Release: 7%{?dist} Release: 8%{?dist}
Summary: The Nextcloud Client Summary: The Nextcloud Client
# -libs are LGPLv2+, rest GPLv2 # -libs are LGPLv2+, rest GPLv2
@ -10,7 +10,7 @@ License: LGPLv2+ and GPLv2
Url: https://nextcloud.com/install/#install-clients Url: https://nextcloud.com/install/#install-clients
Source0: https://github.com/nextcloud/client_theming/archive/v%{version}.tar.gz Source0: https://github.com/nextcloud/client_theming/archive/v%{version}.tar.gz
Source1: https://download.owncloud.com/desktop/stable/owncloudclient-%{version}.tar.xz Source1: https://download.owncloud.com/desktop/stable/owncloudclient-%{version}.tar.xz
Source2: %{name}.appdata.xml Source2: nextcloud.appdata.xml
Patch0: %{name}-%{version}-syslibs.patch Patch0: %{name}-%{version}-syslibs.patch
# backport of https://github.com/owncloud/client/pull/5294 # backport of https://github.com/owncloud/client/pull/5294
# Fedora Rawhide 26 ships OpenSSL 1.1.0 that no longer permits to call the old # Fedora Rawhide 26 ships OpenSSL 1.1.0 that no longer permits to call the old
@ -156,7 +156,7 @@ make install DESTDIR=%{buildroot}
popd popd
%find_lang client --with-qt %find_lang client --with-qt
mkdir -p %{buildroot}%{_datadir}/appdata/ mkdir -p %{buildroot}%{_datadir}/appdata/
install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/appdata/nextcloud.appdata.xml
%if 0%{?fedora} >= 24 || 0%{?rhel} > 7 %if 0%{?fedora} >= 24 || 0%{?rhel} > 7
# Make a Caja extension from a Nemo's one. # Make a Caja extension from a Nemo's one.
@ -174,7 +174,7 @@ rm -f %{buildroot}%{_kf5_datadir}/kservices5/nextclouddolphinactionplugin.deskto
%endif %endif
%check %check
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/nextcloud.appdata.xml
%post %post
@ -202,7 +202,7 @@ fi
%{_bindir}/nextcloudcmd %{_bindir}/nextcloudcmd
%{_datadir}/applications/nextcloud.desktop %{_datadir}/applications/nextcloud.desktop
%{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/hicolor/*/apps/*
%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/appdata/nextcloud.appdata.xml
%files libs %files libs
%{_libdir}/libnextcloudsync.so.0 %{_libdir}/libnextcloudsync.so.0
@ -238,6 +238,8 @@ fi
%endif %endif
%changelog %changelog
* Wed Jan 11 2017 Kalev Lember <klember@redhat.com> - 2.2.4-8
- Fix appdata file name to match with desktop file name
* Mon Jan 02 2017 Claudio Rodrigo Pereyra Diaz <elsupergomez@fedoraproject.org> - 2.2.4-7 * Mon Jan 02 2017 Claudio Rodrigo Pereyra Diaz <elsupergomez@fedoraproject.org> - 2.2.4-7
- Add caja extension - Add caja extension
* Mon Jan 02 2017 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 2.2.4-6 * Mon Jan 02 2017 Timotheus Pokorra <timotheus.pokorra@solidcharity.com> - 2.2.4-6

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<application> <application>
<id type="desktop">Nextcloud-client.desktop</id> <id type="desktop">nextcloud.desktop</id>
<licence>CC0</licence> <licence>CC0</licence>
<name>Nextcloud Desktop Client</name> <name>Nextcloud Desktop Client</name>
<summary>The Nextcloud desktop client, lets you sync directly to your Nextcloud server</summary> <summary>The Nextcloud desktop client, lets you sync directly to your Nextcloud server</summary>
Loading…
Cancel
Save