Compare commits

..

No commits in common. "rawhide" and "f34" have entirely different histories.

5 changed files with 32 additions and 143 deletions

6
.gitignore vendored
View file

@ -15,9 +15,3 @@ 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
/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

View file

@ -1 +1 @@
SHA512 (uriparser-1.0.2.tar.bz2) = 23cf062e10b70e3cababbbb52e20a7e3ca17ae2cba21125ab0587a3dbee562d12d727703567ce14cba90151712f2c4c9e911eda92245292ea3a1138f88dd09fd
SHA512 (uriparser-0.9.6.tar.bz2) = c021ab3f93cc0373c9244edafff042c3d73a3904d69e573c277b04ca4a49cd2e88255214599cf433088b32846c9a628dfb116025188a6bb61a40c236827799aa

View file

@ -1,19 +1,11 @@
%if 0%{?fedora} || 0%{?epel} >= 9
%bcond_without mingw
%else
%bcond_with mingw
%endif
%undefine __cmake_in_source_build
Name: uriparser
Version: 1.0.2
Release: 2%{?dist}
Version: 0.9.6
Release: 1%{?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
# /doc/rfc* are under LicenseRef-scancode-iso-8879, LicenseRef-scancode-ietf, LicenseRef-scancode-ietf-trust but not included in RPM
License: BSD-3-Clause
License: BSD
URL: https://uriparser.github.io/
Source0: https://github.com/%{name}/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
@ -24,15 +16,6 @@ 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
Uriparser is a strictly RFC 3986 compliant URI parsing library written
in C. uriparser is cross-platform, fast, supports Unicode and is
@ -56,27 +39,6 @@ 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
%description -n mingw32-%{name}
MinGW Windows %{name} library.
%package -n mingw64-%{name}
Summary: MinGW Windows %{name} library
BuildArch: noarch
%description -n mingw64-%{name}
MinGW Windows %{name} library.
%{?mingw_debug_package}
%endif
%prep
%autosetup -p1
@ -85,23 +47,12 @@ sed -i 's/GENERATE_QHP\ =\ yes/GENERATE_QHP\ =\ no/g' doc/Doxyfile.in
%build
# Native build
%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
@ -110,102 +61,22 @@ 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*
%{_libdir}/cmake/%{name}-%{version}/
%files devel
%{_includedir}/%{name}/
%{_libdir}/lib%{name}.so
%{_libdir}/cmake/%{name}-%{version}/
%{_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
%{mingw32_bindir}/uriparse.exe
%{mingw32_bindir}/lib%{name}-1.dll
%{mingw32_includedir}/%{name}/
%{mingw32_libdir}/lib%{name}.dll.a
%{mingw32_libdir}/pkgconfig/lib%{name}.pc
%{mingw32_libdir}/cmake/%{name}-%{version}/
%files -n mingw64-%{name}
%license COPYING.BSD-3-Clause
%{mingw64_bindir}/uriparse.exe
%{mingw64_includedir}/%{name}/
%{mingw64_bindir}/lib%{name}-1.dll
%{mingw64_libdir}/lib%{name}.dll.a
%{mingw64_libdir}/pkgconfig/lib%{name}.pc
%{mingw64_libdir}/cmake/%{name}-%{version}/
%endif
%changelog
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Mon May 11 2026 Sandro Mani <manisandro@gmail.com> - 1.0.2-1
- Update to 1.0.2
* Thu Apr 30 2026 Sandro Mani <manisandro@gmail.com> - 1.0.1-1
- Update to 1.0.1
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Mon Dec 15 2025 Sandro Mani <manisandro@gmail.com> - 1.0.0-1
- Update to 1.0.0
* Thu Sep 04 2025 Sandro Mani <manisandro@gmail.com> - 0.9.9-1
- Update to 0.9.9
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.8-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sun May 05 2024 Sandro Mani <manisandro@gmail.com> - 0.9.8-1
- Update to 0.9.8
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.7-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Neal Gompa <ngompa@fedoraproject.org> - 0.9.7-4
- Move cmake files to the devel subpackage
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Fri Oct 07 2022 Sandro Mani <manisandro@gmail.com> - 0.9.7-1
- Update to 0.9.7
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.6-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Mar 25 2022 Sandro Mani <manisandro@gmail.com> - 0.9.6-5
- Rebuild with mingw-gcc-12
* Thu Feb 24 2022 Sandro Mani <manisandro@gmail.com> - 0.9.6-4
- Make mingw subpackages noarch
* Thu Feb 24 2022 Sandro Mani <manisandro@gmail.com> - 0.9.6-1
- Add mingw subpackages
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jan 07 2022 Sandro Mani <manisandro@gmail.com> - 0.9.6-1
- Update to 0.9.6

View file

@ -0,0 +1,11 @@
diff -rupN --no-dereference uriparser-0.9.5/CMakeLists.txt uriparser-0.9.5-new/CMakeLists.txt
--- uriparser-0.9.5/CMakeLists.txt 2021-03-18 17:35:29.000000000 +0100
+++ uriparser-0.9.5-new/CMakeLists.txt 2021-07-24 13:45:23.023102634 +0200
@@ -283,6 +283,7 @@ if(URIPARSER_BUILD_TESTS)
${LIBRARY_CODE_FILES}
)
+ set_property(TARGET testrunner PROPERTY POSITION_INDEPENDENT_CODE TRUE)
target_compile_definitions(testrunner PRIVATE URI_STATIC_BUILD)
if(MSVC)

13
uriparser_isystem.patch Normal file
View file

@ -0,0 +1,13 @@
diff -rupN --no-dereference uriparser-0.9.5/CMakeLists.txt uriparser-0.9.5-new/CMakeLists.txt
--- uriparser-0.9.5/CMakeLists.txt 2021-07-24 13:45:23.032102663 +0200
+++ uriparser-0.9.5-new/CMakeLists.txt 2021-07-24 13:45:23.035102673 +0200
@@ -36,6 +36,9 @@
#
cmake_minimum_required(VERSION 3.3)
+set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES /usr/include)
+set(CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES /usr/include)
+
project(uriparser
VERSION
0.9.5