diff --git a/.gitignore b/.gitignore index 08f7661..956e7e7 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,3 @@ uriparser-0.7.5.tar.gz /uriparser-0.9.6.tar.bz2 /uriparser-0.9.7.tar.bz2 /uriparser-0.9.8.tar.bz2 -/uriparser-0.9.9.tar.bz2 -/uriparser-1.0.0.tar.bz2 -/uriparser-1.0.1.tar.bz2 -/uriparser-1.0.2.tar.bz2 diff --git a/sources b/sources index 1622297..14e021f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (uriparser-1.0.2.tar.bz2) = 23cf062e10b70e3cababbbb52e20a7e3ca17ae2cba21125ab0587a3dbee562d12d727703567ce14cba90151712f2c4c9e911eda92245292ea3a1138f88dd09fd +SHA512 (uriparser-0.9.8.tar.bz2) = 41377e27f92345442cafa4e443485808c286430fcb5ce2354a683344e744786a170f443425f304bdb5a152edf96a3412f203eabe4fb3345a369e6d69f3d97e40 diff --git a/uriparser-inet-ntop.patch b/uriparser-inet-ntop.patch new file mode 100644 index 0000000..d298963 --- /dev/null +++ b/uriparser-inet-ntop.patch @@ -0,0 +1,14 @@ +diff -rupN --no-dereference uriparser-0.9.6/tool/uriparse.c uriparser-0.9.6-new/tool/uriparse.c +--- uriparser-0.9.6/tool/uriparse.c 2022-01-06 19:01:11.000000000 +0100 ++++ uriparser-0.9.6-new/tool/uriparse.c 2022-01-07 10:22:25.506474914 +0100 +@@ -43,10 +43,6 @@ + #ifdef _WIN32 + # include + # include +-# ifdef __MINGW32__ +-WINSOCK_API_LINKAGE const char * WSAAPI inet_ntop( +- int af, const void *src, char *dst, socklen_t size); +-# endif + #else + # include + # include diff --git a/uriparser.spec b/uriparser.spec index 86fc7ee..badebcc 100644 --- a/uriparser.spec +++ b/uriparser.spec @@ -5,13 +5,11 @@ %endif Name: uriparser -Version: 1.0.2 -Release: 2%{?dist} +Version: 0.9.8 +Release: 3%{?dist} Summary: URI parsing library - RFC 3986 -# main license is BSD-3-Clause -# test suite is licensed under the LGPL-2.1-or-later, but it is not included in the binary RPM -# fuzzing code is licensed under the Apache-2.0 license, but it is not included in the binary RPM +# /test/ is under LGPL-2.1-or-later but not included in RPM # /doc/rfc* are under LicenseRef-scancode-iso-8879, LicenseRef-scancode-ietf, LicenseRef-scancode-ietf-trust but not included in RPM License: BSD-3-Clause URL: https://uriparser.github.io/ @@ -110,7 +108,7 @@ sed -i 's/GENERATE_QHP\ =\ yes/GENERATE_QHP\ =\ no/g' doc/Doxyfile.in %files %doc THANKS AUTHORS ChangeLog -%license COPYING.BSD-3-Clause +%license COPYING %{_bindir}/uriparse %{_libdir}/lib%{name}.so.1* @@ -121,12 +119,12 @@ sed -i 's/GENERATE_QHP\ =\ yes/GENERATE_QHP\ =\ no/g' doc/Doxyfile.in %{_libdir}/pkgconfig/lib%{name}.pc %files doc -%license COPYING.BSD-3-Clause +%license COPYING %doc %{_docdir}/%{name}/html %if %{with mingw} %files -n mingw32-%{name} -%license COPYING.BSD-3-Clause +%license COPYING %{mingw32_bindir}/uriparse.exe %{mingw32_bindir}/lib%{name}-1.dll %{mingw32_includedir}/%{name}/ @@ -135,7 +133,7 @@ sed -i 's/GENERATE_QHP\ =\ yes/GENERATE_QHP\ =\ no/g' doc/Doxyfile.in %{mingw32_libdir}/cmake/%{name}-%{version}/ %files -n mingw64-%{name} -%license COPYING.BSD-3-Clause +%license COPYING %{mingw64_bindir}/uriparse.exe %{mingw64_includedir}/%{name}/ %{mingw64_bindir}/lib%{name}-1.dll @@ -146,29 +144,8 @@ sed -i 's/GENERATE_QHP\ =\ yes/GENERATE_QHP\ =\ no/g' doc/Doxyfile.in %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 1.0.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Mon May 11 2026 Sandro Mani - 1.0.2-1 -- Update to 1.0.2 - -* Thu Apr 30 2026 Sandro Mani - 1.0.1-1 -- Update to 1.0.1 - -* Sat Jan 17 2026 Fedora Release Engineering - 1.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Mon Dec 15 2025 Sandro Mani - 1.0.0-1 -- Update to 1.0.0 - -* Thu Sep 04 2025 Sandro Mani - 0.9.9-1 -- Update to 0.9.9 - -* Fri Jul 25 2025 Fedora Release Engineering - 0.9.8-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 0.9.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild +* Thu Apr 17 2025 Sandro Mani - 0.9.8-3 +- Rebuild against correct crt * Sat Jul 20 2024 Fedora Release Engineering - 0.9.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild