Update to 9.6.0, bump release
Release bump needed to make this version higher than currently in EPEL Resolves: RHEL-78729
This commit is contained in:
parent
f30fccb461
commit
22a0beddd7
2
.gitignore
vendored
2
.gitignore
vendored
@ -33,3 +33,5 @@
|
||||
/proj-data-1.16.tar.gz
|
||||
/proj-9.5.1.tar.gz
|
||||
/proj-data-1.20.tar.gz
|
||||
/proj-9.6.0.tar.gz
|
||||
/proj-data-1.21.tar.gz
|
||||
|
||||
13
proj.spec
13
proj.spec
@ -4,10 +4,10 @@
|
||||
%bcond_with mingw
|
||||
%endif
|
||||
|
||||
%global data_version 1.20
|
||||
%global data_version 1.21
|
||||
Name: proj
|
||||
# Also check whether there is a new proj-data release when upgrading!
|
||||
Version: 9.5.1
|
||||
Version: 9.6.0
|
||||
Release: 2%{?dist}
|
||||
Summary: Cartographic projection software (PROJ)
|
||||
|
||||
@ -15,7 +15,9 @@ 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
|
||||
|
||||
Patch0: 0001-Remove-RPATH.patch
|
||||
Patch1: proj_build.patch
|
||||
|
||||
BuildRequires: cmake
|
||||
BuildRequires: curl-devel
|
||||
@ -195,6 +197,7 @@ Supplements: proj\
|
||||
%data_subpkg -c hu -n Hungary
|
||||
%data_subpkg -c is -n Island -e ISL
|
||||
%data_subpkg -c jp -n Japan
|
||||
%data_subpkg -c lv -n Latvia
|
||||
%data_subpkg -c mx -n Mexico
|
||||
%data_subpkg -c no -n Norway
|
||||
%data_subpkg -c nc -n %{quote:New Caledonia}
|
||||
@ -274,6 +277,8 @@ rm -rf %{buildroot}%{mingw32_mandir}
|
||||
rm -rf %{buildroot}%{mingw64_docdir}
|
||||
rm -rf %{buildroot}%{mingw64_mandir}
|
||||
|
||||
rm -rf %{buildroot}%{mingw32_datadir}/bash-completion
|
||||
rm -rf %{buildroot}%{mingw64_datadir}/bash-completion
|
||||
|
||||
%mingw_debug_install_post
|
||||
%endif
|
||||
@ -297,6 +302,7 @@ rm -rf %{buildroot}%{mingw64_mandir}
|
||||
%{_bindir}/projinfo
|
||||
%{_bindir}/projsync
|
||||
%{_libdir}/libproj.so.25*
|
||||
%{_datadir}/bash-completion/completions/projinfo
|
||||
|
||||
%files devel
|
||||
%{_includedir}/*.h
|
||||
@ -361,6 +367,9 @@ rm -rf %{buildroot}%{mingw64_mandir}
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon May 5 2025 Ales Nezbeda <anezbeda@redhat.com> - 9.6.0-2
|
||||
- Update to 9.6.0
|
||||
|
||||
* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 9.5.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
|
||||
11
proj_build.patch
Normal file
11
proj_build.patch
Normal file
@ -0,0 +1,11 @@
|
||||
diff -rupN proj-9.6.0/src/filemanager.cpp proj-9.6.0-new/src/filemanager.cpp
|
||||
--- proj-9.6.0/src/filemanager.cpp 2025-03-13 15:31:27.000000000 +0100
|
||||
+++ proj-9.6.0-new/src/filemanager.cpp 2025-03-21 23:46:25.411487623 +0100
|
||||
@@ -41,6 +41,7 @@
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <algorithm>
|
||||
+#include <cstdint>
|
||||
#include <limits>
|
||||
#include <string>
|
||||
|
||||
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (proj-9.5.1.tar.gz) = 1b2a874f3b2e1343d2cbfff1e81c269cccac6c4a227b159f2d4063ebc4400bc968ed0c5bf66fe4d297b313e917087c8bfd1aa33345a5131ed53254b7130c9e86
|
||||
SHA512 (proj-data-1.20.tar.gz) = 1a667a6096473ae0a3c0dc946d5832f393a447514f8a4251ed97004759534168871623342399ae9571e934c973c137b20ed15d1714569fc5b5ea26737235d907
|
||||
SHA512 (proj-9.6.0.tar.gz) = c152fc0400f073fe6c980aca00905421f65e8b515adea173c56103279c1af232968781479010e1609ad826f087a5448f7a7b37de8a7a2c7ea671b04c63578988
|
||||
SHA512 (proj-data-1.21.tar.gz) = bb5a8ce2312151eeb92ae7961e62f43b1e637444f01729600924d00f317e782a2c2e9a7126af88efba01f3b8518f873144a070fe9c10656b24cba3c3cf19dfbd
|
||||
|
||||
Loading…
Reference in New Issue
Block a user