From ad65bf943dfe6487d39b6cfb1e1bd9d669daada0 Mon Sep 17 00:00:00 2001 From: Jakub Filak Date: Feb 16 2016 10:45:28 +0000 Subject: New upstream release 1.14 --- diff --git a/.gitignore b/.gitignore index e667148..3fc0221 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /retrace-server-1.11.tar.gz /retrace-server-1.12.tar.gz /retrace-server-1.13.tar.gz +/retrace-server-1.14.tar.gz diff --git a/0001-Set-crash-inside-get_crash_cmd-file-if-the-file-does.patch b/0001-Set-crash-inside-get_crash_cmd-file-if-the-file-does.patch deleted file mode 100644 index f691f68..0000000 --- a/0001-Set-crash-inside-get_crash_cmd-file-if-the-file-does.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 561ae94fe6e03e9af82f260dd438863037f61030 Mon Sep 17 00:00:00 2001 -From: Dave Wysochanski -Date: Tue, 6 Oct 2015 11:35:11 -0400 -Subject: [PATCH] Set "crash" inside get_crash_cmd file if the file does not - exist, fix get_use_mock typeo. - -This patch fixes a couple oversights in the previous patcheset to introduce crash_cmd and use_mock. - -First, for older tasks which do not have a 'crash_cmd' file, we need to create one by -default. Otherwise, any retrace-server-worker or retrace-server-interact command may -fail as follows: -Traceback (most recent call last): - File "/usr/bin/retrace-server-interact", line 117, in - crash_cmd = task.get_crash_cmd().split() -AttributeError: 'NoneType' object has no attribute 'split' - -Second, retrace-server-interact contained a 'get_use_mock' function rather than 'use_mock' -This caused the following: -$ retrace-server-interact 757071668 shell -Traceback (most recent call last): - File "/usr/bin/retrace-server-interact", line 138, in - if task.get_use_mock(kernelver): -AttributeError: RetraceTask instance has no attribute 'get_use_mock' - -Signed-off-by: Dave Wysochanski ---- - src/lib/retrace.py | 6 +++++- - src/retrace-server-interact | 2 +- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/lib/retrace.py b/src/lib/retrace.py -index 9074786..8664788 100644 ---- a/src/lib/retrace.py -+++ b/src/lib/retrace.py -@@ -2160,7 +2160,11 @@ class RetraceTask: - - def get_crash_cmd(self): - """Gets the contents of CRASH_CMD_FILE""" -- return self.get(RetraceTask.CRASH_CMD_FILE, maxlen=1 << 22) -+ result = self.get(RetraceTask.CRASH_CMD_FILE, maxlen=1 << 22) -+ if result is None: -+ self.set_crash_cmd("crash") -+ return "crash" -+ return result - - def set_crash_cmd(self, data): - """Writes data to CRASH_CMD_FILE""" -diff --git a/src/retrace-server-interact b/src/retrace-server-interact -index 5b26c8a..e518531 100755 ---- a/src/retrace-server-interact -+++ b/src/retrace-server-interact -@@ -135,7 +135,7 @@ if __name__ == "__main__": - os.execvp(cmdline[0], cmdline) - - if args.action == "shell": -- if task.get_use_mock(kernelver): -+ if task.use_mock(kernelver): - cmdline = ["/usr/bin/mock", "--configdir", - os.path.join(CONFIG["SaveDir"], "%d-kernel" % task.get_taskid()), "shell"] - --- -2.7.0 - diff --git a/0003-update-fedora-plugin.patch b/0003-update-fedora-plugin.patch deleted file mode 100644 index b2c7b6f..0000000 --- a/0003-update-fedora-plugin.patch +++ /dev/null @@ -1,52 +0,0 @@ -From b0bada96ed01bc2ebb3de8abc9215a03ab0f3f34 Mon Sep 17 00:00:00 2001 -From: Richard Marko -Date: Thu, 8 Oct 2015 15:40:34 +0200 -Subject: [PATCH] update fedora plugin - ---- - src/plugins/fedora.py | 20 ++++++++++++-------- - 1 file changed, 12 insertions(+), 8 deletions(-) - -diff --git a/src/plugins/fedora.py b/src/plugins/fedora.py -index a18366a..a12f918 100644 ---- a/src/plugins/fedora.py -+++ b/src/plugins/fedora.py -@@ -5,23 +5,27 @@ abrtparser = re.compile("^Fedora release ([0-9]+) \(([^\)]+)\)$") - guessparser = re.compile("\.fc([0-9]+)") - repos = [ - [ -- "rsync://dl.fedoraproject.org/fedora-enchilada/linux/releases/$VER/Everything/$ARCH/os/Packages/*", -- "rsync://dl.fedoraproject.org/fedora-enchilada/linux/development/$VER/$ARCH/os/Packages/*/*", -+ "rsync://dl.fedoraproject.org/fedora-enchilada/linux/releases/$VER/Everything/$ARCH/os/Packages/*/*.rpm", -+ "rsync://dl.fedoraproject.org/fedora-enchilada/linux/development/$VER/$ARCH/os/Packages/*/*.rpm", - ], - [ -- "rsync://dl.fedoraproject.org/fedora-enchilada/linux/releases/$VER/Everything/$ARCH/debug/*", -- "rsync://dl.fedoraproject.org/fedora-enchilada/linux/development/$VER/$ARCH/debug/*/*", -+ "rsync://dl.fedoraproject.org/fedora-enchilada/linux/releases/$VER/Everything/$ARCH/debug/*/*.rpm", -+ "rsync://dl.fedoraproject.org/fedora-enchilada/linux/development/$VER/$ARCH/debug/*/*.rpm", - ], - [ -- "rsync://dl.fedoraproject.org/fedora-enchilada/linux/updates/$VER/$ARCH/*", -+ "rsync://dl.fedoraproject.org/fedora-enchilada/linux/updates/$VER/$ARCH/*.rpm", -+ "rsync://dl.fedoraproject.org/fedora-enchilada/linux/updates/$VER/$ARCH/*/*.rpm", - ], - [ -- "rsync://dl.fedoraproject.org/fedora-enchilada/linux/updates/$VER/$ARCH/debug/*", -+ "rsync://dl.fedoraproject.org/fedora-enchilada/linux/updates/$VER/$ARCH/debug/*.rpm", -+ "rsync://dl.fedoraproject.org/fedora-enchilada/linux/updates/$VER/$ARCH/debug/*/*.rpm", - ], - [ -- "rsync://dl.fedoraproject.org/fedora-enchilada/linux/updates/testing/$VER/$ARCH/*", -+ "rsync://dl.fedoraproject.org/fedora-enchilada/linux/updates/testing/$VER/$ARCH/*.rpm", -+ "rsync://dl.fedoraproject.org/fedora-enchilada/linux/updates/testing/$VER/$ARCH/*/*.rpm", - ], - [ -- "rsync://dl.fedoraproject.org/fedora-enchilada/linux/updates/testing/$VER/$ARCH/debug/*", -+ "rsync://dl.fedoraproject.org/fedora-enchilada/linux/updates/testing/$VER/$ARCH/debug/*.rpm", -+ "rsync://dl.fedoraproject.org/fedora-enchilada/linux/updates/testing/$VER/$ARCH/debug/*/*.rpm", - ], - ] --- -2.7.0 - diff --git a/retrace-server.spec b/retrace-server.spec index 09b149c..02b909a 100644 --- a/retrace-server.spec +++ b/retrace-server.spec @@ -1,19 +1,15 @@ -%{!?python_site: %define python_site %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")} +%{!?python_site: %global python_site %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")} Summary: Application for remote coredump analysis Name: retrace-server -Version: 1.13 -Release: 2%{?dist} +Version: 1.14 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/abrt/wiki/AbrtRetraceServer Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz # git format-patch -N -M --topo-order %%{version} -Patch0001: 0001-Set-crash-inside-get_crash_cmd-file-if-the-file-does.patch -#Patch0002: 0002-spec-add-sqlite-and-cron-to-requirements.patch -Patch0003: 0003-update-fedora-plugin.patch - BuildArch: noarch @@ -56,12 +52,9 @@ generation service over a network using HTTP protocol. %prep %setup -q -%patch0001 -p1 -#%%patch0002 -p1 -%patch0003 -p1 %build -autoconf +autoreconf %configure make %{?_smp_mflags} @@ -143,6 +136,9 @@ fi %doc COPYING INSTALL README TODO %changelog +* Tue Feb 16 2016 Jakub Filak - 1.14-1 +- New upstream release 1.14 + * Thu Feb 04 2016 Fedora Release Engineering - 1.13-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 4b3df9e..006cc3a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -128fbe53ba38d0f83af8cef5f987a9ad retrace-server-1.13.tar.gz +07974c49eaf0c29aa24d4ebafdb37934 retrace-server-1.14.tar.gz