From 8e3e2aa1d1ce9ae426407b9673be035773daef1f Mon Sep 17 00:00:00 2001 From: Jiri Moskovcak Date: Aug 16 2011 13:26:33 +0000 Subject: improved release parsing rhbz#730887 --- diff --git a/libreport.spec b/libreport.spec index bf1cba1..61f2c3e 100644 --- a/libreport.spec +++ b/libreport.spec @@ -5,7 +5,7 @@ Summary: Generic library for reporting various problems Name: libreport Version: 2.0.5 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: https://fedorahosted.org/abrt/ @@ -51,7 +51,7 @@ Patch51: 0047-read-default-CONFFILE-if-no-c-option-is-given.patch Patch52: 0048-fixed-reporting-from-anaconda-newtUI-rhbz-729537-rhb.patch Patch54: 0050-report-expand-help-text-mention-.conf-files-in-it.patch Patch55: 0051-fix-make-check.patch - +Patch56: parse_release_bz.patch BuildRequires: dbus-devel BuildRequires: gtk2-devel BuildRequires: curl-devel @@ -264,6 +264,7 @@ Plugin to report bugs into anonymous FTP site associated with ticketing system. %patch52 -p1 %patch54 -p1 %patch55 -p1 +%patch56 -p1 %build mkdir -p m4 test -r m4/aclocal.m4 || touch m4/aclocal.m4 @@ -414,6 +415,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %config(noreplace) %{_sysconfdir}/libreport/events.d/uploader_event.conf %changelog +* Tue Aug 16 2011 Jiri Moskovcak 2.0.5-6 +- improved release parsing rhbz#730887 +- Resolves: #730887 + * Fri Aug 12 2011 Jiri Moskovcak 2.0.5-5 - more anaconda fixes - Resolves: #729537 diff --git a/parse_release_bz.patch b/parse_release_bz.patch new file mode 100644 index 0000000..4f707e6 --- /dev/null +++ b/parse_release_bz.patch @@ -0,0 +1,14 @@ +diff --git a/src/lib/parse_release.c b/src/lib/parse_release.c +index 48e9eb6..9a4f69f 100644 +--- a/src/lib/parse_release.c ++++ b/src/lib/parse_release.c +@@ -62,7 +62,8 @@ static void parse_release(const char *release, char** product, char** version, b + if (space) + { + space++; +- while (*space != '\0' && *space != ' ') ++ /* observed also: "Fedora F16-Alpha" rhbz#730887 */ ++ while (isdigit(*space) || *space == '.') + { + /* Eat string like "5.2" */ + strbuf_append_char(buf_version, *space);