Hello community, here is the log from the commit of package enlightenment for openSUSE:Factory checked in at 2017-06-30 18:42:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/enlightenment (Old) and /work/SRC/openSUSE:Factory/.enlightenment.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "enlightenment" Fri Jun 30 18:42:02 2017 rev:26 rq:507036 version:0.21.8 Changes: -------- --- /work/SRC/openSUSE:Factory/enlightenment/enlightenment.changes 2017-03-12 20:04:19.826951431 +0100 +++ /work/SRC/openSUSE:Factory/.enlightenment.new/enlightenment.changes 2017-06-30 18:43:23.581430698 +0200 @@ -1,0 +2,25 @@ +Wed Jun 28 07:59:52 UTC 2017 - [email protected] + +- fix feature-wizard-auto-lang.patch to work again +- fix update-alternatives usage. +- Remove systemd handling not needed for user services + +------------------------------------------------------------------- +Wed May 24 10:27:39 UTC 2017 - [email protected] + +- Update to 0.21.8 Fixing a number of issues including the following + * T3144 + * T5262 + * T5288 + * T5340 + * T5348 + * T5418 + * T5444 + * T5464 + +------------------------------------------------------------------- +Wed May 17 14:19:33 UTC 2017 - [email protected] + +- Use update-alternatives to create default.desktop xsession (boo#1030873) + +------------------------------------------------------------------- Old: ---- enlightenment-0.21.7.tar.xz New: ---- enlightenment-0.21.8.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ enlightenment.spec ++++++ --- /var/tmp/diff_new_pack.U42kGZ/_old 2017-06-30 18:43:24.957237183 +0200 +++ /var/tmp/diff_new_pack.U42kGZ/_new 2017-06-30 18:43:24.957237183 +0200 @@ -21,7 +21,7 @@ %define enable_wayland (0%{?suse_version} > 1320) %define generate_manpages 0 Name: enlightenment -Version: 0.21.7 +Version: 0.21.8 Release: 0 Summary: The window manager License: BSD-2-Clause @@ -99,6 +99,8 @@ # older e17.3 users will update but anyone who manually installs e17.6 will stay Obsoletes: e17 Provides: e17 > 0.17.4 +Requires(post): update-alternatives +Requires(postun): update-alternatives BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} %if %{enable_wayland} @@ -288,33 +290,28 @@ # remove files from not wanted place rm %{buildroot}%{_datadir}/enlightenment/{COPYING,AUTHORS} -%if %{systemd_present} -%pre -%if !0%{?fedora} -%service_add_pre enlightenment.service -%endif +mkdir -p %{buildroot}%{_sysconfdir}/alternatives +touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop +ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop + %post -%if !0%{?fedora} -%service_add_post enlightenment.service -%endif +%{_sbindir}/update-alternatives --install %{_datadir}/xsessions/default.desktop \ + default-xsession.desktop %{_datadir}/xsessions/enlightenment.desktop 20 -%preun -%if !0%{?fedora} -%service_del_preun enlightenment.service -%endif %postun -%if !0%{?fedora} -%service_del_postun enlightenment.service -%endif -%endif +if [ ! -f %{_datadir}/xsessions/enlightenment.desktop ] ; then + %{_sbindir}/update-alternatives --remove default-xsession.desktop %{_datadir}/xsessions/enlightenment.desktop +fi %files -f enlightenment.lang %defattr(-,root,root) %doc COPYING README AUTHORS %exclude %{_docdir}/%{name}/html %{_datadir}/xsessions/enlightenment.desktop +%{_datadir}/xsessions/default.desktop +%ghost %{_sysconfdir}/alternatives/default-xsession.desktop %{_datadir}/enlightenment/ %{_datadir}/applications/*.desktop %{_libdir}/enlightenment ++++++ enlightenment-0.21.7.tar.xz -> enlightenment-0.21.8.tar.xz ++++++ /work/SRC/openSUSE:Factory/enlightenment/enlightenment-0.21.7.tar.xz /work/SRC/openSUSE:Factory/.enlightenment.new/enlightenment-0.21.8.tar.xz differ: char 27, line 1 ++++++ feature-wizard-auto-lang.patch ++++++ --- /var/tmp/diff_new_pack.U42kGZ/_old 2017-06-30 18:43:25.037225932 +0200 +++ /var/tmp/diff_new_pack.U42kGZ/_new 2017-06-30 18:43:25.037225932 +0200 @@ -1,60 +1,60 @@ -commit 92c5d6600449be6646ec746d3845fc1917141308 -Author: Simon Lees (SUSE) <[email protected]> -Date: Tue Nov 29 14:12:14 2016 +1030 +commit ef1b8cb6f8830cee2cfc4f371e8a0d2d894d48a7 +Author: Simon Lees <[email protected]> +Date: Wed Jun 28 12:58:55 2017 +0930 - feature-wizard-auto-lang + auto set language to system lang + + If the system language is set this is likely because a user has + already selected it in a distro's installer and doesn't want to + set it again so rather then telling a user which language they + selected as there default just set the language without showing + the wizard page. diff --git a/src/modules/wizard/page_010.c b/src/modules/wizard/page_010.c -index 120953b..a9549d6 100644 +index 120953be1..337215bca 100644 --- a/src/modules/wizard/page_010.c +++ b/src/modules/wizard/page_010.c -@@ -1,6 +1,6 @@ - /* Language chooser */ - #include "e_wizard.h" +@@ -171,17 +171,11 @@ _lang_content_get(E_Intl_Pair *pair, Evas_Object *obj, const char *part) + static char * + _lang_text_get(E_Intl_Pair *pair, Evas_Object *obj EINA_UNUSED, const char *part) + { +- char buf[4096]; - -+#include <eina_log.h> - typedef struct _E_Intl_Pair E_Intl_Pair; + if (!eina_streq(part, "elm.text")) return NULL; + if (!pair) + return strdup(_("System Default")); - static int _basic_lang_list_sort(const void *data1, const void *data2); -@@ -209,6 +209,41 @@ wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) - }, +- if ((!e_intl_language_get()) || (!eina_streq(pair->locale_key, e_intl_language_get()))) +- return strdup(_(pair->locale_translation)); +- +- snprintf(buf, sizeof(buf), "System Default [%s]", pair->locale_translation); +- return strdup(buf); ++ return strdup(_(pair->locale_translation)); + } + + static void +@@ -210,6 +204,24 @@ wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) .version = ELM_GENLIST_ITEM_CLASS_VERSION }; -+ FILE *locale_inf; -+ char line[32]; -+ char layout[128]; -+ int i = 0; -+ -+ locale_inf = popen("locale", "r"); -+ if (locale_inf) + ++ /* If we can determine the system language just use it and don't show the page */ ++ if (e_intl_language_get()) + { -+ while (fscanf(locale_inf, "%[^\n]\n", line) == 1) ++ int i = 0; ++ while (basic_language_predefined_pairs[i].locale_key) + { -+ if (sscanf (line, "LC_CTYPE=%127s", layout)) ++ if (eina_streq(basic_language_predefined_pairs[i].locale_key, e_intl_language_get())) + { -+ if (layout) -+ { -+ i = 0; -+ while (basic_language_predefined_pairs[i].locale_key) -+ { -+ if (!strncmp -+ (basic_language_predefined_pairs[i].locale_key, -+ layout, -+ strlen(basic_language_predefined_pairs[i].locale_key))) -+ { -+ lang = basic_language_predefined_pairs[i].locale_key; -+ eina_stringshare_replace(&e_config->language, lang); -+ e_intl_language_set(e_config->language); -+ e_wizard_labels_update(); -+ return 0; -+ } -+ i++; -+ } -+ } ++ lang = basic_language_predefined_pairs[i].locale_key; ++ eina_stringshare_replace(&e_config->language, lang); ++ e_intl_language_set(e_config->language); ++ e_wizard_labels_update(); ++ return 0; + } ++ i++; + } -+ pclose(locale_inf); + } - ++ e_wizard_title_set(_("Language")); of = elm_frame_add(e_comp->elm); + elm_object_text_set(of, _("Select one"));
