From eff61021c1c3f1a1a6e736fb5a86efbbe4a5ed22 Mon Sep 17 00:00:00 2001 From: tigro Date: Sat, 28 Dec 2024 13:56:03 +0300 Subject: [PATCH] import libkml-1.3.0-50.el10 --- .gitignore | 5 +-- .libkml.metadata | 2 + ...e-due-to-failure-to-convert-pointer-.patch | 0 ...-use-of-std-cerr-instead-of-std-endl.patch | 0 .../0003-Fix-python-tests.patch | 0 ...04-Correctly-build-and-run-java-test.patch | 0 .../fragile_test.patch | 0 .../libkml-bundle-minizip.patch | 0 .../libkml_crypth.patch | 0 .../libkml_dont-bytecompile.patch | 0 .../libkml_mingw.patch | 0 .../libkml_test_strcmp.patch | 0 libkml.spec => SPECS/libkml.spec | 44 ++++++++++++++++--- sources | 2 - 14 files changed, 43 insertions(+), 10 deletions(-) create mode 100644 .libkml.metadata rename 0001-Fix-build-failure-due-to-failure-to-convert-pointer-.patch => SOURCES/0001-Fix-build-failure-due-to-failure-to-convert-pointer-.patch (100%) rename 0002-Fix-mistaken-use-of-std-cerr-instead-of-std-endl.patch => SOURCES/0002-Fix-mistaken-use-of-std-cerr-instead-of-std-endl.patch (100%) rename 0003-Fix-python-tests.patch => SOURCES/0003-Fix-python-tests.patch (100%) rename 0004-Correctly-build-and-run-java-test.patch => SOURCES/0004-Correctly-build-and-run-java-test.patch (100%) rename fragile_test.patch => SOURCES/fragile_test.patch (100%) rename libkml-bundle-minizip.patch => SOURCES/libkml-bundle-minizip.patch (100%) rename libkml_crypth.patch => SOURCES/libkml_crypth.patch (100%) rename libkml_dont-bytecompile.patch => SOURCES/libkml_dont-bytecompile.patch (100%) rename libkml_mingw.patch => SOURCES/libkml_mingw.patch (100%) rename libkml_test_strcmp.patch => SOURCES/libkml_test_strcmp.patch (100%) rename libkml.spec => SPECS/libkml.spec (89%) delete mode 100644 sources diff --git a/.gitignore b/.gitignore index edccdb4..7c05e96 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ -libkml-0.6.1.tar.gz -/libkml-1.3.0.tar.gz -/minizip-1.3.0.tar.gz +SOURCES/libkml-1.3.0.tar.gz +SOURCES/minizip-1.3.0.tar.gz diff --git a/.libkml.metadata b/.libkml.metadata new file mode 100644 index 0000000..6b9e3ee --- /dev/null +++ b/.libkml.metadata @@ -0,0 +1,2 @@ +cbf2fdb362e30904903068addca7b7eb18a60bac SOURCES/libkml-1.3.0.tar.gz +bece0bf0bc6044e9cbd1e3824d5b6f21a0aaf153 SOURCES/minizip-1.3.0.tar.gz diff --git a/0001-Fix-build-failure-due-to-failure-to-convert-pointer-.patch b/SOURCES/0001-Fix-build-failure-due-to-failure-to-convert-pointer-.patch similarity index 100% rename from 0001-Fix-build-failure-due-to-failure-to-convert-pointer-.patch rename to SOURCES/0001-Fix-build-failure-due-to-failure-to-convert-pointer-.patch diff --git a/0002-Fix-mistaken-use-of-std-cerr-instead-of-std-endl.patch b/SOURCES/0002-Fix-mistaken-use-of-std-cerr-instead-of-std-endl.patch similarity index 100% rename from 0002-Fix-mistaken-use-of-std-cerr-instead-of-std-endl.patch rename to SOURCES/0002-Fix-mistaken-use-of-std-cerr-instead-of-std-endl.patch diff --git a/0003-Fix-python-tests.patch b/SOURCES/0003-Fix-python-tests.patch similarity index 100% rename from 0003-Fix-python-tests.patch rename to SOURCES/0003-Fix-python-tests.patch diff --git a/0004-Correctly-build-and-run-java-test.patch b/SOURCES/0004-Correctly-build-and-run-java-test.patch similarity index 100% rename from 0004-Correctly-build-and-run-java-test.patch rename to SOURCES/0004-Correctly-build-and-run-java-test.patch diff --git a/fragile_test.patch b/SOURCES/fragile_test.patch similarity index 100% rename from fragile_test.patch rename to SOURCES/fragile_test.patch diff --git a/libkml-bundle-minizip.patch b/SOURCES/libkml-bundle-minizip.patch similarity index 100% rename from libkml-bundle-minizip.patch rename to SOURCES/libkml-bundle-minizip.patch diff --git a/libkml_crypth.patch b/SOURCES/libkml_crypth.patch similarity index 100% rename from libkml_crypth.patch rename to SOURCES/libkml_crypth.patch diff --git a/libkml_dont-bytecompile.patch b/SOURCES/libkml_dont-bytecompile.patch similarity index 100% rename from libkml_dont-bytecompile.patch rename to SOURCES/libkml_dont-bytecompile.patch diff --git a/libkml_mingw.patch b/SOURCES/libkml_mingw.patch similarity index 100% rename from libkml_mingw.patch rename to SOURCES/libkml_mingw.patch diff --git a/libkml_test_strcmp.patch b/SOURCES/libkml_test_strcmp.patch similarity index 100% rename from libkml_test_strcmp.patch rename to SOURCES/libkml_test_strcmp.patch diff --git a/libkml.spec b/SPECS/libkml.spec similarity index 89% rename from libkml.spec rename to SPECS/libkml.spec index 19c2845..624f438 100644 --- a/libkml.spec +++ b/SPECS/libkml.spec @@ -11,10 +11,11 @@ Name: libkml Version: 1.3.0 -Release: 41%{?dist} +Release: 50%{?dist} Summary: Reference implementation of OGC KML 2.2 -License: BSD +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD URL: https://github.com/libkml/libkml Source0: https://github.com/libkml/libkml/archive/%{version}/libkml-%{version}.tar.gz # TODO: Port to minizip-2.x, meanwhile bundle version 1.3.0 @@ -156,6 +157,7 @@ MinGW Windows Python 3 %{name} library. %{?mingw_debug_package} %endif + %prep %autosetup -p1 -a1 @@ -183,8 +185,8 @@ popd %endif -DCMAKE_INSTALL_DIR=%{_libdir}/cmake/%{name} \ -DINCLUDE_INSTALL_DIR=%{_includedir}/kml \ - -DPYTHON_LIBRARY=%{_libdir}/libpython%{python3_version}$(python3-config --abiflags).so \ - -DPYTHON_INCLUDE_DIR=%{_includedir}/python%{python3_version}$(python3-config --abiflags)/ \ + -DPYTHON_LIBRARY=%{_usr}/%{_lib}/libpython%{python3_version}$(python3-config --abiflags).so \ + -DPYTHON_INCLUDE_DIR=%{_usr}/include/python%{python3_version}$(python3-config --abiflags)/ \ -DPYTHON_INSTALL_DIR=%{python3_sitearch} \ -DMINIZIP_INCLUDE_DIR=$PWD -DMINIZIP_LIBRARY=$PWD/minizip/%{_vpath_builddir}/libminizip.a \ -DBUILD_TESTING=ON \ @@ -215,6 +217,7 @@ export MINGW64_CMAKE_ARGS="\ %mingw_make_build %endif + %install %cmake_install @@ -223,6 +226,7 @@ export MINGW64_CMAKE_ARGS="\ %mingw_debug_install_post %endif + %check %ctest @@ -277,7 +281,37 @@ export MINGW64_CMAKE_ARGS="\ %endif %changelog -* Sat Sep 25 2022 Tom Rix - 1.3.0-41 +* Sat Dec 28 2024 Arkady L. Shane - 1.3.0-50 +- Rebuilt for MSVSphere 10 + +* Mon Sep 02 2024 Miroslav Suchý - 1.3.0-50 +- convert license to SPDX + +* Thu Jul 18 2024 Fedora Release Engineering - 1.3.0-49 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jun 08 2024 Python Maint - 1.3.0-48 +- Rebuilt for Python 3.13 + +* Thu Jan 25 2024 Fedora Release Engineering - 1.3.0-47 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.3.0-46 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 1.3.0-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint - 1.3.0-44 +- Rebuilt for Python 3.12 + +* Thu Jan 19 2023 Fedora Release Engineering - 1.3.0-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Oct 19 2022 Sandro Mani - 1.3.0-42 +- Rebuild (python-3.11) + +* Sat Sep 24 2022 Tom Rix - 1.3.0-41 - Add mingw build conditional * Thu Jul 21 2022 Fedora Release Engineering - 1.3.0-40 diff --git a/sources b/sources deleted file mode 100644 index be7d604..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -SHA512 (libkml-1.3.0.tar.gz) = aa48158103d3af764bf98c1fb4cf3e1356b9cc6c8e79d80b96850916f0a8ccb1dac3a46427735dd0bf20647daa047d10e722ac3da2a214d4c1559bf6d5d7c853 -SHA512 (minizip-1.3.0.tar.gz) = 4dab3635c09ba3f3832867b4e03ba9d45b6f1e87b98083a50164e6477b765c927fbf5256fe92860b38690f389ef6e07f56cba020b83bfee86e2b30afc816b906