From c67feaba88acce7c0f4bf4531cf8ede599f739da Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:30:23 +0000 Subject: [PATCH 1/4] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uriparser.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uriparser.spec b/uriparser.spec index 4ef9198..322691d 100644 --- a/uriparser.spec +++ b/uriparser.spec @@ -1,6 +1,6 @@ Name: uriparser Version: 0.9.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: URI parsing library - RFC 3986 License: BSD @@ -131,6 +131,9 @@ sed -i 's/GENERATE_QHP\ =\ yes/GENERATE_QHP\ =\ no/g' doc/Doxyfile.in %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.9.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Mar 25 2022 Sandro Mani - 0.9.6-5 - Rebuild with mingw-gcc-12 From 0a4bc85c6c187b443b4df7045457df84b984af66 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 7 Oct 2022 11:18:21 +0200 Subject: [PATCH 2/4] Update to 0.9.7 --- .gitignore | 1 + sources | 2 +- uriparser.spec | 9 +++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2cc1f7f..a163657 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ uriparser-0.7.5.tar.gz /uriparser-0.9.4.tar.bz2 /uriparser-0.9.5.tar.bz2 /uriparser-0.9.6.tar.bz2 +/uriparser-0.9.7.tar.bz2 diff --git a/sources b/sources index a5dcf7d..1b9fbcc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (uriparser-0.9.6.tar.bz2) = c021ab3f93cc0373c9244edafff042c3d73a3904d69e573c277b04ca4a49cd2e88255214599cf433088b32846c9a628dfb116025188a6bb61a40c236827799aa +SHA512 (uriparser-0.9.7.tar.bz2) = 7f69c9806665745c1bafe11f818434e27c2da03af387f009ef46c1427af8c008faa45e6f49bece66e0b96fd17b3924ba0af25476e796972c5e4b651f35f74c13 diff --git a/uriparser.spec b/uriparser.spec index 322691d..cf3e06b 100644 --- a/uriparser.spec +++ b/uriparser.spec @@ -1,13 +1,11 @@ Name: uriparser -Version: 0.9.6 -Release: 6%{?dist} +Version: 0.9.7 +Release: 1%{?dist} Summary: URI parsing library - RFC 3986 License: BSD URL: https://uriparser.github.io/ Source0: https://github.com/%{name}/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 -# Don't add separate conflicting declaration for inet_ntop -Patch0: uriparser-inet-ntop.patch BuildRequires: cmake BuildRequires: doxygen @@ -131,6 +129,9 @@ sed -i 's/GENERATE_QHP\ =\ yes/GENERATE_QHP\ =\ no/g' doc/Doxyfile.in %changelog +* Fri Oct 07 2022 Sandro Mani - 0.9.7-1 +- Update to 0.9.7 + * Sat Jul 23 2022 Fedora Release Engineering - 0.9.6-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From e80e2a021cffb05c1c771027090c48ab2bc15850 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 11 Jan 2023 19:52:47 +0100 Subject: [PATCH 3/4] Make mingw build conditional --- uriparser.spec | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/uriparser.spec b/uriparser.spec index cf3e06b..f6440bf 100644 --- a/uriparser.spec +++ b/uriparser.spec @@ -1,3 +1,9 @@ +%if 0%{?fedora} +%bcond_without mingw +%else +%bcond_with mingw +%endif + Name: uriparser Version: 0.9.7 Release: 1%{?dist} @@ -14,11 +20,13 @@ BuildRequires: graphviz BuildRequires: gtest-devel BuildRequires: make +%if %{with mingw} BuildRequires: mingw32-filesystem >= 95 BuildRequires: mingw32-gcc-c++ BuildRequires: mingw64-filesystem >= 95 BuildRequires: mingw64-gcc-c++ +%endif %description @@ -44,6 +52,7 @@ BuildArch: noarch The %{name}-doc package contains HTML documentation files for %{name}. +%if %{with mingw} %package -n mingw32-%{name} Summary: MinGW Windows %{name} library BuildArch: noarch @@ -61,7 +70,7 @@ MinGW Windows %{name} library. %{?mingw_debug_package} - +%endif %prep @@ -76,17 +85,19 @@ sed -i 's/GENERATE_QHP\ =\ yes/GENERATE_QHP\ =\ no/g' doc/Doxyfile.in %cmake %cmake_build +%if %{with mingw} # MinGW build %mingw_cmake -DURIPARSER_BUILD_TESTS=OFF -DURIPARSER_BUILD_DOCS=OFF %mingw_make_build +%endif %install %cmake_install +%if %{with mingw} %mingw_make_install - - %mingw_debug_install_post +%endif %check @@ -109,6 +120,7 @@ sed -i 's/GENERATE_QHP\ =\ yes/GENERATE_QHP\ =\ no/g' doc/Doxyfile.in %license COPYING %doc %{_docdir}/%{name}/html +%if %{with mingw} %files -n mingw32-%{name} %license COPYING %{mingw32_bindir}/uriparse.exe @@ -126,6 +138,7 @@ sed -i 's/GENERATE_QHP\ =\ yes/GENERATE_QHP\ =\ no/g' doc/Doxyfile.in %{mingw64_libdir}/lib%{name}.dll.a %{mingw64_libdir}/pkgconfig/lib%{name}.pc %{mingw64_libdir}/cmake/%{name}-%{version}/ +%endif %changelog From ee2451431b72b2b4dbfa15f6be43d6338ab635ef Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 11 Jan 2023 20:00:08 +0100 Subject: [PATCH 4/4] Enable mingw build on epel9 --- uriparser.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uriparser.spec b/uriparser.spec index f6440bf..b5ef6c2 100644 --- a/uriparser.spec +++ b/uriparser.spec @@ -1,4 +1,4 @@ -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?epel} >= 9 %bcond_without mingw %else %bcond_with mingw