From c68504131031738bd3c0bc267b6a7ed754c6f40c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 10 2018 05:29:51 +0000 Subject: import gnome-software-3.22.7-5.el7 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f817d21 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/gnome-software-3.22.7.tar.xz diff --git a/.gnome-software.metadata b/.gnome-software.metadata new file mode 100644 index 0000000..070ca9e --- /dev/null +++ b/.gnome-software.metadata @@ -0,0 +1 @@ +7f1f56fd09386ad830b26d0350fb7c471fd1e7f3 SOURCES/gnome-software-3.22.7.tar.xz diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/0001-Change-the-name-of-the-application-to-Application-In.patch b/SOURCES/0001-Change-the-name-of-the-application-to-Application-In.patch new file mode 100644 index 0000000..916a58d --- /dev/null +++ b/SOURCES/0001-Change-the-name-of-the-application-to-Application-In.patch @@ -0,0 +1,24 @@ +From f1ddbbbb11503d6fc236c2f1a6d3678b6459cdad Mon Sep 17 00:00:00 2001 +From: Richard Hughes +Date: Wed, 8 Jul 2015 16:38:36 +0100 +Subject: [PATCH] Change the name of the application to 'Application Installer' + +The 'Software' name was taken by GNOME PackageKit prior to the rebase. +--- + src/org.gnome.Software.desktop.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/org.gnome.Software.desktop.in b/src/org.gnome.Software.desktop.in +index 849a14c..116002f 100644 +--- a/src/org.gnome.Software.desktop.in ++++ b/src/org.gnome.Software.desktop.in +@@ -1,5 +1,5 @@ + [Desktop Entry] +-_Name=Software ++_Name=Application Installer + _Comment=Add, remove or update software on this computer + Icon=org.gnome.Software + Exec=gnome-software %U +-- +2.4.3 + diff --git a/SOURCES/0001-flatpak-Set-the-correct-origin-when-installing-a-fla.patch b/SOURCES/0001-flatpak-Set-the-correct-origin-when-installing-a-fla.patch new file mode 100644 index 0000000..e85c06c --- /dev/null +++ b/SOURCES/0001-flatpak-Set-the-correct-origin-when-installing-a-fla.patch @@ -0,0 +1,44 @@ +From 3b305e27d1c0f51f2dc42bb9ad58eb90396f44c4 Mon Sep 17 00:00:00 2001 +From: Joaquim Rocha +Date: Sat, 1 Jul 2017 01:33:00 +0200 +Subject: [PATCH] flatpak: Set the correct origin when installing a flatpakref + +When installing a flatpakref, part of the process is to install its +ref file, and the code was assuming that this installation always +results in a new remote (named as app_name-origin). However, if there +is already a remote with the same URI as the one coming from the ref +file, it will not add the new one in order to avoid redudancy. + +Since the GsApp representing the one in the flatpakref was being +assigned the "app_name-origin" as its origin, it would fail to install +later because this expected origin may not exist (as explained above). + +To fix this, once the ref file is installed, we get the resulting +remote's name (i.e. a new one or the existing one) and override the +app's origin with it, which will allow the installation to succeed. +--- + src/plugins/gs-flatpak.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/plugins/gs-flatpak.c b/src/plugins/gs-flatpak.c +index c5a0df3ddc03..55ebba169fb7 100644 +--- a/src/plugins/gs-flatpak.c ++++ b/src/plugins/gs-flatpak.c +@@ -2513,6 +2513,14 @@ gs_flatpak_app_install (GsFlatpak *self, + return FALSE; + } + ++ /* the installation of the ref file above will not create a new remote for ++ * the app if its URL is already configured as another remote, thus we ++ * need to update the app origin to match that or it may end up with ++ * an nonexistent origin; and we first need to set the origin to NULL to ++ * circumvent the safety check... */ ++ gs_app_set_origin (app, NULL); ++ gs_app_set_origin (app, flatpak_remote_ref_get_remote_name (xref2)); ++ + /* update search tokens for new remote */ + if (!gs_flatpak_refresh_appstream (self, G_MAXUINT, 0, cancellable, error)) + return FALSE; +-- +1.8.3.1 + diff --git a/SOURCES/0001-packagekit-Never-call-GetDetails-when-there-are-no-s.patch b/SOURCES/0001-packagekit-Never-call-GetDetails-when-there-are-no-s.patch new file mode 100644 index 0000000..1825e00 --- /dev/null +++ b/SOURCES/0001-packagekit-Never-call-GetDetails-when-there-are-no-s.patch @@ -0,0 +1,27 @@ +From 810b31a71812a0738c1114edc3ac61b8f55751b9 Mon Sep 17 00:00:00 2001 +From: Richard Hughes +Date: Tue, 19 Sep 2017 11:50:03 +0100 +Subject: [PATCH 1/2] packagekit: Never call GetDetails when there are no + source IDs + +Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1445651 +--- + src/plugins/gs-plugin-packagekit-refine.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/plugins/gs-plugin-packagekit-refine.c b/src/plugins/gs-plugin-packagekit-refine.c +index 2e4c1dfd..b5c6f990 100644 +--- a/src/plugins/gs-plugin-packagekit-refine.c ++++ b/src/plugins/gs-plugin-packagekit-refine.c +@@ -520,6 +520,8 @@ gs_plugin_packagekit_refine_details (GsPlugin *plugin, + g_ptr_array_add (package_ids, g_strdup (package_id)); + } + } ++ if (package_ids->len == 0) ++ return TRUE; + g_ptr_array_add (package_ids, NULL); + + data.app = NULL; +-- +2.13.5 + diff --git a/SOURCES/0001-trivial-Add-another-application-to-the-blacklist.patch b/SOURCES/0001-trivial-Add-another-application-to-the-blacklist.patch new file mode 100644 index 0000000..a4923cd --- /dev/null +++ b/SOURCES/0001-trivial-Add-another-application-to-the-blacklist.patch @@ -0,0 +1,24 @@ +From 3780bee0daab26359d3755038cf5650ed118c174 Mon Sep 17 00:00:00 2001 +From: Richard Hughes +Date: Fri, 3 Nov 2017 14:38:24 +0000 +Subject: [PATCH] trivial: Add another application to the blacklist + +--- + src/plugins/gs-plugin-hardcoded-blacklist.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/plugins/gs-plugin-hardcoded-blacklist.c b/src/plugins/gs-plugin-hardcoded-blacklist.c +index 8656a61e..0203f140 100644 +--- a/src/plugins/gs-plugin-hardcoded-blacklist.c ++++ b/src/plugins/gs-plugin-hardcoded-blacklist.c +@@ -57,6 +57,7 @@ gs_plugin_refine_app (GsPlugin *plugin, + "tracker-preferences.desktop", + "Uninstall*.desktop", + "wine-*.desktop", ++ "gnome-session-properties.desktop", + NULL }; + + /* not set yet */ +-- +2.14.3 + diff --git a/SOURCES/0002-trivial-Add-some-error-prefixes-to-better-chase-down.patch b/SOURCES/0002-trivial-Add-some-error-prefixes-to-better-chase-down.patch new file mode 100644 index 0000000..58b90ac --- /dev/null +++ b/SOURCES/0002-trivial-Add-some-error-prefixes-to-better-chase-down.patch @@ -0,0 +1,282 @@ +From 67f10091c97f5c5975fe620948803cec2e81aa34 Mon Sep 17 00:00:00 2001 +From: Richard Hughes +Date: Tue, 19 Sep 2017 11:50:41 +0100 +Subject: [PATCH 2/2] trivial: Add some error prefixes to better chase down + bugs + +--- + src/plugins/gs-plugin-packagekit-local.c | 8 ++++++-- + src/plugins/gs-plugin-packagekit-origin.c | 4 +++- + src/plugins/gs-plugin-packagekit-refine.c | 24 ++++++++++++++++++------ + src/plugins/gs-plugin-packagekit-refresh.c | 5 ++++- + src/plugins/gs-plugin-packagekit-upgrade.c | 1 + + src/plugins/gs-plugin-packagekit.c | 28 ++++++++++++++++++++++------ + 6 files changed, 54 insertions(+), 16 deletions(-) + +diff --git a/src/plugins/gs-plugin-packagekit-local.c b/src/plugins/gs-plugin-packagekit-local.c +index 7d76c702..5e8d8022 100644 +--- a/src/plugins/gs-plugin-packagekit-local.c ++++ b/src/plugins/gs-plugin-packagekit-local.c +@@ -102,8 +102,10 @@ gs_plugin_packagekit_refresh_guess_app_id (GsPlugin *plugin, + cancellable, + gs_plugin_packagekit_progress_cb, &data, + error); +- if (!gs_plugin_packagekit_results_valid (results, error)) ++ if (!gs_plugin_packagekit_results_valid (results, error)) { ++ g_prefix_error (error, "failed to get files local: "); + return FALSE; ++ } + array = pk_results_get_files_array (results); + if (array->len == 0) { + g_set_error (error, +@@ -180,8 +182,10 @@ gs_plugin_file_to_app (GsPlugin *plugin, + cancellable, + gs_plugin_packagekit_progress_cb, &data, + error); +- if (!gs_plugin_packagekit_results_valid (results, error)) ++ if (!gs_plugin_packagekit_results_valid (results, error)) { ++ g_prefix_error (error, "failed to get details local: "); + return FALSE; ++ } + + /* get results */ + array = pk_results_get_details_array (results); +diff --git a/src/plugins/gs-plugin-packagekit-origin.c b/src/plugins/gs-plugin-packagekit-origin.c +index 4d81963c..4e6b3d14 100644 +--- a/src/plugins/gs-plugin-packagekit-origin.c ++++ b/src/plugins/gs-plugin-packagekit-origin.c +@@ -86,8 +86,10 @@ gs_plugin_packagekit_origin_ensure_sources (GsPlugin *plugin, + cancellable, + NULL, plugin, + error); +- if (!gs_plugin_packagekit_results_valid (results, error)) ++ if (!gs_plugin_packagekit_results_valid (results, error)) { ++ g_prefix_error (error, "failed to get repo list: "); + return FALSE; ++ } + array = pk_results_get_repo_detail_array (results); + for (i = 0; i < array->len; i++) { + rd = g_ptr_array_index (array, i); +diff --git a/src/plugins/gs-plugin-packagekit-refine.c b/src/plugins/gs-plugin-packagekit-refine.c +index b5c6f990..ec471f83 100644 +--- a/src/plugins/gs-plugin-packagekit-refine.c ++++ b/src/plugins/gs-plugin-packagekit-refine.c +@@ -276,8 +276,10 @@ gs_plugin_packagekit_resolve_packages (GsPlugin *plugin, + cancellable, + gs_plugin_packagekit_progress_cb, &data, + error); +- if (!gs_plugin_packagekit_results_valid (results, error)) ++ if (!gs_plugin_packagekit_results_valid (results, error)) { ++ g_prefix_error (error, "failed to resolve packages: "); + return FALSE; ++ } + + /* get results */ + packages = pk_results_get_package_array (results); +@@ -315,8 +317,10 @@ gs_plugin_packagekit_refine_from_desktop (GsPlugin *plugin, + cancellable, + gs_plugin_packagekit_progress_cb, &data, + error); +- if (!gs_plugin_packagekit_results_valid (results, error)) ++ if (!gs_plugin_packagekit_results_valid (results, error)) { ++ g_prefix_error (error, "failed to refine from desktop file: "); + return FALSE; ++ } + + /* get results */ + packages = pk_results_get_package_array (results); +@@ -393,8 +397,10 @@ gs_plugin_packagekit_refine_updatedetails (GsPlugin *plugin, + cancellable, + gs_plugin_packagekit_progress_cb, &data, + error); +- if (!gs_plugin_packagekit_results_valid (results, error)) ++ if (!gs_plugin_packagekit_results_valid (results, error)) { ++ g_prefix_error (error, "failed to refine update details: "); + return FALSE; ++ } + + /* set the update details for the update */ + array = pk_results_get_update_detail_array (results); +@@ -535,8 +541,10 @@ gs_plugin_packagekit_refine_details (GsPlugin *plugin, + cancellable, + gs_plugin_packagekit_progress_cb, &data, + error); +- if (!gs_plugin_packagekit_results_valid (results, error)) ++ if (!gs_plugin_packagekit_results_valid (results, error)) { ++ g_prefix_error (error, "failed to refine details: "); + return FALSE; ++ } + + /* set the update details for the update */ + array = pk_results_get_details_array (results); +@@ -574,8 +582,10 @@ gs_plugin_packagekit_refine_update_urgency (GsPlugin *plugin, + cancellable, + gs_plugin_packagekit_progress_cb, &data, + error); +- if (!gs_plugin_packagekit_results_valid (results, error)) ++ if (!gs_plugin_packagekit_results_valid (results, error)) { ++ g_prefix_error (error, "failed to get updates: "); + return FALSE; ++ } + + /* set the update severity for the app */ + sack = pk_results_get_package_sack (results); +@@ -765,8 +775,10 @@ gs_plugin_packagekit_refine_distro_upgrade (GsPlugin *plugin, + error); + pk_client_set_cache_age (priv->client, cache_age_save); + +- if (!gs_plugin_packagekit_results_valid (results, error)) ++ if (!gs_plugin_packagekit_results_valid (results, error)) { ++ g_prefix_error (error, "failed to refine distro upgrades: "); + return FALSE; ++ } + list = gs_app_list_new (); + if (!gs_plugin_packagekit_add_results (plugin, list, results, error)) + return FALSE; +diff --git a/src/plugins/gs-plugin-packagekit-refresh.c b/src/plugins/gs-plugin-packagekit-refresh.c +index 68b81c5f..71c4d6fa 100644 +--- a/src/plugins/gs-plugin-packagekit-refresh.c ++++ b/src/plugins/gs-plugin-packagekit-refresh.c +@@ -124,8 +124,10 @@ gs_plugin_refresh (GsPlugin *plugin, + cancellable, + gs_plugin_packagekit_progress_cb, &data, + error); +- if (!gs_plugin_packagekit_results_valid (results, error)) ++ if (!gs_plugin_packagekit_results_valid (results, error)) { ++ g_prefix_error (error, "failed to get updates: "); + return FALSE; ++ } + } + + /* download all the packages themselves */ +@@ -145,6 +147,7 @@ gs_plugin_refresh (GsPlugin *plugin, + gs_plugin_packagekit_progress_cb, &data, + error); + if (results2 == NULL) { ++ g_prefix_error (error, "failed to update packages: "); + gs_plugin_packagekit_convert_gerror (error); + return FALSE; + } +diff --git a/src/plugins/gs-plugin-packagekit-upgrade.c b/src/plugins/gs-plugin-packagekit-upgrade.c +index 6791efc4..7a35df11 100644 +--- a/src/plugins/gs-plugin-packagekit-upgrade.c ++++ b/src/plugins/gs-plugin-packagekit-upgrade.c +@@ -104,6 +104,7 @@ gs_plugin_app_upgrade_download (GsPlugin *plugin, + gs_plugin_packagekit_progress_cb, &data, + error); + if (!gs_plugin_packagekit_results_valid (results, error)) { ++ g_prefix_error (error, "failed to upgrade system: "); + gs_app_set_state_recover (app); + return FALSE; + } +diff --git a/src/plugins/gs-plugin-packagekit.c b/src/plugins/gs-plugin-packagekit.c +index d0aecbc5..2059e117 100644 +--- a/src/plugins/gs-plugin-packagekit.c ++++ b/src/plugins/gs-plugin-packagekit.c +@@ -132,8 +132,10 @@ gs_plugin_add_sources_related (GsPlugin *plugin, + cancellable, + gs_plugin_packagekit_progress_cb, &data, + error); +- if (!gs_plugin_packagekit_results_valid (results, error)) ++ if (!gs_plugin_packagekit_results_valid (results, error)) { ++ g_prefix_error (error, "failed to get packages: "); + return FALSE; ++ } + ret = gs_plugin_packagekit_add_results (plugin, + installed, + results, +@@ -186,8 +188,10 @@ gs_plugin_add_sources (GsPlugin *plugin, + cancellable, + gs_plugin_packagekit_progress_cb, &data, + error); +- if (!gs_plugin_packagekit_results_valid (results, error)) ++ if (!gs_plugin_packagekit_results_valid (results, error)) { ++ g_prefix_error (error, "failed to get repo list: "); + return FALSE; ++ } + hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + array = pk_results_get_repo_detail_array (results); + for (i = 0; i < array->len; i++) { +@@ -238,8 +242,10 @@ gs_plugin_app_source_enable (GsPlugin *plugin, + cancellable, + gs_plugin_packagekit_progress_cb, &data, + error); +- if (!gs_plugin_packagekit_results_valid (results, error)) ++ if (!gs_plugin_packagekit_results_valid (results, error)) { ++ g_prefix_error (error, "failed to enable repo: "); + return FALSE; ++ } + return TRUE; + } + +@@ -302,6 +308,7 @@ gs_plugin_app_install (GsPlugin *plugin, + gs_plugin_packagekit_progress_cb, &data, + error); + if (!gs_plugin_packagekit_results_valid (results, error)) { ++ g_prefix_error (error, "failed to install packages: "); + gs_app_set_state_recover (app); + return FALSE; + } +@@ -371,6 +378,7 @@ gs_plugin_app_install (GsPlugin *plugin, + gs_plugin_packagekit_progress_cb, &data, + error); + if (!gs_plugin_packagekit_results_valid (results, error)) { ++ g_prefix_error (error, "failed to install packages: "); + gs_app_set_state_recover (app); + return FALSE; + } +@@ -396,6 +404,7 @@ gs_plugin_app_install (GsPlugin *plugin, + gs_plugin_packagekit_progress_cb, &data, + error); + if (!gs_plugin_packagekit_results_valid (results, error)) { ++ g_prefix_error (error, "failed to install files: "); + gs_app_set_state_recover (app); + return FALSE; + } +@@ -445,8 +454,10 @@ gs_plugin_app_source_disable (GsPlugin *plugin, + cancellable, + gs_plugin_packagekit_progress_cb, &data, + error); +- if (!gs_plugin_packagekit_results_valid (results, error)) ++ if (!gs_plugin_packagekit_results_valid (results, error)) { ++ g_prefix_error (error, "failed to disable source: "); + return FALSE; ++ } + return TRUE; + } + +@@ -547,6 +558,7 @@ gs_plugin_app_remove (GsPlugin *plugin, + gs_plugin_packagekit_progress_cb, &data, + error); + if (!gs_plugin_packagekit_results_valid (results, error)) { ++ g_prefix_error (error, "failed to remove packages: "); + gs_app_set_state_recover (app); + return FALSE; + } +@@ -587,8 +599,10 @@ gs_plugin_add_search_files (GsPlugin *plugin, + cancellable, + gs_plugin_packagekit_progress_cb, &data, + error); +- if (!gs_plugin_packagekit_results_valid (results, error)) ++ if (!gs_plugin_packagekit_results_valid (results, error)) { ++ g_prefix_error (error, "failed to search for files: "); + return FALSE; ++ } + + /* add results */ + return gs_plugin_packagekit_add_results (plugin, list, results, error); +@@ -621,8 +635,10 @@ gs_plugin_add_search_what_provides (GsPlugin *plugin, + cancellable, + gs_plugin_packagekit_progress_cb, &data, + error); +- if (!gs_plugin_packagekit_results_valid (results, error)) ++ if (!gs_plugin_packagekit_results_valid (results, error)) { ++ g_prefix_error (error, "failed to search what provides: "); + return FALSE; ++ } + + /* add results */ + return gs_plugin_packagekit_add_results (plugin, list, results, error); +-- +2.13.5 + diff --git a/SOURCES/downstream-translations.patch b/SOURCES/downstream-translations.patch new file mode 100644 index 0000000..36b59ce --- /dev/null +++ b/SOURCES/downstream-translations.patch @@ -0,0 +1,140 @@ +From 7440a2a58062181f6dae2ac2ddda30ae72eb2e73 Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Thu, 9 Mar 2017 14:55:30 +0100 +Subject: [PATCH] Downstream translations for RHEL 7 + +--- + po/de.po | 4 ++++ + po/es.po | 4 ++++ + po/fr.po | 4 ++++ + po/it.po | 4 ++++ + po/ja.po | 4 ++++ + po/ko.po | 3 +++ + po/pt_BR.po | 4 ++++ + po/ru.po | 4 ++++ + po/zh_CN.po | 4 ++++ + po/zh_TW.po | 4 ++++ + 10 files changed, 39 insertions(+) + +diff --git a/po/de.po b/po/de.po +index 9f9b29b..266a34d 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -3784,3 +3784,7 @@ msgstr "Zubehör" + + #~ msgid "Getting software details…" + #~ msgstr "Software-Details werden ermittelt …" ++ ++#: ../src/org.gnome.Software.desktop.in.h:1 ++msgid "Application Installer" ++msgstr "Anwendungs-Installer" +diff --git a/po/es.po b/po/es.po +index 20bf608..77170a5 100644 +--- a/po/es.po ++++ b/po/es.po +@@ -3960,3 +3960,7 @@ msgstr "Utilidades" + + #~ msgid "OS Update" + #~ msgstr "Actualización del SO" ++ ++#: ../src/org.gnome.Software.desktop.in.h:1 ++msgid "Application Installer" ++msgstr "Instalador de aplicaciones" +diff --git a/po/fr.po b/po/fr.po +index be28563..f5af80b 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -3064,3 +3064,7 @@ msgstr "Utilitaires" + #~ msgstr "" + #~ "Les sources de logiciels vous donnent accès à des logiciels " + #~ "supplémentaires." ++ ++#: ../src/org.gnome.Software.desktop.in.h:1 ++msgid "Application Installer" ++msgstr "Installeur d'application" +diff --git a/po/it.po b/po/it.po +index 739496e..05d3885 100644 +--- a/po/it.po ++++ b/po/it.po +@@ -3047,3 +3047,7 @@ msgstr "Fonte" + #: ../src/plugins/gs-desktop-common.c:356 + msgid "Utilities" + msgstr "Utilità" ++ ++#: ../src/org.gnome.Software.desktop.in.h:1 ++msgid "Application Installer" ++msgstr "Programma d'installazione delle applicazioni" +diff --git a/po/ja.po b/po/ja.po +index 755e0fd..a20a7e2 100644 +--- a/po/ja.po ++++ b/po/ja.po +@@ -2868,3 +2868,7 @@ msgstr "ローカライゼーション" + #~| msgid "Updated" + #~ msgid "Update" + #~ msgstr "更新" ++ ++#: ../src/org.gnome.Software.desktop.in.h:1 ++msgid "Application Installer" ++msgstr "アプリケーションインストーラー" +diff --git a/po/ko.po b/po/ko.po +index 621e827..c95a541 100644 +--- a/po/ko.po ++++ b/po/ko.po +@@ -2962,3 +2962,6 @@ msgstr "참고 자료" + msgid "Utilities" + msgstr "유틸리티" + ++#: ../src/org.gnome.Software.desktop.in.h:1 ++msgid "Application Installer" ++msgstr "응용 프로그램 설치" +diff --git a/po/pt_BR.po b/po/pt_BR.po +index 6638f4b..0c3ea8a 100644 +--- a/po/pt_BR.po ++++ b/po/pt_BR.po +@@ -3896,3 +3896,7 @@ msgstr "Utilitários" + + #~ msgid "Printing" + #~ msgstr "Impressão" ++ ++#: ../src/org.gnome.Software.desktop.in.h:1 ++msgid "Application Installer" ++msgstr "Instalador de aplicações" +diff --git a/po/ru.po b/po/ru.po +index d786c31..6885ea2 100644 +--- a/po/ru.po ++++ b/po/ru.po +@@ -3054,3 +3054,7 @@ msgstr "Справка" + #: ../src/plugins/gs-desktop-common.c:356 + msgid "Utilities" + msgstr "Утилиты" ++ ++#: ../src/org.gnome.Software.desktop.in.h:1 ++msgid "Application Installer" ++msgstr "Установка приложений" +diff --git a/po/zh_CN.po b/po/zh_CN.po +index 3ac8904..06cf6af 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -3749,3 +3749,7 @@ msgstr "实用工具" + + #~ msgid "No AppStream data found" + #~ msgstr "未找到 AppStream 数据" ++ ++#: ../src/org.gnome.Software.desktop.in.h:1 ++msgid "Application Installer" ++msgstr "应用程序的安装程序" +diff --git a/po/zh_TW.po b/po/zh_TW.po +index 068e35f..504fcce 100644 +--- a/po/zh_TW.po ++++ b/po/zh_TW.po +@@ -3681,3 +3681,7 @@ msgstr "公用程式" + + #~ msgid "_Updates (%d)" + #~ msgstr "更新 (%d)(_U)" ++ ++#: ../src/org.gnome.Software.desktop.in.h:1 ++msgid "Application Installer" ++msgstr "應用程式的安裝程式" +-- +1.8.3.1 + diff --git a/SPECS/gnome-software.spec b/SPECS/gnome-software.spec new file mode 100644 index 0000000..46dab9b --- /dev/null +++ b/SPECS/gnome-software.spec @@ -0,0 +1,284 @@ +%global glib2_version 2.46.0 +%global gtk3_version 3.22.4 +%global json_glib_version 1.1.1 +%global packagekit_version 1.1.1 +%global appstream_glib_version 0.6.9 +%global libsoup_version 2.51.92 +%global gsettings_desktop_schemas_version 3.11.5 +%global gnome_desktop_version 3.17.92 +%global flatpak_version 0.8.0 + +# this should be set using "--without packagekit" when atomic +%bcond_without packagekit + +Name: gnome-software +Version: 3.22.7 +Release: 5%{?dist} +Summary: A software center for GNOME + +License: GPLv2+ +URL: https://wiki.gnome.org/Apps/Software +Source0: https://download.gnome.org/sources/gnome-software/3.22/%{name}-%{version}.tar.xz + +# We can't use the new name +Patch2: 0001-Change-the-name-of-the-application-to-Application-In.patch + +# Update translations +Patch3: downstream-translations.patch + +# No error when a GsApp has no valid sources +Patch4: 0001-packagekit-Never-call-GetDetails-when-there-are-no-s.patch +Patch5: 0002-trivial-Add-some-error-prefixes-to-better-chase-down.patch + +# Blacklist the session manager +Patch6: 0001-trivial-Add-another-application-to-the-blacklist.patch + +# Fix flatpakref installation +Patch7: 0001-flatpak-Set-the-correct-origin-when-installing-a-fla.patch + +BuildRequires: gettext +BuildRequires: intltool +BuildRequires: libxslt +BuildRequires: docbook-style-xsl +BuildRequires: desktop-file-utils +BuildRequires: glib2-devel >= %{glib2_version} +BuildRequires: gnome-desktop3-devel +BuildRequires: gsettings-desktop-schemas-devel >= %{gsettings_desktop_schemas_version} +BuildRequires: gtk3-devel >= %{gtk3_version} +BuildRequires: gtkspell3-devel +BuildRequires: json-glib-devel >= %{json_glib_version} +BuildRequires: libappstream-glib-devel >= %{appstream_glib_version} +BuildRequires: libsoup-devel +BuildRequires: PackageKit-glib-devel >= %{packagekit_version} +BuildRequires: polkit-devel +BuildRequires: libsecret-devel +BuildRequires: flatpak-devel >= %{flatpak_version} +BuildRequires: rpm-devel +BuildRequires: libgudev1-devel + +Requires: appstream-data +%if 0%{?fedora} +Requires: epiphany-runtime +%endif +Requires: flatpak%{?_isa} >= %{flatpak_version} +Requires: flatpak-libs%{?_isa} >= %{flatpak_version} +Requires: glib2%{?_isa} >= %{glib2_version} +Requires: gnome-desktop3%{?_isa} >= %{gnome_desktop_version} +# gnome-menus is needed for app folder .directory entries +Requires: gnome-menus%{?_isa} +Requires: gsettings-desktop-schemas%{?_isa} >= %{gsettings_desktop_schemas_version} +Requires: gtk3%{?_isa} >= %{gtk3_version} +Requires: json-glib%{?_isa} >= %{json_glib_version} +Requires: iso-codes +Requires: libappstream-glib%{?_isa} >= %{appstream_glib_version} +# librsvg2 is needed for gdk-pixbuf svg loader +Requires: librsvg2%{?_isa} +Requires: libsoup%{?_isa} >= %{libsoup_version} +Requires: PackageKit%{?_isa} >= %{packagekit_version} + +# this is not a library version +%define gs_plugin_version 11 + +%description +gnome-software is an application that makes it easy to add, remove +and update software in the GNOME desktop. + +%package devel +Summary: Headers for building external gnome-software plugins +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +These development files are for building gnome-software plugins outside +the source tree. Most users do not need this subpackage installed. + +%prep +%setup -q +%patch2 -p1 -b .funky-name +%patch3 -p1 -b .downstream-translations +%patch4 -p1 -b .ignore-no-source-ids +%patch5 -p1 -b .better-error-messages +%patch6 -p1 -b .no-session-manager +%patch7 -p1 -b .flatpakref-installation + +%build +%configure \ + --disable-static \ + --disable-firmware \ + --disable-steam \ + --disable-ostree \ + --enable-gudev \ +%if %{with packagekit} + --enable-packagekit \ +%else + --disable-packagekit \ +%endif + --disable-silent-rules +make %{?_smp_mflags} + +%install +%make_install + +rm %{buildroot}%{_libdir}/gs-plugins-%{gs_plugin_version}/*.la + +# make the software center load faster +desktop-file-edit %{buildroot}%{_datadir}/applications/org.gnome.Software.desktop \ + --set-key=X-AppInstall-Package --set-value=%{name} + +# set up for Fedora +cat >> %{buildroot}%{_datadir}/glib-2.0/schemas/org.gnome.software-fedora.gschema.override << FOE +[org.gnome.software] +official-sources = [ 'rhel-7' ] +FOE + +%find_lang %name --with-gnome + +%check +desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop + +%post +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + +%postun +if [ $1 -eq 0 ]; then + touch --no-create %{_datadir}/icons/hicolor &> /dev/null || : + gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : + glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : +fi + +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : +glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : + +%files -f %{name}.lang +%doc AUTHORS NEWS README +%license COPYING +%{_bindir}/gnome-software +%{_datadir}/applications/*.desktop +%dir %{_datadir}/gnome-software +%{_datadir}/gnome-software/*.png +%{_datadir}/appdata/*.appdata.xml +%{_mandir}/man1/gnome-software.1.gz +%{_datadir}/icons/hicolor/*/apps/* +%{_datadir}/gnome-software/featured-*.svg +%{_datadir}/gnome-software/featured-*.jpg +%dir %{_libdir}/gs-plugins-%{gs_plugin_version} +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_appstream.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_desktop-categories.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_desktop-menu-path.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_dpkg.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_dummy.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_epiphany.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_fedora-distro-upgrades.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_fedora-tagger-usage.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_flatpak.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_hardcoded-blacklist.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_hardcoded-featured.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_hardcoded-popular.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_icons.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_key-colors.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_modalias.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_odrs.so +%if %{with packagekit} +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-history.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-local.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-offline.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-origin.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-proxy.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-refine.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-refresh.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit-upgrade.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_packagekit.so +%endif +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_provenance-license.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_provenance.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_repos.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_rpm.so +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_shell-extensions.so +%if %{with packagekit} +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_systemd-updates.so +%endif +%{_libdir}/gs-plugins-%{gs_plugin_version}/libgs_plugin_ubuntuone.so +%{_sysconfdir}/xdg/autostart/gnome-software-service.desktop +%if %{with packagekit} +%{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service +%endif +%{_datadir}/dbus-1/services/org.gnome.Software.service +%{_datadir}/gnome-shell/search-providers/org.gnome.Software-search-provider.ini +%{_datadir}/glib-2.0/schemas/org.gnome.software.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.software-fedora.gschema.override + +%files devel +%{_libdir}/pkgconfig/gnome-software.pc +%dir %{_includedir}/gnome-software +%{_includedir}/gnome-software/*.h +%{_datadir}/gtk-doc/html/gnome-software + +%changelog +* Wed Feb 07 2018 Kalev Lember - 3.22.7-5 +- Backport a fix for installing flatpakref files +- Resolves: #1509883 + +* Tue Jan 23 2018 Ray Strode - 3.22.7-4 +- Drop non-free sources from schema to avoid confusing infobar at startup + Resolves: #1514113 + +* Fri Nov 03 2017 Richard Hughes - 3.22.7-3 +- Never show 'Startup Applications' in the search results +- Note: the other issue shown in the bug is likely a dupe of #1445651 +- Resolves: #1481145 + +* Tue Sep 19 2017 Richard Hughes - 3.22.7-2 +- Backport two fixes to fix a common error message +- Resolves: #1445651 + +* Tue Mar 14 2017 Kalev Lember - 3.22.7-1 +- Update to 3.22.7 +- Resolves: #1386961 + +* Wed Mar 08 2017 Kalev Lember - 3.22.6-1 +- Update to 3.22.6 +- Build with flatpak support +- Resolves: #1386961 + +* Thu Mar 02 2017 Richard Hughes - 3.22.5-1 +- Update to 3.22.5 +- Resolves: #1386961 + +* Sun Aug 30 2015 Kalev Lember - 3.14.7-2 +- Add translations for three new strings +- Resolves: #1246388 + +* Mon Aug 03 2015 Kalev Lember - 3.14.7-1 +- Update to 3.14.7 +- Show installation progress when installing apps +- Fix incomplete Japanese translations +- Show a new notification when security updates remain unapplied +- Resolves: #1237181, #1055643, #1136954 + +* Mon Jul 13 2015 Richard Hughes - 3.14.6-5 +- Do not show applications that are not available when searching by category. +- Resolves: #1237215 + +* Thu Jul 09 2015 Richard Hughes - 3.14.6-4 +- Actually apply the last patch. +- Resolves: #1184203 + +* Wed Jul 08 2015 Richard Hughes - 3.14.6-3 +- Use a different application name in the menu. +- Resolves: #1184203 + +* Wed Jul 01 2015 Kalev Lember - 3.14.6-2 +- Update version display logic to cover the .el suffix used in RHEL +- Resolves: #1184203 + +* Fri Jun 19 2015 Kalev Lember - 3.14.6-1 +- Update to 3.14.6 +- Resolves: #1184203 + +* Wed Jun 17 2015 Kalev Lember - 3.14.5-2 +- Add more apps to the Editor's Picks list +- Resolves: #1184203 + +* Tue Jun 16 2015 Richard Hughes - 3.14.5-1 +- New package for RHEL +- Resolves: #1184203