[gnome-abrt/f22] New upstream release 1.1.0
Jakub Filak
jfilak at fedoraproject.org
Thu Mar 19 06:25:30 UTC 2015
commit be25763ac7877c2f7c0e3ce2c6d7eb625284819a
Author: Jakub Filak <jfilak at redhat.com>
Date: Wed Mar 18 16:58:16 2015 +0100
New upstream release 1.1.0
.gitignore | 1 +
0001-Translation-updates.patch | 584 ---------------------
...r-out-unimportant-commit-messages-in-the-.patch | 27 +
...int-warning-for-wrong-continued-indentati.patch | 26 -
0002-Remove-unused-code-from-get_application.patch | 35 ++
...d-wrapper-for-problem_create_app_from_env.patch | 89 ++++
...e-environment-to-find-the-the-application.patch | 54 ++
0005-Fix-too-long-line.patch | 28 +
...sing-member-pylint-warning-for-report-mod.patch | 25 +
gnome-abrt.spec | 51 +-
sources | 2 +-
11 files changed, 295 insertions(+), 627 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 09c5968..56280b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
/gnome-abrt-0.3.6.tar.gz
/gnome-abrt-0.3.7.tar.gz
/gnome-abrt-1.0.0.tar.gz
+/gnome-abrt-1.1.0.tar.gz
diff --git a/0001-build-Filter-out-unimportant-commit-messages-in-the-.patch b/0001-build-Filter-out-unimportant-commit-messages-in-the-.patch
new file mode 100644
index 0000000..109202b
--- /dev/null
+++ b/0001-build-Filter-out-unimportant-commit-messages-in-the-.patch
@@ -0,0 +1,27 @@
+From 1bd8035e18fccbac17a2c7ce2f1da19c89c166e1 Mon Sep 17 00:00:00 2001
+From: Jakub Filak <jfilak at redhat.com>
+Date: Tue, 17 Mar 2015 16:17:42 +0100
+Subject: [PATCH] build: Filter out unimportant commit messages in the
+ changelog builder
+
+Signed-off-by: Jakub Filak <jfilak at redhat.com>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index de6f0be..c11bdc4 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -54,7 +54,7 @@ release-major:
+ .PHONY: release
+ release:
+ echo "* $$(date +'%a %b %d %Y') $$(git config --get user.name) <$$(git config --get user.email)> $$NEW_VER-1" > /tmp/changelog.tmp; \
+- git log --oneline $$OLD_VER..HEAD | awk '{$$1=""; print "-" $$0} END {print ""}' >> /tmp/changelog.tmp; \
++ git log --oneline $$OLD_VER..HEAD | awk '{$$1=""; print "-" $$0} END {print ""}' | grep -v -e "- Merge" -e "- testsuite:" >> /tmp/changelog.tmp; \
+ sed "$$(grep -n changelog gnome-abrt.spec.in | cut -f1 -d:)"'r /tmp/changelog.tmp' -i gnome-abrt.spec.in; \
+ git add gnome-abrt.spec.in; \
+ git commit -m "New version $$NEW_VER"; \
+--
+2.3.2
+
diff --git a/0002-Remove-unused-code-from-get_application.patch b/0002-Remove-unused-code-from-get_application.patch
new file mode 100644
index 0000000..551c96c
--- /dev/null
+++ b/0002-Remove-unused-code-from-get_application.patch
@@ -0,0 +1,35 @@
+From 5798bbc15f624c52578c3a4b43cc18580ec6486b Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Tue, 17 Mar 2015 18:18:07 +0100
+Subject: [PATCH] Remove unused code from get_application()
+
+---
+ src/gnome_abrt/problems.py | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git a/src/gnome_abrt/problems.py b/src/gnome_abrt/problems.py
+index 59bb433..3014b69 100644
+--- a/src/gnome_abrt/problems.py
++++ b/src/gnome_abrt/problems.py
+@@ -269,18 +269,6 @@ class Problem(object):
+
+ def get_application(self):
+ if not self.app:
+- component = self['component']
+- if not component:
+- package = self['package']
+- if package:
+- parts = package.split("-")
+- if len(parts) > 2:
+- # some-foo-package-7.7.7-2
+- component = "-".join(parts[:-2])
+- elif len(parts) == 1:
+- # kernel
+- component = package
+-
+ self.app = find_application(self['cmdline'])
+
+ return self.app
+--
+2.3.2
+
diff --git a/0003-Add-wrapper-for-problem_create_app_from_env.patch b/0003-Add-wrapper-for-problem_create_app_from_env.patch
new file mode 100644
index 0000000..b2b518a
--- /dev/null
+++ b/0003-Add-wrapper-for-problem_create_app_from_env.patch
@@ -0,0 +1,89 @@
+From c77a8dd5303a132b9a3a482527ac2a4d8db01a8f Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Tue, 17 Mar 2015 18:25:07 +0100
+Subject: [PATCH] Add wrapper for problem_create_app_from_env()
+
+---
+ src/gnome_abrt/wrappers/__init__.py | 3 ++-
+ src/gnome_abrt/wrappers/common.h | 3 +++
+ src/gnome_abrt/wrappers/module.c | 1 +
+ src/gnome_abrt/wrappers/problem_app.c | 32 ++++++++++++++++++++++++++++++++
+ 4 files changed, 38 insertions(+), 1 deletion(-)
+
+diff --git a/src/gnome_abrt/wrappers/__init__.py b/src/gnome_abrt/wrappers/__init__.py
+index 565ca4d..a00e039 100644
+--- a/src/gnome_abrt/wrappers/__init__.py
++++ b/src/gnome_abrt/wrappers/__init__.py
+@@ -19,4 +19,5 @@
+ from gnome_abrt.wrappers._wrappers import (show_events_list_dialog,
+ show_system_config_abrt_dialog,
+ show_problem_details_for_dir,
+- get_app_for_cmdline)
++ get_app_for_cmdline,
++ get_app_for_env)
+diff --git a/src/gnome_abrt/wrappers/common.h b/src/gnome_abrt/wrappers/common.h
+index a125a43..9a77ff8 100644
+--- a/src/gnome_abrt/wrappers/common.h
++++ b/src/gnome_abrt/wrappers/common.h
+@@ -27,3 +27,6 @@ PyObject *p_show_problem_details_for_dir(PyObject *module, PyObject *args);
+
+ /* App for a command-line */
+ PyObject *p_get_app_for_cmdline(PyObject *module, PyObject *args);
++
++/* App for an env */
++PyObject *p_get_app_for_env(PyObject *module, PyObject *args);
+diff --git a/src/gnome_abrt/wrappers/module.c b/src/gnome_abrt/wrappers/module.c
+index 521c3ae..4c4a6df 100644
+--- a/src/gnome_abrt/wrappers/module.c
++++ b/src/gnome_abrt/wrappers/module.c
+@@ -27,6 +27,7 @@ static PyMethodDef module_methods[] = {
+ { "show_system_config_abrt_dialog", p_show_system_config_abrt_dialog, METH_VARARGS, "Open a dialog with ABRT configuration" },
+ { "show_problem_details_for_dir", p_show_problem_details_for_dir, METH_VARARGS, "Open a dialog with technical details" },
+ { "get_app_for_cmdline", p_get_app_for_cmdline, METH_VARARGS, "Get the application for a specific command-line" },
++ { "get_app_for_env", p_get_app_for_env, METH_VARARGS, "Get the application for a specific environment" },
+ { NULL }
+ };
+
+diff --git a/src/gnome_abrt/wrappers/problem_app.c b/src/gnome_abrt/wrappers/problem_app.c
+index 25b228e..10aa75a 100644
+--- a/src/gnome_abrt/wrappers/problem_app.c
++++ b/src/gnome_abrt/wrappers/problem_app.c
+@@ -34,3 +34,35 @@ PyObject *p_get_app_for_cmdline(PyObject *module, PyObject *args)
+
+ Py_RETURN_NONE;
+ }
++
++PyObject *p_get_app_for_env(PyObject *module, PyObject *args)
++{
++ (void)module;
++
++ PyObject *envp_seq;
++ pid_t pid = -1;
++ if (PyArg_ParseTuple(args, "Oi", &envp_seq, &pid) &&
++ (envp_seq = PySequence_Fast(envp_seq, "expected a sequence")))
++ {
++ GPtrArray *envp_array;
++ int size, i;
++
++ size = PySequence_Size(envp_seq);
++ envp_array = g_ptr_array_new_full(size + 1, g_free);
++
++ for (i = 0; i < size; i++) {
++ PyObject *seqItem = PySequence_Fast_GET_ITEM(envp_seq, i);
++
++ PyObject *asciiItem = PyUnicode_AsASCIIString(seqItem);
++ g_ptr_array_insert (envp_array, -1, g_strdup(PyBytes_AsString(asciiItem)));
++ }
++ g_ptr_array_insert (envp_array, -1, NULL);
++
++ GAppInfo *app = problem_create_app_from_env((const char **) envp_array->pdata, pid);
++ g_ptr_array_free(envp_array, TRUE);
++ if (app)
++ return pygobject_new((GObject *)app);
++ }
++
++ Py_RETURN_NONE;
++}
+--
+2.3.2
+
diff --git a/0004-Try-to-use-environment-to-find-the-the-application.patch b/0004-Try-to-use-environment-to-find-the-the-application.patch
new file mode 100644
index 0000000..3c9fbc0
--- /dev/null
+++ b/0004-Try-to-use-environment-to-find-the-the-application.patch
@@ -0,0 +1,54 @@
+From cdfc81b3380bba744e68e4dab4460853e1c9de23 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Tue, 17 Mar 2015 18:25:35 +0100
+Subject: [PATCH] Try to use environment to find the the application
+
+---
+ src/gnome_abrt/application.py | 7 +++++--
+ src/gnome_abrt/problems.py | 5 +++--
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/src/gnome_abrt/application.py b/src/gnome_abrt/application.py
+index b4e66dc..2d86e80 100644
+--- a/src/gnome_abrt/application.py
++++ b/src/gnome_abrt/application.py
+@@ -33,8 +33,11 @@ class Application(object):
+ self.icon = icon
+
+
+-def find_application(cmdline):
+- app = wrappers.get_app_for_cmdline(cmdline)
++def find_application(cmdline, envp, pid):
++ if envp:
++ app = wrappers.get_app_for_env(envp.split('\n'), int(pid))
++ if not app:
++ app = wrappers.get_app_for_cmdline(cmdline)
+ if not app:
+ return Application(cmdline.split(" ")[0])
+
+diff --git a/src/gnome_abrt/problems.py b/src/gnome_abrt/problems.py
+index 3014b69..f6748e9 100644
+--- a/src/gnome_abrt/problems.py
++++ b/src/gnome_abrt/problems.py
+@@ -66,7 +66,8 @@ class ProblemSource(object):
+ class Problem(object):
+ INITIAL_ELEMENTS = ['component', 'executable', 'cmdline', 'count', 'type',
+ 'last_occurrence', 'time', 'reason', 'pkg_arch',
+- 'pkg_epoch', 'pkg_name', 'pkg_release', 'pkg_version']
++ 'pkg_epoch', 'pkg_name', 'pkg_release', 'pkg_version',
++ 'environ', 'pid']
+
+ class Submission(object):
+ URL = "URL"
+@@ -269,7 +270,7 @@ class Problem(object):
+
+ def get_application(self):
+ if not self.app:
+- self.app = find_application(self['cmdline'])
++ self.app = find_application(self['cmdline'], self['environ'], self['pid'])
+
+ return self.app
+
+--
+2.3.2
+
diff --git a/0005-Fix-too-long-line.patch b/0005-Fix-too-long-line.patch
new file mode 100644
index 0000000..53d05c3
--- /dev/null
+++ b/0005-Fix-too-long-line.patch
@@ -0,0 +1,28 @@
+From b44c7ece37658da1af27e9775a2bbce3d6a20cda Mon Sep 17 00:00:00 2001
+From: Jakub Filak <jfilak at redhat.com>
+Date: Wed, 18 Mar 2015 07:55:05 +0100
+Subject: [PATCH] Fix too long line
+
+Signed-off-by: Jakub Filak <jfilak at redhat.com>
+---
+ src/gnome_abrt/problems.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/gnome_abrt/problems.py b/src/gnome_abrt/problems.py
+index f6748e9..cd0d041 100644
+--- a/src/gnome_abrt/problems.py
++++ b/src/gnome_abrt/problems.py
+@@ -270,7 +270,9 @@ class Problem(object):
+
+ def get_application(self):
+ if not self.app:
+- self.app = find_application(self['cmdline'], self['environ'], self['pid'])
++ self.app = find_application(self['cmdline'],
++ self['environ'],
++ self['pid'])
+
+ return self.app
+
+--
+2.3.2
+
diff --git a/0008-Turn-of-missing-member-pylint-warning-for-report-mod.patch b/0008-Turn-of-missing-member-pylint-warning-for-report-mod.patch
new file mode 100644
index 0000000..a60bc7b
--- /dev/null
+++ b/0008-Turn-of-missing-member-pylint-warning-for-report-mod.patch
@@ -0,0 +1,25 @@
+From 57f2cff7c56850c5aab4e53993af0831055b0184 Mon Sep 17 00:00:00 2001
+From: Jakub Filak <jfilak at redhat.com>
+Date: Wed, 18 Mar 2015 16:33:04 +0100
+Subject: [PATCH] Turn of missing member pylint warning for report module
+
+Signed-off-by: Jakub Filak <jfilak at redhat.com>
+---
+ src/gnome_abrt/dialogs.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/gnome_abrt/dialogs.py b/src/gnome_abrt/dialogs.py
+index fe02b20..ee7a8da 100644
+--- a/src/gnome_abrt/dialogs.py
++++ b/src/gnome_abrt/dialogs.py
+@@ -21,6 +21,7 @@ import gnome_abrt
+ from gnome_abrt.l10n import _
+
+ # libreport
++#pylint: disable=E0611
+ from report import problem_data, report_problem_in_memory, LIBREPORT_NOWAIT
+
+ # pygogject
+--
+2.3.2
+
diff --git a/gnome-abrt.spec b/gnome-abrt.spec
index 1c49780..07e3058 100644
--- a/gnome-abrt.spec
+++ b/gnome-abrt.spec
@@ -5,7 +5,7 @@
# ! no binaries in $PATH ... caused by gnome-abrt python script in /usr/bin
Name: gnome-abrt
-Version: 1.0.0
+Version: 1.1.0
Release: 1%{?dist}
Summary: A utility for viewing problems that have occurred with the system
@@ -14,8 +14,16 @@ License: GPLv2+
URL: https://fedorahosted.org/abrt/
Source0: https://fedorahosted.org/released/abrt/%{name}-%{version}.tar.gz
-Patch0001: 0001-Translation-updates.patch
-Patch0002: 0002-Disable-pylint-warning-for-wrong-continued-indentati.patch
+Patch0001: 0001-build-Filter-out-unimportant-commit-messages-in-the-.patch
+Patch0002: 0002-Remove-unused-code-from-get_application.patch
+Patch0003: 0003-Add-wrapper-for-problem_create_app_from_env.patch
+Patch0004: 0004-Try-to-use-environment-to-find-the-the-application.patch
+Patch0005: 0005-Fix-too-long-line.patch
+#Patch0006: 0006-Bump-the-required-versions-in-the-spec-file.patch
+#Patch0007: 0007-Fix-build-dependencies-caused-by-Python3.patch
+
+# without this patch, make check fails in koji
+Patch0008: 0008-Turn-of-missing-member-pylint-warning-for-report-mod.patch
# git is need for '%%autosetup -S git' which automatically applies all the
# patches above. Please, be aware that the patches must be generated
@@ -25,29 +33,32 @@ BuildRequires: git
BuildRequires: intltool
BuildRequires: gettext
BuildRequires: libtool
-BuildRequires: python2-devel
+BuildRequires: python3-devel
BuildRequires: desktop-file-utils
BuildRequires: asciidoc
BuildRequires: xmlto
BuildRequires: pygobject3-devel
-BuildRequires: libreport-gtk-devel >= 2.3.0
-BuildRequires: abrt-gui-devel >= 2.3.0
+BuildRequires: libreport-gtk-devel >= 2.5.0
+BuildRequires: libreport-python3
+BuildRequires: abrt-gui-devel >= 2.5.0
BuildRequires: gtk3-devel
%if 0%{?fedora}
-BuildRequires: pylint
-BuildRequires: python-inotify
-BuildRequires: pygobject3
-BuildRequires: dbus-python
-BuildRequires: python-humanize
+BuildRequires: python3-pylint
+BuildRequires: python3-six
+BuildRequires: python3-inotify
+BuildRequires: python3-gobject
+BuildRequires: python3-dbus
+BuildRequires: python3-humanize
%else
%define checkoption --with-nopylint
%endif
-Requires: python-inotify
-Requires: pygobject3
-Requires: dbus-python
+Requires: libreport-python3
+Requires: python3-inotify
+Requires: python3-gobject
+Requires: python3-dbus
Requires: xdg-utils
-Requires: python-humanize
+Requires: python3-humanize
%description
A GNOME application allows users to browse through detected problems and
@@ -104,7 +115,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f %{name}.lang
%doc COPYING
-%{python_sitearch}/gnome_abrt
+%{python3_sitearch}/gnome_abrt
%{_datadir}/%{name}
%{_datadir}/%{name}/ui
%{_bindir}/%{name}
@@ -116,6 +127,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Tue Mar 17 2015 Jakub Filak <jfilak at redhat.com> - 1.1.0-1
+- Switch to Python3
+- Translation updates
+- Search by Bug Tracker ID
+- Always show an icon for problems
+- Try to use environment to find the application
+- Polished look
+
* Mon Oct 13 2014 Jakub Filak <jfilak at redhat.com> - 1.0.0-1
- New upstream release with updated look & feel
diff --git a/sources b/sources
index d4f0490..daafd27 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-768273f4f8729fe98aa8913041027532 gnome-abrt-1.0.0.tar.gz
+719fa79f2347716663be642531f8c7ac gnome-abrt-1.1.0.tar.gz
More information about the scm-commits
mailing list