diff --git a/0127-doc-actualize-the-abrt-bodhi-man-page.patch b/0127-doc-actualize-the-abrt-bodhi-man-page.patch new file mode 100644 index 0000000..f337976 --- /dev/null +++ b/0127-doc-actualize-the-abrt-bodhi-man-page.patch @@ -0,0 +1,41 @@ +From 026e0074e09ef56c0d2d70f03f7bd20d10dbe66e Mon Sep 17 00:00:00 2001 +From: Matej Habrnal +Date: Wed, 2 Sep 2015 12:29:31 +0200 +Subject: [PATCH] doc: actualize the abrt-bodhi man page + +Parameters -d and -u were not in the man page. + +Signed-off-by: Matej Habrnal +--- + doc/abrt-bodhi.txt | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/doc/abrt-bodhi.txt b/doc/abrt-bodhi.txt +index 945a4a9..fe790d6 100644 +--- a/doc/abrt-bodhi.txt ++++ b/doc/abrt-bodhi.txt +@@ -7,7 +7,7 @@ abrt-bodhi - The ABRT bodhi client. + + SYNOPSIS + -------- +-'abrt-bodhi' [-v] [-r[RELEASE]] (-b ID1[,ID2,...] | PKG-NAME) [PKG-NAME]... ++'abrt-bodhi' [-v] [-r[RELEASE]] [-u URL] [-d DIR] (-b ID1[,ID2,...] | PKG-NAME) [PKG-NAME]... + + DESCRIPTION + ----------- +@@ -25,6 +25,12 @@ OPTIONS + -b, --bugs ID1,ID2,.. + Specify any number of Bugzilla IDs (--bugs=1234,5678) + ++-d, --problem-dir DIR:: ++ Path to problem directory ++ ++-u, --url URL:: ++ Specify a bodhi server url ++ + AUTHORS + ------- + * ABRT team +-- +2.5.0 + diff --git a/0128-bodhi-fix-a-segfault-when-testing-an-os-release-opt-.patch b/0128-bodhi-fix-a-segfault-when-testing-an-os-release-opt-.patch new file mode 100644 index 0000000..7eda9bb --- /dev/null +++ b/0128-bodhi-fix-a-segfault-when-testing-an-os-release-opt-.patch @@ -0,0 +1,29 @@ +From fb5bb459ff59e76eeae346a3de317afaed527193 Mon Sep 17 00:00:00 2001 +From: Jakub Filak +Date: Mon, 7 Sep 2015 10:23:30 +0200 +Subject: [PATCH] bodhi: fix a segfault when testing an os-release opt for + 'rawhide' + +Resolves: rhbz#1260259 + +Signed-off-by: Jakub Filak +--- + src/plugins/bodhi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/bodhi.c b/src/plugins/bodhi.c +index b348a26..bbd88f7 100644 +--- a/src/plugins/bodhi.c ++++ b/src/plugins/bodhi.c +@@ -513,7 +513,7 @@ int main(int argc, char **argv) + parse_osinfo_for_rhts(osinfo, &product, &version); + + /* There are no bodhi updates for Rawhide */ +- bool rawhide = strcasecmp(release, "rawhide") == 0; ++ bool rawhide = strcasecmp(version, "rawhide") == 0; + if (!rawhide) + query = strbuf_append_strf(query, "releases=f%s&", version); + +-- +2.5.0 + diff --git a/abrt.spec b/abrt.spec index 02f8585..7dcbede 100644 --- a/abrt.spec +++ b/abrt.spec @@ -46,7 +46,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.3.0 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ Group: Applications/System URL: https://github.com/abrt/abrt/wiki/ABRT-Project @@ -180,7 +180,8 @@ Patch0122: 0122-introduce-bodhi2-to-abrt-bodhi.patch Patch0124: 0124-ccpp-do-not-break-the-reporting-if-a-bodhi-fails.patch Patch0125: 0125-bodhi-add-ignoring-of-Rawhide.patch Patch0126: 0126-bodhi-add-parsing-of-error-responses.patch - +Patch0127: 0127-doc-actualize-the-abrt-bodhi-man-page.patch +Patch0128: 0128-bodhi-fix-a-segfault-when-testing-an-os-release-opt-.patch # '%%autosetup -S git' -> git BuildRequires: git @@ -1099,6 +1100,10 @@ killall abrt-dbus >/dev/null 2>&1 || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Thu Sep 17 2015 Matej Habrnal 2.3.0-11 +- doc: actualize the abrt-bodhi man page +- bodhi: fix a segfault when testing an os-release opt for 'rawhide' + * Thu Aug 27 2015 Matej Habrnal 2.3.0-10 - bodhi: add parsing of error responses - bodhi: add ignoring of Rawhide