Add postgis_proj8.patch
This commit is contained in:
parent
e771a11cde
commit
a128c138c5
@ -1,9 +1,10 @@
|
|||||||
%{!?javabuild:%global javabuild 0}
|
%{!?javabuild:%global javabuild 0}
|
||||||
%{!?utils:%global utils 1}
|
%{!?utils:%global utils 1}
|
||||||
%{!?gcj_support:%global gcj_support 0}
|
%{!?gcj_support:%global gcj_support 0}
|
||||||
%{!?upgrade:%global upgrade 1}
|
%{!?upgrade:%global upgrade 0}
|
||||||
%{!?runselftest:%global runselftest 1}
|
%{!?runselftest:%global runselftest 1}
|
||||||
|
|
||||||
|
# Re-enable upgrade packages on next major version bump!
|
||||||
%global majorversion 3.1
|
%global majorversion 3.1
|
||||||
%global soversion 3
|
%global soversion 3
|
||||||
%global prevmajorversion 2.5
|
%global prevmajorversion 2.5
|
||||||
@ -27,6 +28,8 @@ Source3: http://download.osgeo.org/%{name}/source/%{name}-%{prevversion}.t
|
|||||||
# From debian
|
# From debian
|
||||||
# This should increase chances of tests passing even on busy or slow systems.
|
# This should increase chances of tests passing even on busy or slow systems.
|
||||||
Patch0: relax-test-timing-constraints.patch
|
Patch0: relax-test-timing-constraints.patch
|
||||||
|
# Fix proj8 detection
|
||||||
|
Patch1: postgis_proj8.patch
|
||||||
|
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
@ -147,6 +150,8 @@ The client package provides shp2pgsql, raster2pgsql and pgsql2shp for PostGIS.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -n %{name}-%{version} -a 3
|
%autosetup -p1 -n %{name}-%{version} -a 3
|
||||||
|
# For patch1
|
||||||
|
./autogen.sh
|
||||||
|
|
||||||
%if %upgrade
|
%if %upgrade
|
||||||
# postgis-upgrade
|
# postgis-upgrade
|
||||||
@ -157,6 +162,7 @@ cd %{name}-%{prevversion}
|
|||||||
tar xf %{SOURCE0}
|
tar xf %{SOURCE0}
|
||||||
(
|
(
|
||||||
cd %{name}-%{version}
|
cd %{name}-%{version}
|
||||||
|
%patch1 -p1
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -393,6 +399,7 @@ fi
|
|||||||
%changelog
|
%changelog
|
||||||
* Sun Mar 07 2021 Sandro Mani <manisandro@gmail.com> - 3.1.1-6
|
* Sun Mar 07 2021 Sandro Mani <manisandro@gmail.com> - 3.1.1-6
|
||||||
- Rebuild (proj)
|
- Rebuild (proj)
|
||||||
|
- Disable upgrade packages for now (not compatible with proj8)
|
||||||
|
|
||||||
* Mon Feb 22 2021 Michael Scherer <misc@fedoraproject.org> - 3.1.1-5
|
* Mon Feb 22 2021 Michael Scherer <misc@fedoraproject.org> - 3.1.1-5
|
||||||
- split various utilities subpackages, to not pull gtk in the main rpm
|
- split various utilities subpackages, to not pull gtk in the main rpm
|
||||||
|
12
postgis_proj8.patch
Normal file
12
postgis_proj8.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -rupN postgis-3.1.1/configure.ac postgis-3.1.1-new/configure.ac
|
||||||
|
--- postgis-3.1.1/configure.ac 2021-01-28 20:10:31.000000000 +0100
|
||||||
|
+++ postgis-3.1.1-new/configure.ac 2021-03-08 16:36:09.677099539 +0100
|
||||||
|
@@ -902,7 +902,7 @@ AC_SUBST([PROJ_LDFLAGS])
|
||||||
|
dnl Ensure we can link against libproj
|
||||||
|
LIBS_SAVE="$LIBS"
|
||||||
|
LIBS="$PROJ_LDFLAGS"
|
||||||
|
-AC_CHECK_LIB([proj], [pj_get_release],
|
||||||
|
+AC_CHECK_LIB([proj], [proj_info],
|
||||||
|
[],
|
||||||
|
[AC_MSG_ERROR([could not find libproj - you may need to specify the directory of a PROJ installation using --with-projdir])],
|
||||||
|
[])
|
Loading…
Reference in New Issue
Block a user