Rename desktop and appdata files

This commit is contained in:
Jonas Kvinge 2019-02-22 20:41:06 +01:00
parent 096c995a91
commit e594cf299e
6 changed files with 13 additions and 13 deletions

4
dist/CMakeLists.txt vendored
View File

@ -20,8 +20,8 @@ if (UNIX AND NOT APPLE)
install(FILES ../data/icons/64x64/strawberry.png DESTINATION share/icons/hicolor/64x64/apps/) install(FILES ../data/icons/64x64/strawberry.png DESTINATION share/icons/hicolor/64x64/apps/)
install(FILES ../data/icons/128x128/strawberry.png DESTINATION share/icons/hicolor/128x128/apps/) install(FILES ../data/icons/128x128/strawberry.png DESTINATION share/icons/hicolor/128x128/apps/)
install(FILES ../data/icons/128x128/strawberry.svg DESTINATION share/icons/hicolor/scalable/apps/) install(FILES ../data/icons/128x128/strawberry.svg DESTINATION share/icons/hicolor/scalable/apps/)
install(FILES unix/strawberry.desktop DESTINATION share/applications) install(FILES unix/org.strawbs.strawberry.desktop DESTINATION share/applications)
install(FILES unix/strawberry.appdata.xml DESTINATION share/metainfo) install(FILES unix/org.strawbs.strawberry.appdata.xml DESTINATION share/metainfo)
install(FILES man/strawberry.1 man/strawberry-tagreader.1 DESTINATION share/man/man1) install(FILES man/strawberry.1 man/strawberry-tagreader.1 DESTINATION share/man/man1)
endif() endif()

View File

@ -93,8 +93,8 @@ make install DESTDIR=%{buildroot} -C %{_target_platform}
mv %{buildroot}%{_datadir}/metainfo %{buildroot}%{_datadir}/appdata mv %{buildroot}%{_datadir}/metainfo %{buildroot}%{_datadir}/appdata
%check %check
desktop-file-validate %{buildroot}%{_datadir}/applications/strawberry.desktop desktop-file-validate %{buildroot}%{_datadir}/applications/org.strawbs.strawberry.desktop
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/strawberry.appdata.xml appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/org.strawbs.strawberry.appdata.xml
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -102,12 +102,12 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/strawberry
%license COPYING %license COPYING
%{_bindir}/strawberry %{_bindir}/strawberry
%{_bindir}/strawberry-tagreader %{_bindir}/strawberry-tagreader
%{_datadir}/applications/strawberry.desktop %{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/48x48/apps/strawberry.png %{_datadir}/icons/hicolor/48x48/apps/strawberry.png
%{_datadir}/icons/hicolor/64x64/apps/strawberry.png %{_datadir}/icons/hicolor/64x64/apps/strawberry.png
%{_datadir}/icons/hicolor/128x128/apps/strawberry.png %{_datadir}/icons/hicolor/128x128/apps/strawberry.png
%{_datadir}/icons/hicolor/scalable/apps/strawberry.svg %{_datadir}/icons/hicolor/scalable/apps/strawberry.svg
%{_datadir}/appdata/strawberry.appdata.xml %{_datadir}/appdata/*.appdata.xml
%{_mandir}/man1/strawberry.1.* %{_mandir}/man1/strawberry.1.*
%{_mandir}/man1/strawberry-tagreader.1.* %{_mandir}/man1/strawberry-tagreader.1.*

View File

@ -97,11 +97,11 @@ cd build
make clean make clean
%check %check
desktop-file-validate %{buildroot}%{_datadir}/applications/strawberry.desktop desktop-file-validate %{buildroot}%{_datadir}/applications/org.strawbs.strawberry.desktop
%if 0%{?suse_version} >= 1500 %if 0%{?suse_version} >= 1500
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/strawberry.appdata.xml appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.strawbs.strawberry.appdata.xml
%else %else
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/strawberry.appdata.xml appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/org.strawbs.strawberry.appdata.xml
%endif %endif
%files %files
@ -110,15 +110,15 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/strawberry
%license COPYING %license COPYING
%{_bindir}/strawberry %{_bindir}/strawberry
%{_bindir}/strawberry-tagreader %{_bindir}/strawberry-tagreader
%{_datadir}/applications/strawberry.desktop %{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/48x48/apps/strawberry.png %{_datadir}/icons/hicolor/48x48/apps/strawberry.png
%{_datadir}/icons/hicolor/64x64/apps/strawberry.png %{_datadir}/icons/hicolor/64x64/apps/strawberry.png
%{_datadir}/icons/hicolor/128x128/apps/strawberry.png %{_datadir}/icons/hicolor/128x128/apps/strawberry.png
%{_datadir}/icons/hicolor/scalable/apps/strawberry.svg %{_datadir}/icons/hicolor/scalable/apps/strawberry.svg
%if 0%{?suse_version} >= 1500 %if 0%{?suse_version} >= 1500
%{_datadir}/metainfo/strawberry.appdata.xml %{_datadir}/metainfo/*.appdata.xml
%else %else
%{_datadir}/appdata/strawberry.appdata.xml %{_datadir}/appdata/*.appdata.xml
%endif %endif
%{_mandir}/man1/%{name}.1%{?ext_man} %{_mandir}/man1/%{name}.1%{?ext_man}
%{_mandir}/man1/%{name}-tagreader.1%{?ext_man} %{_mandir}/man1/%{name}-tagreader.1%{?ext_man}

View File

@ -91,7 +91,7 @@ parts:
apps: apps:
strawberry: strawberry:
command: desktop-launch $SNAP/bin/strawberry command: desktop-launch $SNAP/bin/strawberry
desktop: share/applications/strawberry.desktop desktop: share/applications/org.strawbs.strawberry.desktop
environment: environment:
LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pulseaudio LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pulseaudio
plugs: plugs: