diff --git a/.gitignore b/.gitignore index 58dafdf..138cedf 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /PDAL-2.4.2-src.tar.gz /PDAL-2.4.3-src.tar.gz /PDAL-2.5.0-src.tar.gz +/PDAL-2.5.1-src.tar.gz diff --git a/PDAL.spec b/PDAL.spec index 854fe57..995d426 100644 --- a/PDAL.spec +++ b/PDAL.spec @@ -8,8 +8,8 @@ Summary: Point Data Abstraction Library Name: PDAL # NOTE: Re-verifiy test exclusions in %%check when updating -Version: 2.5.0 -Release: 3%{?dist} +Version: 2.5.1 +Release: 1%{?dist} # The code is licensed BSD except for: # - filters/private/csf/* and plugins/i3s/lepcc/* are ASL 2.0 # - vendor/arbiter/*, plugins/nitf/io/nitflib.h and plugins/oci/io/OciWrapper.* are Expat/MIT @@ -43,10 +43,6 @@ Patch1: PDAL_tests.patch # fix build with sphinxcontrib-bibtex 2.0 (RHBZ #1921498) Patch2: PDAL_sphinxconf.patch -# Guard against bad return numbers, https://github.com/PDAL/PDAL/pull/3966 -# to be removed with PDAL 2.5.1 -Patch3: PDAL_bad_return_numbers.patch - BuildRequires: boost-devel BuildRequires: cmake BuildRequires: eigen3-devel @@ -250,6 +246,9 @@ sphinx-build -b html . build/html %license LICENSE.txt %changelog +* Sat Feb 11 2023 Markus Neteler 2.5.1-1 +- Update to 2.5.1 + * Mon Feb 06 2023 Markus Neteler 2.5.0-3 - patch to guard against bad return numbers (from upstream #3966), to be removed with PDAL 2.5.1 diff --git a/PDAL_sphinxconf.patch b/PDAL_sphinxconf.patch index eef1128..98a6bfb 100644 --- a/PDAL_sphinxconf.patch +++ b/PDAL_sphinxconf.patch @@ -1,9 +1,11 @@ -diff -rupN --no-dereference PDAL-2.5.0-src/doc/conf.py PDAL-2.5.0-src-new/doc/conf.py ---- PDAL-2.5.0-src/doc/conf.py 2023-01-13 18:18:05.000000000 +0100 -+++ PDAL-2.5.0-src-new/doc/conf.py 2023-01-14 11:03:18.529434786 +0100 -@@ -58,6 +58,7 @@ extensions = ['breathe', 'sphinx.ext.aut +--- PDAL-2.5.1-src.orig/doc/conf.py 2023-02-10 15:53:57.000000000 +0100 ++++ PDAL-2.5.1-src/doc/conf.py 2023-02-11 14:09:20.893130476 +0100 +@@ -56,8 +56,9 @@ sys.path.insert(0, os.path.abspath('.')) + # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. + extensions = ['breathe', 'sphinx.ext.autodoc', 'sphinx.ext.mathjax', 'sphinx.ext.intersphinx', - 'sphinxcontrib.bibtex', 'embed'] +- 'sphinxcontrib.bibtex', 'embed','notfound.extension'] ++ 'sphinxcontrib.bibtex', 'embed'] +bibtex_bibfiles = ['bibliography.bib'] diff --git a/sources b/sources index c8f18c3..5a10a09 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PDAL-2.5.0-src.tar.gz) = 10545ad44efbb7a654d596d4a861a81177d61a602ff8425965def5dd99e1595a7873c741f99eefcd7ae5dc7f438b321b51399db3b33fb8eddf46bec8394472b4 +SHA512 (PDAL-2.5.1-src.tar.gz) = 8763a774cdc1dacc5a8f73e4ef32d38fc4eb02d228eeef33999c080d862c60df5161c0ae18f8242e63dbcad368fb0d69357d012659c89ce1f7d308eec2b2811a