- fix patching

[packages/gdal.git] / gdal.spec

diff --git a/gdal.spec b/gdal.spec
index 4b8bdafaa6ede2e82779eb99d7c259170c6da861..ecf280e9bff3c16183eab1ac2df1b6a17f61f633 100644 (file)
--- a/gdal.spec
+++ b/gdal.spec
@@ -39,7 +39,7 @@
 %bcond_with    podofo          # PDF support via podofo instead of poppler
 %bcond_without poppler         # PDF support via poppler
 %bcond_with    rasdaman        # Rasdaman support
-%bcond_without spatialite      # SpatiaLite support
+%bcond_with    spatialite      # SpatiaLite support
 %bcond_without xerces          # Xerces support
 %bcond_without java            # Java and MDB support
 
@@ -49,19 +49,19 @@
 Summary:       Geospatial Data Abstraction Library
 Summary(pl.UTF-8):     Biblioteka abstrakcji danych dotyczących powierzchni Ziemi
 Name:          gdal
-Version:       2.4.0
-Release:       4
+Version:       3.0.1
+Release:       1
 License:       BSD-like
 Group:         Libraries
-Source0:       http://download.osgeo.org/gdal/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 794096364a50df4bc7c5b710d997b6b4
+Source0:       https://github.com/OSGeo/gdal/releases/download/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 2b397c041e6b0b10ec7c49fd76e9fa99
 Patch0:                %{name}-perl.patch
-Patch1:                %{name}-poppler.patch
-Patch2:                %{name}-pc.patch
-Patch9:                %{name}-dds.patch
-Patch12:       %{name}-rasdaman.patch
-Patch13:       %{name}-pluginsdir.patch
-Patch15:       libx32.patch
+Patch1:                %{name}-pc.patch
+Patch2:                %{name}-dds.patch
+Patch3:                %{name}-rasdaman.patch
+Patch4:                %{name}-pluginsdir.patch
+Patch5:                libx32.patch
+Patch6:                poppler-0.82.patch
 URL:           http://www.gdal.org/
 # 1.x or 2.x supported
 BuildRequires: CharLS-devel
@@ -99,6 +99,7 @@ BuildRequires:        libpng-devel >= 2:1.2.8
 %{?with_spatialite:BuildRequires:      libspatialite-devel}
 BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel >= 4.0
+BuildRequires: libtirpc-devel
 BuildRequires: libtool
 BuildRequires: libuuid-devel
 BuildRequires: libwebp-devel
@@ -268,10 +269,10 @@ Moduł Pythona GDAL.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch9 -p1
-%patch12 -p1
-%patch13 -p1
-%patch15 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p2
 
 # need to regenerate (old ones don't support perl 5.10)
 %{__rm} swig/perl/{gdal_wrap.cpp,gdalconst_wrap.c,ogr_wrap.cpp,osr_wrap.cpp}
@@ -334,7 +335,7 @@ jvm_arch=x32
 # regenerate where needed
 %{__make} -j1 -C swig/perl generate
 
-%{__make} -j1 \
+%{__make} \
        %{?with_grass:GRASS_INCLUDE="-I/usr/include/grass64"} \
        %{?with_fyba:SOSI_INC="-I/usr/include/fyba"}
 
@@ -422,7 +423,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/rgb2pct.py
 %attr(755,root,root) %{_bindir}/testepsg
 %attr(755,root,root) %{_libdir}/libgdal.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgdal.so.20
+%attr(755,root,root) %ghost %{_libdir}/libgdal.so.26
 %dir %{_libdir}/gdalplugins
 %{_datadir}/gdal
 %{_mandir}/man1/gdal2tiles.1*