From d12f41bd7dcfa20dba35fc311482a089108bd907 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 15:50:31 +0000 Subject: [PATCH 01/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- natural-earth-map-data.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/natural-earth-map-data.spec b/natural-earth-map-data.spec index 0550594..72d5195 100644 --- a/natural-earth-map-data.spec +++ b/natural-earth-map-data.spec @@ -1,6 +1,6 @@ Name: natural-earth-map-data Version: 4.1.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Free vector and raster map data at 1:10m, 1:50m, and 1:110m scales License: Public Domain @@ -138,6 +138,9 @@ done %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 4.1.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 4.1.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 496a35a32625984d3aeaaf44b11a2d2b8c0085f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 20:53:40 +0000 Subject: [PATCH 02/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- natural-earth-map-data.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/natural-earth-map-data.spec b/natural-earth-map-data.spec index 72d5195..6735e74 100644 --- a/natural-earth-map-data.spec +++ b/natural-earth-map-data.spec @@ -1,6 +1,6 @@ Name: natural-earth-map-data Version: 4.1.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Free vector and raster map data at 1:10m, 1:50m, and 1:110m scales License: Public Domain @@ -138,6 +138,9 @@ done %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 4.1.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 4.1.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 3154422da65117ca7bd5cabd08ebf05558bc193c Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 5 Mar 2022 19:42:34 -0500 Subject: [PATCH 03/15] Convert to rpmautospec --- changelog | 33 +++++++++++++++++++++++++++++++++ natural-earth-map-data.spec | 36 ++---------------------------------- 2 files changed, 35 insertions(+), 34 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..7cb9fcd --- /dev/null +++ b/changelog @@ -0,0 +1,33 @@ +* Thu Jan 20 2022 Fedora Release Engineering - 4.1.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 4.1.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 4.1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 4.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 4.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 4.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 4.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Oct 16 2018 Elliott Sales de Andrade - 4.1.0-1 +- Update to latest version + +* Fri Jul 13 2018 Fedora Release Engineering - 4.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sun Feb 25 2018 Elliott Sales de Andrade - 4.0.0-2 +- Add license file to package. +- Use more-compressed source files. + +* Thu Feb 22 2018 Elliott Sales de Andrade - 4.0.0-1 +- Initial package diff --git a/natural-earth-map-data.spec b/natural-earth-map-data.spec index 6735e74..ebcb566 100644 --- a/natural-earth-map-data.spec +++ b/natural-earth-map-data.spec @@ -1,6 +1,6 @@ Name: natural-earth-map-data Version: 4.1.0 -Release: 8%{?dist} +Release: %autorelease Summary: Free vector and raster map data at 1:10m, 1:50m, and 1:110m scales License: Public Domain @@ -138,36 +138,4 @@ done %changelog -* Thu Jan 20 2022 Fedora Release Engineering - 4.1.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 4.1.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 4.1.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 4.1.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jan 29 2020 Fedora Release Engineering - 4.1.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 4.1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 4.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Oct 16 2018 Elliott Sales de Andrade - 4.1.0-1 -- Update to latest version - -* Fri Jul 13 2018 Fedora Release Engineering - 4.0.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sun Feb 25 2018 Elliott Sales de Andrade - 4.0.0-2 -- Add license file to package. -- Use more-compressed source files. - -* Thu Feb 22 2018 Elliott Sales de Andrade - 4.0.0-1 -- Initial package +%autochangelog From a4620395ff096baecfd31ed3db9fd412d24e13ca Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 21 May 2022 04:25:26 -0400 Subject: [PATCH 04/15] Update to latest version --- .gitignore | 6 +++++ LICENSE.md | 8 +++---- natural-earth-map-data.spec | 44 ++++++++++++++++++------------------- repackage.sh | 34 ++++++++++++++++++---------- sources | 12 +++++----- 5 files changed, 60 insertions(+), 44 deletions(-) diff --git a/.gitignore b/.gitignore index b7b0551..d001e0a 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,9 @@ /110m_physical.tar.xz /50m_cultural.tar.xz /50m_physical.tar.xz +/10m_cultural-5.1.2.tar.xz +/10m_physical-5.1.2.tar.xz +/110m_cultural-5.1.2.tar.xz +/110m_physical-5.1.2.tar.xz +/50m_cultural-5.1.2.tar.xz +/50m_physical-5.1.2.tar.xz diff --git a/LICENSE.md b/LICENSE.md index edc4512..9dfbc3d 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,10 +1,10 @@ -#Everything here is public domain. +# Everything here is public domain. [Full terms of service ยป](http://www.naturalearthdata.com/about/terms-of-use/) All versions of Natural Earth raster + vector map data found on this website are in the public domain. You may use the maps in any manner, including modifying the content and design, electronic dissemination, and offset printing. The primary authors, _Tom Patterson_ and _Nathaniel Vaughn Kelso_, and all other contributors renounce all financial claim to the maps and invites you to use them for personal, educational, and commercial purposes. -#Credits +# Credits No permission is needed to use Natural Earth. Crediting the authors is unnecessary. @@ -32,13 +32,13 @@ Three logo options: [Download Large Transparent PNG](http://www.naturalearthdata.com/wp-content/uploads/2009/08/NEV-Logo-White.png) [Download EPS](http://www.naturalearthdata.com/wp-content/uploads/2009/08/NEV%20Logo%20White.zip) -#Your due diligence +# Your due diligence All users of Natural Earth are highly encouraged to read about data sources and manipulation in the [Data Creation](http://www.naturalearthdata.com/about/data-creation/) section. The authors provide Natural Earth as a public service and are not responsible for any problems relating to accuracy, content, design, and how it is used. If you find an error or omission, please [report it](http://www.naturalearthdata.com/corrections/index.php?a=add) for future updates. -#Releases +# Releases The authors used data from The Washington Post, here is their release: diff --git a/natural-earth-map-data.spec b/natural-earth-map-data.spec index ebcb566..0f1fc07 100644 --- a/natural-earth-map-data.spec +++ b/natural-earth-map-data.spec @@ -1,5 +1,5 @@ Name: natural-earth-map-data -Version: 4.1.0 +Version: 5.1.2 Release: %autorelease Summary: Free vector and raster map data at 1:10m, 1:50m, and 1:110m scales @@ -7,18 +7,18 @@ License: Public Domain URL: https://www.naturalearthdata.com/ # Repackaged the zip as tar.xz because it saves a significant amount (~100MB). # See repackage.sh. -#Source0: https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/physical/110m_physical.zip -Source0: 110m_physical.tar.xz -#Source1: https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/110m_cultural.zip -Source1: 110m_cultural.tar.xz -#Source2: https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/50m/physical/50m_physical.zip -Source2: 50m_physical.tar.xz -#Source3: https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/50m/cultural/50m_cultural.zip -Source3: 50m_cultural.tar.xz -#Source4: https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/10m/physical/10m_physical.zip -Source4: 10m_physical.tar.xz -#Source5: https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/10m/cultural/10m_cultural.zip -Source5: 10m_cultural.tar.xz +#Source0: https://naciscdn.org/naturalearth/{version}/110m/physical/110m_physical.zip#/110m_physical-{version}.zip +Source0: 110m_physical-%{version}.tar.xz +#Source1: https://naciscdn.org/naturalearth/{version}/110m/cultural/110m_cultural.zip#/110m_cultural-{version}.zip +Source1: 110m_cultural-%{version}.tar.xz +#Source2: https://naciscdn.org/naturalearth/{version}/50m/physical/50m_physical.zip#/50m_physical-{version}.zip +Source2: 50m_physical-%{version}.tar.xz +#Source3: https://naciscdn.org/naturalearth/{version}/50m/cultural/50m_cultural.zip#/50m_cultural-{version}.zip +Source3: 50m_cultural-%{version}.tar.xz +#Source4: https://naciscdn.org/naturalearth/{version}/10m/physical/10m_physical.zip#/10m_physical-{version}.zip +Source4: 10m_physical-%{version}.tar.xz +#Source5: https://naciscdn.org/naturalearth/{version}/10m/cultural/10m_cultural.zip#/10m_cultural-{version}.zip +Source5: 10m_cultural-%{version}.tar.xz Source6: https://github.com/nvkelso/natural-earth-vector/raw/master/LICENSE.md BuildArch: noarch @@ -68,24 +68,24 @@ This provides data at all resolutions. %prep %setup -c -T +for scale in 110m 50m 10m; do + mkdir ${scale} + for theme in physical cultural; do + mkdir ${scale}/${theme} + done +done # 110m -mkdir -p 110m/physical tar -C 110m/physical -xf %SOURCE0 -mkdir -p 110m/cultural tar -C 110m/cultural -xf %SOURCE1 # 50m -mkdir -p 50m/physical tar -C 50m/physical -xf %SOURCE2 -mkdir -p 50m/cultural tar -C 50m/cultural -xf %SOURCE3 # 10m -mkdir -p 10m/physical tar -C 10m/physical -xf %SOURCE4 +tar -C 10m/cultural -xf %SOURCE5 # One has to be different... -#mkdir -p 10m/cultural -tar -C 10m -xf %SOURCE5 -mv 10m/10m_cultural 10m/cultural -mv 10m/{README.md,CHANGELOG,VERSION} 10m/cultural +mv 10m/cultural/10m_cultural/* 10m/cultural +rmdir 10m/cultural/10m_cultural cp -p %SOURCE6 . diff --git a/repackage.sh b/repackage.sh index c5da7a3..484d1aa 100755 --- a/repackage.sh +++ b/repackage.sh @@ -1,22 +1,32 @@ #!/bin/bash -set -ex +set -e + +if [ -z "$1" ]; then + echo "usage: $0 " + exit 1 +else + version="$1" +fi + +set -x wget -nc \ - https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/physical/110m_physical.zip \ - https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/110m_cultural.zip \ - https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/50m/physical/50m_physical.zip \ - https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/50m/cultural/50m_cultural.zip \ - https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/10m/physical/10m_physical.zip \ - https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/10m/cultural/10m_cultural.zip + "https://naciscdn.org/naturalearth/${version}/110m/physical/110m_physical.zip" \ + "https://naciscdn.org/naturalearth/${version}/110m/cultural/110m_cultural.zip" \ + "https://naciscdn.org/naturalearth/${version}/50m/physical/50m_physical.zip" \ + "https://naciscdn.org/naturalearth/${version}/50m/cultural/50m_cultural.zip" \ + "https://naciscdn.org/naturalearth/${version}/10m/physical/10m_physical.zip" \ + "https://naciscdn.org/naturalearth/${version}/10m/cultural/10m_cultural.zip" for scale in 110m 50m 10m; do for theme in physical cultural; do mkdir tmp - cd tmp - unzip -q ../${scale}_${theme}.zip - tar cJf ../${scale}_${theme}.tar.xz . - cd .. - rm -rf tmp + cd tmp + unzip -q "../${scale}_${theme}.zip" + find . -name '.DS_Store' -delete + tar cJf "../${scale}_${theme}-${version}.tar.xz" . + cd .. + rm -rf tmp done done diff --git a/sources b/sources index 0b06ff8..114023c 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -SHA512 (10m_cultural.tar.xz) = 4a9646e5cdb280cd74da75d1f0d7f74f74bad1b590cee7493b8500345e755e5e73e2eb354b2ff4eecfcc6eb1c6fc3d7f12fb0353045f4ae5974d4f0ecd026662 -SHA512 (10m_physical.tar.xz) = 7df59a9ae61e0d0c764909e5366375fad63eb8c0829b187c306ac0c77b8888f9b94d33818d1a5ec3d87dab780b04242cc21f117b2df4d373266ec44c7eeb90d9 -SHA512 (110m_cultural.tar.xz) = 324cf630c18e44b90dda8e6932b7dc9f706b9bfb6010acf57c5175edc7c6f2864a4cfde35827041893bc813c10ae491fb7498380cab177fa4132629047700fe0 -SHA512 (110m_physical.tar.xz) = 4b830169fa86000ebca17a0cffaf993a288647f72a5d494c5838156cfed5a194c513d74648a1d463a86ecb85462feb82459f4786edad6e23cc8bc03f8ae0f147 -SHA512 (50m_cultural.tar.xz) = b459d8ab71004efba156f86524b9b0260780330541cdcb0991ef1a61fcf074b9d0b0c197f8fd2a2f35580791cc73f3a067d0b3172cbf6029ef858df89c282d8d -SHA512 (50m_physical.tar.xz) = 151b8870a3728cee5200c71501e7fc79388038fda788421af214882fd3632127b5172b6da7600cf1ea283dc0f48a5b720d4b41b3dc2f2bd0630dfb2b8b7496ab +SHA512 (10m_cultural-5.1.2.tar.xz) = 152f90b462378c70c137cacc5da08fb2dec6123b36e70492a6eac25730f2f720679803525e50444eb9ca5d2e0a2f1dc79254740e11f3348b9fd5904a0416597a +SHA512 (10m_physical-5.1.2.tar.xz) = 10dd4971c5bc23ae93226040d560471dccd06c0c3b391acb3600bc78b9507881874f7a9db6b6af01e2dfd2ef54b66e442a997cc1bc6b24b266524bde71c59d38 +SHA512 (110m_cultural-5.1.2.tar.xz) = ee88488e0a855ef0f906eca47728f96d5db191a69051752a457318ba3a24c704614c33eede61a099425d6656c1cdbec8c9e0ee0a5983d485c67623ea0aa7dcc8 +SHA512 (110m_physical-5.1.2.tar.xz) = 575ac80d60444d341489ed6ea273b61d76992feb07ceb8f687236a9b46ed8f9c89fa0978564af9218a2b5b36a20522c8e735911a3b906c09433737e6681298c5 +SHA512 (50m_cultural-5.1.2.tar.xz) = 4bb2dabe8cd5d50f660d3edd9c7e7f834fc39edd4070c585f5692dd0608d310e842fb029f19affcdc5cd2c50b836a226f973eaa5b97c18baa73a74ccb4219b4a +SHA512 (50m_physical-5.1.2.tar.xz) = c50a14e99a13f8a921e34f82346ecbf4a9ada9d93c74b168f26324265044d883f4808e760f41bca6316bac4f084e411794b24ed7dfaa0b4c72aa7c544c7b7c40 From 280cf2924bdab971393fc93597ee8b7f691d4588 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 00:14:31 +0000 Subject: [PATCH 05/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 9a0601fae43d0147460ab7beb47e2b9b0710cd51 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 21:15:15 +0000 Subject: [PATCH 06/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 55418775510c2d9d1759b3aaa38805f165bc41f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 16:19:17 +0000 Subject: [PATCH 07/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 37a7d3a8e88fad28e5414cc6b63511a6d7747b41 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 09:15:02 +0000 Subject: [PATCH 08/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 49f3f3d69fcc49dd823d4882ebb3ad502f3c6684 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 08:38:21 +0000 Subject: [PATCH 09/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 6a34ec5867642c5a717e5fd61314e9a8cf080b58 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 11 May 2024 02:29:14 -0400 Subject: [PATCH 10/15] Switch to SPDX license --- natural-earth-map-data.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/natural-earth-map-data.spec b/natural-earth-map-data.spec index 0f1fc07..2ef06a8 100644 --- a/natural-earth-map-data.spec +++ b/natural-earth-map-data.spec @@ -3,7 +3,7 @@ Version: 5.1.2 Release: %autorelease Summary: Free vector and raster map data at 1:10m, 1:50m, and 1:110m scales -License: Public Domain +License: LicenseRef-Fedora-Public-Domain URL: https://www.naturalearthdata.com/ # Repackaged the zip as tar.xz because it saves a significant amount (~100MB). # See repackage.sh. From d498e8c880dbe644b116994a5f17812ff1eb9cc5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 19:10:33 +0000 Subject: [PATCH 11/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 9270100d813f99727712579fbb527a4d29a5b04a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 19:43:07 +0000 Subject: [PATCH 12/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From a485b2eaeebff76a5ca4334171d8e4aa29810981 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 22:38:33 +0000 Subject: [PATCH 13/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From fa782ef63d9c36df44a8010930ee65420ac5e59a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 21:55:21 +0000 Subject: [PATCH 14/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 938f1e1c0f45f181060566cc5900f05d07d52dab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jul 2026 09:22:00 +0000 Subject: [PATCH 15/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild