From 82fdf6e0ba274f7d41a4f97b9a440d9792fdf750 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Sun, 3 Jan 2021 11:16:35 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/proj.git#9dcbd2a510e640b570c5b263885a6d0f38dba661 --- .gitignore | 2 ++ proj.spec | 13 ++++++++++--- sources | 4 ++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 5d8c791..bb2e5e5 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ /proj-6.3.2.tar.gz /proj-7.2.0.tar.gz /proj-data-1.3.tar.gz +/proj-7.2.1.tar.gz +/proj-data-1.4.tar.gz diff --git a/proj.spec b/proj.spec index 62a3d8c..1a9575d 100644 --- a/proj.spec +++ b/proj.spec @@ -1,8 +1,8 @@ -%global proj_version 7.2.0 -%global data_version 1.3 +%global proj_version 7.2.1 +%global data_version 1.4 # The name is special so that rpmdev-bumpspec will bump this rather than adding .1 to the end -%global baserelease 2 +%global baserelease 1 # In order to avoid needing to keep incrementing the release version for the # main package forever, we will just construct one for proj that is guaranteed @@ -11,6 +11,7 @@ %global data_release %{proj_version}.%{baserelease}%{?dist} Name: proj +# Also check whether there is a new proj-data release when upgrading! Version: %{proj_version} Release: %{baserelease}%{?dist} Summary: Cartographic projection software (PROJ) @@ -220,6 +221,9 @@ tar -xf %{SOURCE1} --directory %{buildroot}%{_datadir}/%{name} %{_datadir}/%{name}/world %{_datadir}/%{name}/README.DATA %{_datadir}/%{name}/copyright_and_licenses.csv +%{_datadir}/%{name}/deformation_model.schema.json +%{_datadir}/%{name}/projjson.schema.json +%{_datadir}/%{name}/triangulation.schema.json %files devel %{_includedir}/*.h @@ -231,6 +235,9 @@ tar -xf %{SOURCE1} --directory %{buildroot}%{_datadir}/%{name} %changelog +* Sun Jan 03 2021 Sandro Mani - 7.2.1-1 +- Update to 7.2.1 + * Thu Nov 12 2020 Sandro Mani - 7.2.0-2 - Add Provides: deprecated() to compat packages diff --git a/sources b/sources index ba02db3..eb68bb1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (proj-7.2.0.tar.gz) = 056b92612434fc354928090516e239cdde4ec2105212e3d243f95421e4876fa4047389ed8c3905b29f4e44f18cf2e06fcc96b9d3fb9ab6621a0ff75d16b8b0c2 -SHA512 (proj-data-1.3.tar.gz) = 666e9292ec99d274d400a34d7777908821fff010c33708c6d40b2727fe1c87f4a524478083478f62c7eefc6e6bf5b2dcd0a352a03b13c55ea70a75335819a64f +SHA512 (proj-7.2.1.tar.gz) = 59b9b31b0183e620a2f4a25a08620c170773fe4f99e8eca59e9ed6815f43bb379ea21ef71e8f759dbd747855b982657d7503bac3acc542218e0d862105f25324 +SHA512 (proj-data-1.4.tar.gz) = 9c3fdf2851ef003309ae62348be785abd31c15d15ceb28ea58804852e40e17cd0f5b45cf5ab788343111e12437c1bb446355a71cefc327ff175971b9a69f0e86