- up to 3.0.1

diff --git a/gdal-poppler.patch b/gdal-poppler.patch
deleted file mode 100644 (file)
index e1d8a62..0000000
--- a/gdal-poppler.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- gdal-2.4.0/frmts/pdf/pdfdataset.cpp.orig   2018-12-14 22:37:15.000000000 +0100
-+++ gdal-2.4.0/frmts/pdf/pdfdataset.cpp        2018-12-27 05:35:39.755925135 +0100
-@@ -3459,7 +3459,7 @@
- #endif
-             if( ocg != nullptr && ocg->getName() != nullptr )
-             {
--                const char* pszLayerName = (const char*)ocg->getName()->getCString();
-+                const char* pszLayerName = (const char*)ocg->getName()->c_str();
-                 AddLayer(pszLayerName);
-                 oLayerOCGMapPoppler[pszLayerName] = ocg;
-             }
-@@ -4787,7 +4787,7 @@
-     GooString* poMetadata = poCatalogPoppler->readMetadata();
-     if (poMetadata)
-     {
--        const char* pszContent = poMetadata->getCString();
-+        const char* pszContent = poMetadata->c_str();
-         if (pszContent != nullptr &&
-             STARTS_WITH(pszContent, "<?xpacket begin="))
-         {
---- gdal-2.4.0/frmts/pdf/pdfobject.cpp.orig    2018-12-14 22:37:15.000000000 +0100
-+++ gdal-2.4.0/frmts/pdf/pdfobject.cpp 2018-12-27 16:31:17.472142636 +0100
-@@ -1061,7 +1061,7 @@
- #else
-         GooString* gooString = m_po->getString();
- #endif
--        return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->getCString()),
-+        return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->c_str()),
-                                                       static_cast<int>(gooString->getLength())));
-     }
-     else
-@@ -1422,7 +1422,7 @@
-         char* pszContent = (char*) VSIMalloc(m_nLength + 1);
-         if (pszContent)
-         {
--            memcpy(pszContent, gstr->getCString(), m_nLength);
-+            memcpy(pszContent, gstr->c_str(), m_nLength);
-             pszContent[m_nLength] = '\0';
-         }
-         delete gstr;

diff --git a/gdal.spec b/gdal.spec
index e952a5f6c408432d8552a42a08781f6c1dedd5e9..94296e31c440c4ede0a3ada478eb9e63119f0dec 100644 (file)
--- a/gdal.spec
+++ b/gdal.spec
@@ -49,14 +49,13 @@
 Summary:       Geospatial Data Abstraction Library
 Summary(pl.UTF-8):     Biblioteka abstrakcji danych dotyczących powierzchni Ziemi
 Name:          gdal
 Summary:       Geospatial Data Abstraction Library
 Summary(pl.UTF-8):     Biblioteka abstrakcji danych dotyczących powierzchni Ziemi
 Name:          gdal

-Version:       2.4.0
-Release:       11
+Version:       3.0.1
+Release:       1

 License:       BSD-like
 Group:         Libraries
 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
 Patch0:                %{name}-perl.patch

-Patch1:                %{name}-poppler.patch

 Patch2:                %{name}-pc.patch
 Patch9:                %{name}-dds.patch
 Patch12:       %{name}-rasdaman.patch
 Patch2:                %{name}-pc.patch
 Patch9:                %{name}-dds.patch
 Patch12:       %{name}-rasdaman.patch


@@ -266,7 +265,6 @@ Moduł Pythona GDAL.
 %prep
 %setup -q
 %patch0 -p1
 %prep
 %setup -q
 %patch0 -p1

-%patch1 -p1

 %patch2 -p1
 %patch9 -p1
 %patch12 -p1
 %patch2 -p1
 %patch9 -p1
 %patch12 -p1


@@ -422,7 +420,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) %{_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*
 %dir %{_libdir}/gdalplugins
 %{_datadir}/gdal
 %{_mandir}/man1/gdal2tiles.1*