diff --git a/contrib/gnome-software.spec.in b/contrib/gnome-software.spec.in index c54b7fb1e53e76ee07597b91c2e6ea64e690bea3..6266107bc92634c6b3640280d0f092f13536292a 100644 --- a/contrib/gnome-software.spec.in +++ b/contrib/gnome-software.spec.in @@ -132,7 +132,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %doc AUTHORS README.md %license COPYING %{_bindir}/gnome-software -%{_datadir}/applications/gnome-software-local-file.desktop +%{_datadir}/applications/gnome-software-local-file-flatpak.desktop +%{_datadir}/applications/gnome-software-local-file-fwupd.desktop +%{_datadir}/applications/gnome-software-local-file-packagekit.desktop %{_datadir}/applications/org.gnome.Software.desktop %dir %{_datadir}/gnome-software %{_datadir}/gnome-software/*.png diff --git a/po/POTFILES.in b/po/POTFILES.in index 80f52fe439813f489b4735c4b7b5bb82caa744d0..02574dda0e6c302aee3daa27152d9cb9afa0f554 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -2,7 +2,10 @@ data/metainfo/org.gnome.Software.metainfo.xml.in data/org.gnome.software.external-appstream.policy.in.in data/org.gnome.software.gschema.xml gs-install-appstream/gs-install-appstream.c -src/gnome-software-local-file.desktop.in +src/gnome-software-local-file-flatpak.desktop.in +src/gnome-software-local-file-fwupd.desktop.in +src/gnome-software-local-file-packagekit.desktop.in +src/gnome-software-local-file-snap.desktop.in src/gs-age-rating-context-dialog.c src/gs-age-rating-context-dialog.ui lib/gs-app.c diff --git a/src/gnome-software-local-file-flatpak.desktop.in b/src/gnome-software-local-file-flatpak.desktop.in new file mode 100644 index 0000000000000000000000000000000000000000..803a5819c5bd06cacb68a290ffc9fcea7ac794be --- /dev/null +++ b/src/gnome-software-local-file-flatpak.desktop.in @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Software Install +Comment=Install selected software on the system +Categories=System; +Exec=gnome-software --local-filename %f +Terminal=false +Type=Application +Icon=system-software-install +StartupNotify=true +NoDisplay=true +MimeType=application/vnd.flatpak;application/vnd.flatpak.repo;application/vnd.flatpak.ref; diff --git a/src/gnome-software-local-file-fwupd.desktop.in b/src/gnome-software-local-file-fwupd.desktop.in new file mode 100644 index 0000000000000000000000000000000000000000..01a1d8639a1c21c21aca33396313ee7d19f07485 --- /dev/null +++ b/src/gnome-software-local-file-fwupd.desktop.in @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Software Install +Comment=Install selected software on the system +Categories=System; +Exec=gnome-software --local-filename %f +Terminal=false +Type=Application +Icon=system-software-install +StartupNotify=true +NoDisplay=true +MimeType=application/vnd.ms-cab-compressed; diff --git a/src/gnome-software-local-file.desktop.in b/src/gnome-software-local-file-packagekit.desktop.in similarity index 53% rename from src/gnome-software-local-file.desktop.in rename to src/gnome-software-local-file-packagekit.desktop.in index 1c4cb0f9ee93956cae6d99dd57bca74b8d8af022..1dd0d56ccb81f670d96e33df6c3cfa687b8d9c0a 100644 --- a/src/gnome-software-local-file.desktop.in +++ b/src/gnome-software-local-file-packagekit.desktop.in @@ -5,8 +5,7 @@ Categories=System; Exec=gnome-software --local-filename %f Terminal=false Type=Application -# Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=system-software-install StartupNotify=true NoDisplay=true -MimeType=application/x-rpm;application/x-redhat-package-manager;application/x-deb;application/x-app-package;application/vnd.ms-cab-compressed;application/vnd.flatpak;application/vnd.flatpak.repo;application/vnd.flatpak.ref;application/vnd.snap; +MimeType=application/x-rpm;application/x-redhat-package-manager;application/x-deb;application/x-app-package; diff --git a/src/gnome-software-local-file-snap.desktop.in b/src/gnome-software-local-file-snap.desktop.in new file mode 100644 index 0000000000000000000000000000000000000000..d2ab5f64d2c09926d357f9cf8976344ee3c3cd72 --- /dev/null +++ b/src/gnome-software-local-file-snap.desktop.in @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Software Install +Comment=Install selected software on the system +Categories=System; +Exec=gnome-software --local-filename %f +Terminal=false +Type=Application +Icon=system-software-install +StartupNotify=true +NoDisplay=true +MimeType=application/vnd.snap; diff --git a/src/meson.build b/src/meson.build index 967159405051a2bdfd9ee50d97c72d2f4a73f672..e7f5c48aeb693821b78ce5f40634b3f7dd5fd7fc 100644 --- a/src/meson.build +++ b/src/meson.build @@ -201,14 +201,49 @@ i18n.merge_file( install_dir: join_paths(get_option('datadir'), 'applications') ) -i18n.merge_file( - input: 'gnome-software-local-file.desktop.in', - output: 'gnome-software-local-file.desktop', - type: 'desktop', - po_dir: join_paths(meson.project_source_root(), 'po'), - install: true, - install_dir: join_paths(get_option('datadir'), 'applications') -) +if get_option('flatpak') + i18n.merge_file( + input: 'gnome-software-local-file-flatpak.desktop.in', + output: 'gnome-software-local-file-flatpak.desktop', + type: 'desktop', + po_dir: join_paths(meson.project_source_root(), 'po'), + install: true, + install_dir: join_paths(get_option('datadir'), 'applications') + ) +endif + +if get_option('fwupd') + i18n.merge_file( + input: 'gnome-software-local-file-fwupd.desktop.in', + output: 'gnome-software-local-file-fwupd.desktop', + type: 'desktop', + po_dir: join_paths(meson.project_source_root(), 'po'), + install: true, + install_dir: join_paths(get_option('datadir'), 'applications') + ) +endif + +if get_option('packagekit') or get_option('rpm_ostree') + i18n.merge_file( + input: 'gnome-software-local-file-packagekit.desktop.in', + output: 'gnome-software-local-file-packagekit.desktop', + type: 'desktop', + po_dir: join_paths(meson.project_source_root(), 'po'), + install: true, + install_dir: join_paths(get_option('datadir'), 'applications') + ) +endif + +if get_option('snap') + i18n.merge_file( + input: 'gnome-software-local-file-snap.desktop.in', + output: 'gnome-software-local-file-snap.desktop', + type: 'desktop', + po_dir: join_paths(meson.project_source_root(), 'po'), + install: true, + install_dir: join_paths(get_option('datadir'), 'applications') + ) +endif install_data('org.gnome.Software-search-provider.ini', install_dir : 'share/gnome-shell/search-providers')