diff --git a/.gitignore b/.gitignore index eac8a6d..4a9205f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ uriparser-0.7.5.tar.gz /uriparser-0.7.9.tar.bz2 /uriparser-0.8.0.tar.bz2 /uriparser-0.8.1.tar.bz2 +/uriparser-0.8.2.tar.bz2 diff --git a/sources b/sources index 0055f6b..03f20e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4e4c5f0ee6abb111a431c45e144247aa uriparser-0.8.1.tar.bz2 +c5cf6b3941d887deb7defc2a86c40f1d uriparser-0.8.2.tar.bz2 diff --git a/uriparser-bug24.patch b/uriparser-bug24.patch deleted file mode 100644 index 6b2d012..0000000 --- a/uriparser-bug24.patch +++ /dev/null @@ -1,34 +0,0 @@ -testRangeComparison() in test/test.cpp assumes that strncmp() used by uriCompareRangeA() will always return -1/0/1 values. - -So it fails on AArch64: - -UriSuite: 50/52 -Comparing to yields -64, expected -1. -Comparing to yields 64, expected 1. -UriSuite: 51/52 - -Why? Simple. C standard says that strncmp() has to return <0/0/>0 values. - -Upstream bug: https://sourceforge.net/p/uriparser/bugs/24/ - -Index: uriparser-0.8.1/src/UriCommon.c -=================================================================== ---- uriparser-0.8.1.orig/src/UriCommon.c -+++ uriparser-0.8.1/src/UriCommon.c -@@ -98,7 +98,15 @@ int URI_FUNC(CompareRange)( - return -1; - } - -- return URI_STRNCMP(a->first, b->first, (a->afterLast - a->first)); -+ diff = URI_STRNCMP(a->first, b->first, (a->afterLast - a->first)); -+ -+ if (diff > 0) { -+ return 1; -+ } else if (diff < 0) { -+ return -1; -+ } -+ -+ return diff; - } - - diff --git a/uriparser.spec b/uriparser.spec index 3974a53..57226ad 100644 --- a/uriparser.spec +++ b/uriparser.spec @@ -3,15 +3,14 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} Name: uriparser -Version: 0.8.1 -Release: 5%{?dist} +Version: 0.8.2 +Release: 1%{?dist} Summary: URI parsing library - RFC 3986 Group: System Environment/Libraries License: BSD URL: http://%{name}.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 -Patch0: uriparser-bug24.patch BuildRequires: doxygen, graphviz, cpptest-devel Requires: cpptest @@ -31,7 +30,6 @@ developing applications that use %{name}. %prep %setup -q -%patch0 -p1 sed -i 's/\r//' THANKS sed -i 's/\r//' COPYING iconv -f iso-8859-1 -t utf-8 -o THANKS{.utf8,} @@ -86,6 +84,9 @@ fi %{_libdir}/pkgconfig/*.pc %changelog +* Sun Jul 12 2015 François Cami - 0.8.2-1 +- Update to latest upstream. + * Fri Jun 19 2015 Fedora Release Engineering - 0.8.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild