diff --git a/.gitignore b/.gitignore index b0e4ef9..b3fa3a5 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /proj-data-1.4.tar.gz /proj-8.0.0.tar.gz /proj-data-1.5.tar.gz +/proj-8.0.1.tar.gz diff --git a/27e1f4076ceb5c38e27371fbd75b548c652c0fcf.patch b/27e1f4076ceb5c38e27371fbd75b548c652c0fcf.patch deleted file mode 100644 index eb80a5b..0000000 --- a/27e1f4076ceb5c38e27371fbd75b548c652c0fcf.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 27e1f4076ceb5c38e27371fbd75b548c652c0fcf Mon Sep 17 00:00:00 2001 -From: Even Rouault -Date: Sat, 6 Mar 2021 22:12:27 +0100 -Subject: [PATCH] =?UTF-8?q?gie=5Fself=5Ftests:=20fix=20use=20of=20uninitia?= - =?UTF-8?q?lized=20memory=20(fixes=C2=A0#2557)?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - ---- - test/unit/gie_self_tests.cpp | 39 ++++++++++++++++++++++-------------- - 1 file changed, 24 insertions(+), 15 deletions(-) - -diff --git a/test/unit/gie_self_tests.cpp b/test/unit/gie_self_tests.cpp -index 4244766ebf..92f1c758dc 100644 ---- a/test/unit/gie_self_tests.cpp -+++ b/test/unit/gie_self_tests.cpp -@@ -268,8 +268,10 @@ TEST_F(gieTest, proj_create_crs_to_crs) { - ASSERT_TRUE(P != nullptr); - PJ_COORD a, b; - -- a.xy.x = 700000.0; -- a.xy.y = 6000000.0; -+ a.xyzt.x = 700000.0; -+ a.xyzt.y = 6000000.0; -+ a.xyzt.z = 0; -+ a.xyzt.t = HUGE_VAL; - b.xy.x = 307788.8761171057; - b.xy.y = 5999669.3036037628; - -@@ -306,8 +308,10 @@ TEST_F(gieTest, proj_create_crs_to_crs_EPSG_4326) { - PJ_COORD a, b; - - // Lat, long degrees -- a.xy.x = 0.0; -- a.xy.y = 3.0; -+ a.xyzt.x = 0.0; -+ a.xyzt.y = 3.0; -+ a.xyzt.z = 0; -+ a.xyzt.t = HUGE_VAL; - - b.xy.x = 500000.0; - b.xy.y = 0.0; -@@ -328,8 +332,10 @@ TEST_F(gieTest, proj_create_crs_to_crs_proj_longlat) { - PJ_COORD a, b; - - // Long, lat degrees -- a.xy.x = 3.0; -- a.xy.y = 0; -+ a.xyzt.x = 3.0; -+ a.xyzt.y = 0; -+ a.xyzt.z = 0; -+ a.xyzt.t = HUGE_VAL; - - b.xy.x = 500000.0; - b.xy.y = 0.0; -@@ -718,9 +724,10 @@ TEST(gie, proj_create_crs_to_crs_PULKOVO42_ETRS89) { - proj_destroy(target_crs); - - // Romania -- c.xyz.x = 45; // Lat -- c.xyz.y = 25; // Long -- c.xyz.z = 0; -+ c.xyzt.x = 45; // Lat -+ c.xyzt.y = 25; // Long -+ c.xyzt.z = 0; -+ c.xyzt.t = HUGE_VAL; - c = proj_trans(P, PJ_FWD, c); - EXPECT_NEAR(c.xy.x, 44.999701238, 1e-9); - EXPECT_NEAR(c.xy.y, 24.998474948, 1e-9); -@@ -740,9 +747,10 @@ TEST(gie, proj_create_crs_to_crs_PULKOVO42_ETRS89) { - EXPECT_NEAR(c.xy.x, 45, 1e-8); - EXPECT_NEAR(c.xy.y, 25, 1e-8); - -- c.xyz.x = 45; // Lat -- c.xyz.y = 25; // Long -- c.xyz.z = 0; -+ c.xyzt.x = 45; // Lat -+ c.xyzt.y = 25; // Long -+ c.xyzt.z = 0; -+ c.xyzt.t = HUGE_VAL; - proj_trans_generic(P, PJ_FWD, &(c.xyz.x), sizeof(double), 1, &(c.xyz.y), - sizeof(double), 1, &(c.xyz.z), sizeof(double), 1, - nullptr, 0, 0); -@@ -783,9 +791,10 @@ TEST(gie, proj_create_crs_to_crs_outside_area_of_use) { - EXPECT_EQ(P->fwd, nullptr); - - // Test point outside area of use of both candidate coordinate operations -- c.xyz.x = 58; // Lat in deg -- c.xyz.y = 5; // Long in deg -- c.xyz.z = 0; -+ c.xyzt.x = 58; // Lat in deg -+ c.xyzt.y = 5; // Long in deg -+ c.xyzt.z = 0; -+ c.xyzt.t = HUGE_VAL; - c = proj_trans(P, PJ_FWD, c); - EXPECT_NEAR(c.xy.x, 64.44444444444444, 1e-9); // Lat in grad - EXPECT_NEAR(c.xy.y, 2.958634259259258, 1e-9); // Long in grad diff --git a/proj.spec b/proj.spec index c5d03f0..93b1115 100644 --- a/proj.spec +++ b/proj.spec @@ -1,4 +1,4 @@ -%global proj_version 8.0.0 +%global proj_version 8.0.1 %global data_version 1.5 # The name is special so that rpmdev-bumpspec will bump this rather than adding .1 to the end @@ -20,9 +20,6 @@ License: MIT URL: https://proj.org Source0: https://download.osgeo.org/%{name}/%{name}-%{version}.tar.gz Source1: https://download.osgeo.org/%{name}/%{name}-data-%{data_version}.tar.gz -# Backport fix for test failure -# https://github.com/rouault/PROJ/commit/27e1f4076ceb5c38e27371fbd75b548c652c0fcf -Patch0: 27e1f4076ceb5c38e27371fbd75b548c652c0fcf.patch BuildRequires: cmake BuildRequires: curl-devel @@ -238,6 +235,9 @@ tar -xf %{SOURCE1} --directory %{buildroot}%{_datadir}/%{name} %changelog +* Thu May 06 2021 Sandro Mani - 8.0.1-1 +- Update to 8.0.1 + * Sat Mar 06 2021 Sandro Mani - 8.0.0-1 - Update to 8.0.0 diff --git a/sources b/sources index 3531ec6..fe9dc39 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (proj-8.0.0.tar.gz) = 4195fd26075787465e578f86398e224957cddba743e2b090b65c877a6bfbc91b3b36d5acf9883bd2fc215a5aebd0b9f3188ee0e0926aa86d37f9753042fb3d75 +SHA512 (proj-8.0.1.tar.gz) = cb5550a9fbccfc680bebb3b8c5ad347d53c38cb526edf4dcaa3af0eff57410b4d4d028e246954c4202a1d637e1e6f4e7a6a33e8741e8aa0a58bdfc8a5dbc68c9 SHA512 (proj-data-1.5.tar.gz) = a4ca7adf8e65832a764a2bac72b6881a08977e0a70baf822d362e9aac408eca6481fb675bb0d6a58c140be0cff3b9e38803db84e8b97265ba181c3459b994c94