diff --git a/_constraints b/_constraints index 685328c..f9239dc 100644 --- a/_constraints +++ b/_constraints @@ -1,10 +1,10 @@ - 3 + 2.5 - 5 + 4 diff --git a/gdal-3.1.0.tar.xz b/gdal-3.1.0.tar.xz deleted file mode 100644 index 8e21c41..0000000 --- a/gdal-3.1.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e754a22242ccbec731aacdb2333b567d4c95b9b02d3ba1ea12f70508d244fcda -size 12076312 diff --git a/gdal-3.1.0.tar.xz.md5 b/gdal-3.1.0.tar.xz.md5 deleted file mode 100644 index 69d6893..0000000 --- a/gdal-3.1.0.tar.xz.md5 +++ /dev/null @@ -1 +0,0 @@ -fe29a41d5813263fc33c1f9130f73e01 gdal-3.1.0.tar.xz diff --git a/gdal-3.1.1.tar.xz b/gdal-3.1.1.tar.xz new file mode 100644 index 0000000..1c06f8a --- /dev/null +++ b/gdal-3.1.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97154a606339a6c1d87c80fb354d7456fe49828b2ef9a3bc9ed91771a03d2a04 +size 12082332 diff --git a/gdal-3.1.1.tar.xz.md5 b/gdal-3.1.1.tar.xz.md5 new file mode 100644 index 0000000..41eba43 --- /dev/null +++ b/gdal-3.1.1.tar.xz.md5 @@ -0,0 +1 @@ +7a88fae4beb62ccd9b794db1c22b8bc4 gdal-3.1.1.tar.xz diff --git a/gdal-fix-docs.patch b/gdal-fix-docs.patch deleted file mode 100644 index 2611b1c..0000000 --- a/gdal-fix-docs.patch +++ /dev/null @@ -1,411 +0,0 @@ -From 58b9f4eba6bf3bf39350e4c0a9005336cf1b61fc Mon Sep 17 00:00:00 2001 -From: Even Rouault -Date: Sat, 13 Jun 2020 23:22:44 +0200 -Subject: [PATCH] Doc building: fix warnings when using recent Doxygen and/or - Sphinx+Breathe (fixes #2673) - ---- - gdal/Doxyfile | 7 +++- - gdal/gcore/gdal.h | 18 ++++++-- - gdal/gcore/gdal_priv.h | 7 +--- - gdal/ogr/ogr_geometry.h | 87 ++++++++++++++++++++++++++++++++++++++- - gdal/ogr/ogr_spatialref.h | 23 +++++++++-- - gdal/port/cpl_conv.h | 2 +- - 6 files changed, 129 insertions(+), 15 deletions(-) - -diff --git a/gdal/Doxyfile b/gdal/Doxyfile -index e7afd116860..aedffa2e5f7 100644 ---- a/gdal/Doxyfile -+++ b/gdal/Doxyfile -@@ -954,7 +954,12 @@ PREDEFINED = HAVE_DLFCN_H \ - HAVE_LONG_LONG=1 \ - HAVE_SC_PHYS_PAGES=1 \ - final= \ -- CPL_RESTRICT= -+ CPL_RESTRICT= \ -+ CPL_WARN_UNUSED_RESULT= \ -+ CPL_RETURNS_NONNULL= \ -+ CPLSTRING_METHOD_DLL= \ -+ CPL_NO_RETURN= \ -+ EXPERIMENTAL_CPL_WARN_UNUSED_RESULT= - - # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then - # this tag can be used to specify a list of macro names that should be expanded. -diff --git a/gdal/gcore/gdal.h b/gdal/gcore/gdal.h -index 7a232ee6278..0529d178ce2 100644 ---- a/gdal/gcore/gdal.h -+++ b/gdal/gcore/gdal.h -@@ -956,7 +956,11 @@ CPLErr CPL_DLL CPL_STDCALL GDALGetRasterHistogram( GDALRasterBandH hBand, - int nBuckets, int *panHistogram, - int bIncludeOutOfRange, int bApproxOK, - GDALProgressFunc pfnProgress, -- void * pProgressData ) CPL_WARN_DEPRECATED("Use GDALGetRasterHistogramEx() instead"); -+ void * pProgressData ) -+/*! @cond Doxygen_Suppress */ -+ CPL_WARN_DEPRECATED("Use GDALGetRasterHistogramEx() instead") -+/*! @endcond */ -+ ; - CPLErr CPL_DLL CPL_STDCALL GDALGetRasterHistogramEx( GDALRasterBandH hBand, - double dfMin, double dfMax, - int nBuckets, GUIntBig *panHistogram, -@@ -968,7 +972,11 @@ CPLErr CPL_DLL CPL_STDCALL GDALGetDefaultHistogram( GDALRasterBandH hBand, - int *pnBuckets, int **ppanHistogram, - int bForce, - GDALProgressFunc pfnProgress, -- void * pProgressData ) CPL_WARN_DEPRECATED("Use GDALGetDefaultHistogramEx() instead"); -+ void * pProgressData ) -+/*! @cond Doxygen_Suppress */ -+ CPL_WARN_DEPRECATED("Use GDALGetDefaultHistogramEx() instead") -+/*! @endcond */ -+ ; - CPLErr CPL_DLL CPL_STDCALL GDALGetDefaultHistogramEx( GDALRasterBandH hBand, - double *pdfMin, double *pdfMax, - int *pnBuckets, GUIntBig **ppanHistogram, -@@ -977,7 +985,11 @@ CPLErr CPL_DLL CPL_STDCALL GDALGetDefaultHistogramEx( GDALRasterBandH hBand, - void * pProgressData ); - CPLErr CPL_DLL CPL_STDCALL GDALSetDefaultHistogram( GDALRasterBandH hBand, - double dfMin, double dfMax, -- int nBuckets, int *panHistogram ) CPL_WARN_DEPRECATED("Use GDALSetDefaultHistogramEx() instead"); -+ int nBuckets, int *panHistogram ) -+/*! @cond Doxygen_Suppress */ -+ CPL_WARN_DEPRECATED("Use GDALSetDefaultHistogramEx() instead") -+/*! @endcond */ -+ ; - CPLErr CPL_DLL CPL_STDCALL GDALSetDefaultHistogramEx( GDALRasterBandH hBand, - double dfMin, double dfMax, - int nBuckets, GUIntBig *panHistogram ); -diff --git a/gdal/gcore/gdal_priv.h b/gdal/gcore/gdal_priv.h -index 6790daf7110..f30269be6f7 100644 ---- a/gdal/gcore/gdal_priv.h -+++ b/gdal/gcore/gdal_priv.h -@@ -604,7 +604,9 @@ class CPL_DLL GDALDataset : public GDALMajorObject - CPLErr BuildOverviews( const char *, int, int *, - int, int *, GDALProgressFunc, void * ); - -+#ifndef DOXYGEN_XML - void ReportError(CPLErr eErrClass, CPLErrorNum err_no, const char *fmt, ...) CPL_PRINT_FUNC_FORMAT (4, 5); -+#endif - - char ** GetMetadata(const char * pszDomain = "") override; - -@@ -612,8 +614,6 @@ class CPL_DLL GDALDataset : public GDALMajorObject - #ifdef DOXYGEN_SKIP - CPLErr SetMetadata( char ** papszMetadata, - const char * pszDomain ) override; -- const char *GetMetadataItem( const char * pszName, -- const char * pszDomain ) override; - CPLErr SetMetadataItem( const char * pszName, - const char * pszValue, - const char * pszDomain ) override; -@@ -1252,11 +1252,8 @@ class CPL_DLL GDALRasterBand : public GDALMajorObject - - // Only defined when Doxygen enabled - #ifdef DOXYGEN_SKIP -- char **GetMetadata( const char * pszDomain = "" ) override; - CPLErr SetMetadata( char ** papszMetadata, - const char * pszDomain ) override; -- const char *GetMetadataItem( const char * pszName, -- const char * pszDomain ) override; - CPLErr SetMetadataItem( const char * pszName, - const char * pszValue, - const char * pszDomain ) override; -diff --git a/gdal/ogr/ogr_geometry.h b/gdal/ogr/ogr_geometry.h -index d7de8f07555..ef220d19747 100644 ---- a/gdal/ogr/ogr_geometry.h -+++ b/gdal/ogr/ogr_geometry.h -@@ -421,13 +421,18 @@ class CPL_DLL OGRGeometry - OGRwkbVariant=wkbVariantOldOgc ) const = 0; - virtual OGRErr importFromWkt( const char ** ppszInput ) = 0; - -+#ifndef DOXYGEN_XML - /** Deprecated. - * @deprecated in GDAL 2.3 - */ -- OGRErr importFromWkt( char ** ppszInput ) CPL_WARN_DEPRECATED("Use importFromWkt(const char**) instead") -+ OGRErr importFromWkt( char ** ppszInput ) -+/*! @cond Doxygen_Suppress */ -+ CPL_WARN_DEPRECATED("Use importFromWkt(const char**) instead") -+/*! @endcond */ - { - return importFromWkt( const_cast(ppszInput) ); - } -+#endif - - OGRErr exportToWkt( char ** ppszDstText, - OGRwkbVariant=wkbVariantOldOgc ) const; -@@ -881,9 +886,16 @@ class CPL_DLL OGRPoint : public OGRGeometry - OGRErr exportToWkb( OGRwkbByteOrder, unsigned char *, - OGRwkbVariant=wkbVariantOldOgc ) - const override; -+ -+#ifndef DOXYGEN_XML - using OGRGeometry::importFromWkt; /** deprecated */ -+#endif -+ - OGRErr importFromWkt( const char ** ) override; -+ -+#ifndef DOXYGEN_XML - using OGRGeometry::exportToWkt; -+#endif - - /// Export a point to WKT - /// \param opts Output options. -@@ -1187,9 +1199,16 @@ class CPL_DLL OGRSimpleCurve: public OGRCurve - virtual OGRErr exportToWkb( OGRwkbByteOrder, unsigned char *, - OGRwkbVariant=wkbVariantOldOgc ) - const override; -+ -+#ifndef DOXYGEN_XML - using OGRGeometry::importFromWkt; /** deprecated */ -+#endif -+ - OGRErr importFromWkt( const char ** ) override; -+ -+#ifndef DOXYGEN_XML - using OGRGeometry::exportToWkt; -+#endif - - /// Export a simple curve to WKT - /// \param opts Output options. -@@ -1481,9 +1500,16 @@ class CPL_DLL OGRCircularString : public OGRSimpleCurve - virtual OGRErr exportToWkb( OGRwkbByteOrder, unsigned char *, - OGRwkbVariant=wkbVariantOldOgc ) - const override; -+ -+#ifndef DOXYGEN_XML - using OGRGeometry::importFromWkt; /** deprecated */ -+#endif -+ - OGRErr importFromWkt( const char ** ) override; -+ -+#ifndef DOXYGEN_XML - using OGRGeometry::exportToWkt; -+#endif - - /// Export a circular string to WKT - /// \param opts Output options. -@@ -1701,9 +1727,16 @@ class CPL_DLL OGRCompoundCurve : public OGRCurve - virtual OGRErr exportToWkb( OGRwkbByteOrder, unsigned char *, - OGRwkbVariant=wkbVariantOldOgc ) - const override; -+ -+#ifndef DOXYGEN_XML - using OGRGeometry::importFromWkt; /** deprecated */ -+#endif -+ - OGRErr importFromWkt( const char ** ) override; -+ -+#ifndef DOXYGEN_XML - using OGRGeometry::exportToWkt; -+#endif - - /// Export a compound curve to WKT - /// \param opts Output options. -@@ -1904,9 +1937,16 @@ class CPL_DLL OGRCurvePolygon : public OGRSurface - virtual OGRErr exportToWkb( OGRwkbByteOrder, unsigned char *, - OGRwkbVariant=wkbVariantOldOgc ) - const override; -+ -+#ifndef DOXYGEN_XML - using OGRGeometry::importFromWkt; /** deprecated */ -+#endif -+ - OGRErr importFromWkt( const char ** ) override; -+ -+#ifndef DOXYGEN_XML - using OGRGeometry::exportToWkt; -+#endif - - /// Export a curve polygon to WKT - /// \param opts Output options. -@@ -2048,10 +2088,16 @@ class CPL_DLL OGRPolygon : public OGRCurvePolygon - virtual OGRErr exportToWkb( OGRwkbByteOrder, unsigned char *, - OGRwkbVariant=wkbVariantOldOgc ) - const override; -+ -+#ifndef DOXYGEN_XML - using OGRGeometry::importFromWkt; /** deprecated */ -+#endif -+ - OGRErr importFromWkt( const char ** ) override; - -+#ifndef DOXYGEN_XML - using OGRGeometry::exportToWkt; -+#endif - - /// Export a polygon to WKT - /// \param opts Output options. -@@ -2238,10 +2284,16 @@ class CPL_DLL OGRGeometryCollection : public OGRGeometry - virtual OGRErr exportToWkb( OGRwkbByteOrder, unsigned char *, - OGRwkbVariant=wkbVariantOldOgc ) - const override; -+ -+#ifndef DOXYGEN_XML - using OGRGeometry::importFromWkt; /** deprecated */ -+#endif -+ - OGRErr importFromWkt( const char ** ) override; - -+#ifndef DOXYGEN_XML - using OGRGeometry::exportToWkt; -+#endif - - /// Export a geometry collection to WKT - /// \param opts Output options. -@@ -2341,10 +2393,16 @@ class CPL_DLL OGRMultiSurface : public OGRGeometryCollection - // Non standard (OGRGeometry). - virtual const char *getGeometryName() const override; - virtual OGRwkbGeometryType getGeometryType() const override; -+ -+#ifndef DOXYGEN_XML - using OGRGeometry::importFromWkt; /** deprecated */ -+#endif -+ - OGRErr importFromWkt( const char ** ) override; - -+#ifndef DOXYGEN_XML - using OGRGeometry::exportToWkt; -+#endif - - /// Export a geometry collection to WKT - /// \param opts Output options. -@@ -2439,7 +2497,10 @@ class CPL_DLL OGRMultiPolygon : public OGRMultiSurface - // Non-standard (OGRGeometry). - virtual const char *getGeometryName() const override; - virtual OGRwkbGeometryType getGeometryType() const override; -+ -+#ifndef DOXYGEN_XML - using OGRGeometry::exportToWkt; -+#endif - - /// Export a multipolygon to WKT - /// \param opts Output options. -@@ -2538,9 +2599,16 @@ class CPL_DLL OGRPolyhedralSurface : public OGRSurface - virtual OGRErr exportToWkb( OGRwkbByteOrder, unsigned char *, - OGRwkbVariant=wkbVariantOldOgc ) - const override; -+ -+#ifndef DOXYGEN_XML - using OGRGeometry::importFromWkt; /** deprecated */ -+#endif -+ - OGRErr importFromWkt( const char ** ) override; -+ -+#ifndef DOXYGEN_XML - using OGRGeometry::exportToWkt; -+#endif - - /// Export a polyhedral surface to WKT - /// \param opts Output options. -@@ -2718,9 +2786,16 @@ class CPL_DLL OGRMultiPoint : public OGRGeometryCollection - // Non-standard (OGRGeometry). - virtual const char *getGeometryName() const override; - virtual OGRwkbGeometryType getGeometryType() const override; -+ -+#ifndef DOXYGEN_XML - using OGRGeometry::importFromWkt; /** deprecated */ -+#endif -+ - OGRErr importFromWkt( const char ** ) override; -+ -+#ifndef DOXYGEN_XML - using OGRGeometry::exportToWkt; -+#endif - - /// Export a multipoint to WKT - /// \param opts Output options. -@@ -2803,9 +2878,16 @@ class CPL_DLL OGRMultiCurve : public OGRGeometryCollection - // Non standard (OGRGeometry). - virtual const char *getGeometryName() const override; - virtual OGRwkbGeometryType getGeometryType() const override; -+ -+#ifndef DOXYGEN_XML - using OGRGeometry::importFromWkt; /** deprecated */ -+#endif -+ - OGRErr importFromWkt( const char ** ) override; -+ -+#ifndef DOXYGEN_XML - using OGRGeometry::exportToWkt; -+#endif - - /// Export a multicurve to WKT - /// \param opts Output options. -@@ -2884,7 +2966,10 @@ class CPL_DLL OGRMultiLineString : public OGRMultiCurve - // Non standard (OGRGeometry). - virtual const char *getGeometryName() const override; - virtual OGRwkbGeometryType getGeometryType() const override; -+ -+#ifndef DOXYGEN_XML - using OGRGeometry::exportToWkt; -+#endif - - /// Export a multilinestring to WKT - /// \param opts Output options. -diff --git a/gdal/ogr/ogr_spatialref.h b/gdal/ogr/ogr_spatialref.h -index 23237a62091..a97af16ece7 100644 ---- a/gdal/ogr/ogr_spatialref.h -+++ b/gdal/ogr/ogr_spatialref.h -@@ -293,7 +293,11 @@ class CPL_DLL OGRSpatialReference - const char *pszUnitAuthority = nullptr, - const char *pszUnitCode = nullptr); - -- double GetLinearUnits( char ** ) const CPL_WARN_DEPRECATED("Use GetLinearUnits(const char**) instead"); -+ double GetLinearUnits( char ** ) const -+/*! @cond Doxygen_Suppress */ -+ CPL_WARN_DEPRECATED("Use GetLinearUnits(const char**) instead") -+/*! @endcond */ -+ ; - double GetLinearUnits( const char ** = nullptr ) const; - /*! @cond Doxygen_Suppress */ - double GetLinearUnits( std::nullptr_t ) const -@@ -302,7 +306,10 @@ class CPL_DLL OGRSpatialReference - - double GetTargetLinearUnits( const char *pszTargetKey, - char ** ppszRetName ) const -- CPL_WARN_DEPRECATED("Use GetTargetLinearUnits(const char*, const char**)"); -+/*! @cond Doxygen_Suppress */ -+ CPL_WARN_DEPRECATED("Use GetTargetLinearUnits(const char*, const char**)") -+/*! @endcond */ -+ ; - double GetTargetLinearUnits( const char *pszTargetKey, - const char ** ppszRetName = nullptr ) const; - /*! @cond Doxygen_Suppress */ -@@ -311,14 +318,22 @@ class CPL_DLL OGRSpatialReference - /*! @endcond */ - - OGRErr SetAngularUnits( const char *pszName, double dfInRadians ); -- double GetAngularUnits( char ** ) const CPL_WARN_DEPRECATED("Use GetAngularUnits(const char**) instead"); -+ double GetAngularUnits( char ** ) const -+/*! @cond Doxygen_Suppress */ -+ CPL_WARN_DEPRECATED("Use GetAngularUnits(const char**) instead") -+/*! @endcond */ -+ ; - double GetAngularUnits( const char ** = nullptr ) const; - /*! @cond Doxygen_Suppress */ - double GetAngularUnits( std::nullptr_t ) const - { return GetAngularUnits( static_cast(nullptr) ); } - /*! @endcond */ - -- double GetPrimeMeridian( char ** ) const CPL_WARN_DEPRECATED("Use GetPrimeMeridian(const char**) instead"); -+ double GetPrimeMeridian( char ** ) const -+/*! @cond Doxygen_Suppress */ -+ CPL_WARN_DEPRECATED("Use GetPrimeMeridian(const char**) instead") -+/*! @endcond */ -+ ; - double GetPrimeMeridian( const char ** = nullptr ) const; - /*! @cond Doxygen_Suppress */ - double GetPrimeMeridian( std::nullptr_t ) const -diff --git a/gdal/port/cpl_conv.h b/gdal/port/cpl_conv.h -index a3ee4e7318d..e6f03396e32 100644 ---- a/gdal/port/cpl_conv.h -+++ b/gdal/port/cpl_conv.h -@@ -178,7 +178,7 @@ const char CPL_DLL *CPLLaunderForFilename(const char* pszName, - /* -------------------------------------------------------------------- */ - - /** Callback for CPLPushFileFinder */ --typedef const char *(*CPLFileFinder)(const char *, const char *); -+typedef char const *(*CPLFileFinder)(const char *, const char *); - - const char CPL_DLL *CPLFindFile(const char *pszClass, - const char *pszBasename); diff --git a/gdal.changes b/gdal.changes index d370039..152c79b 100644 --- a/gdal.changes +++ b/gdal.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Jun 30 09:46:10 UTC 2020 - Bruno Friedmann + +- Update to 3.1.1 version with full changelog + https://github.com/OSGeo/gdal/blob/v3.1.1/gdal/NEWS +- Packaging: + + drop merged upstream gdal-fix-docs.patch + + Rework our way to deliver the package: + - Remove building doc as we don't deliver it + - Use upstream man page already present in tar + - Simplify all %if doc related stuff + + Lower again a bit _constraints: 2.5G RAM 4.0G HDD + ------------------------------------------------------------------- Tue Jun 16 08:22:44 UTC 2020 - Guillaume GARDET diff --git a/gdal.spec b/gdal.spec index 61bb892..91da00b 100644 --- a/gdal.spec +++ b/gdal.spec @@ -20,18 +20,12 @@ %define sourcename gdal # Uppercase GDAL is the canonical name for this package in Python %define pypi_package_name GDAL -# Enable docs on Tumbleweed only - https://github.com/OSGeo/gdal/issues/2690 -%if 0%{?suse_version} > 1500 -%bcond_without docs -%else -%bcond_with docs -%endif %bcond_with ecw_support %bcond_with ecw5_support %bcond_with fgdb_support %bcond_without python2 Name: gdal -Version: 3.1.0 +Version: 3.1.1 Release: 0 Summary: GDAL/OGR - a translator library for raster and vector geospatial data formats License: MIT AND BSD-3-Clause AND SUSE-Public-Domain @@ -41,8 +35,6 @@ Source1: http://download.osgeo.org/%{name}/%{version}/%{sourcename}-%{ver Patch0: gdal-perl.patch # Fix occasional parallel build failure Patch1: GDALmake.opt.in.patch -# PATCH-FIX-UPSTREAM - https://github.com/OSGeo/gdal/pull/2678 -Patch2: gdal-fix-docs.patch BuildRequires: KEALib-devel BuildRequires: autoconf BuildRequires: automake @@ -93,20 +85,9 @@ BuildRequires: pkgconfig(spatialite) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(xerces-c) BuildRequires: pkgconfig(zlib) >= 1.1.4 -%if %{with docs} -BuildRequires: python3-Sphinx -BuildRequires: python3-breathe -BuildRequires: texlive-dvips-bin -BuildRequires: texlive-latex-bin-bin -BuildRequires: texlive-newunicodechar -%endif %if %{with python2} BuildRequires: python-numpy-devel BuildRequires: python-setuptools -%if %{with docs} -BuildRequires: python-Sphinx -BuildRequires: python-breathe -%endif %endif %if %{with fgdb_support} BuildRequires: filegdb_api-devel @@ -176,9 +157,7 @@ The GDAL python modules provide support to handle multiple GIS file formats. %prep %setup -q -n %{sourcename}-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p2 +%autopatch -p1 # Set the right (build) libproj.so version, use the upper found version. PROJSOVER=$(ls -1 %{_libdir}/libproj.so.?? | tail -n1 | awk -F '.' '{print $3}') @@ -203,6 +182,9 @@ find . -type f -name "style_ogr_sym.png" -exec chmod 0644 {} \; # Fix wrong /usr/bin/env phyton #Create the move to python3 find . -iname "*.py" -exec sed -i 's,^#!%{_bindir}/env python$,#!%{_bindir}/python3,' {} \; +# Fix wrong /usr/bin/env python3 +find . -iname "*.py" -exec sed -i "s,^#!%{_bindir}/env python3,#!%{_bindir}/python3," {} \; + %if %{with ecw5_support} # gdal configure script looks for a given layout, so reproduce what is expected. export ECW_PATH="../ECW/Desktop_Read-Only" @@ -284,16 +266,7 @@ do make %{?_smp_mflags} -C swig/${M} generate done -# Force Doxygen generation -rm doc/.doxygen_up_to_date -pushd doc/ -make .doxygen_up_to_date -popd - make %{?_smp_mflags} VERBOSE=1 all \ -%if %{with docs} - docs man \ -%endif # Make Python 3 module pushd swig/python @@ -308,19 +281,8 @@ pushd swig/python python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} popd -make %{?_smp_mflags} install \ -%if %{with docs} - install-man \ -%endif - DESTDIR=%{buildroot} INST_MAN=%{_mandir} - -# Not on buildroot : broke everything with python3 -# If done got python3 needing python2 package heretic .. -# Futhermore duplicates are only existing in src html dir -%fdupes -s doc/build/html -# Empty file -rm -f doc/build/html/do-not-remove - +# Don't even think to make it smp_mflags if you want successful build! +make V=1 install install-man DESTDIR=%{buildroot} INST_MAN=%{_mandir} # chrpath must be removed here chmod 644 %{buildroot}%{perl_vendorarch}/auto/Geo/GDAL/Const/Const.so chmod 644 %{buildroot}%{perl_vendorarch}/auto/Geo/GDAL/GDAL.so @@ -334,7 +296,7 @@ chrpath --delete %{buildroot}%{perl_vendorarch}/auto/Geo/GNM/GNM.so chrpath --delete %{buildroot}%{perl_vendorarch}/auto/Geo/OGR/OGR.so chrpath --delete %{buildroot}%{perl_vendorarch}/auto/Geo/OSR/OSR.so -# do not ship these +# do not ship those rm -rf %{buildroot}%{_mandir}/man1/_* rm -rf %{buildroot}%{_libdir}/libgdal.la rm -rf %{buildroot}%{perl_archlib}/perllocal.pod @@ -347,9 +309,6 @@ rm -f %{buildroot}%{_datadir}/gdal/LICENSE.TXT # avoid PACKAGE redefines sed -i 's,\(#define PACKAGE_.*\),/* \1 */,' %{buildroot}%{_includedir}/gdal/cpl_config.h -# Fix wrong /usr/bin/env phyton3 -find %{buildroot}%{_bindir} -iname "*.py" -exec sed -i "s,^#!%{_bindir}/env python3,#!%{_bindir}/python3," {} \; - %post -n lib%{name}%{soversion} -p /sbin/ldconfig %postun -n lib%{name}%{soversion} -p /sbin/ldconfig @@ -414,7 +373,6 @@ find %{buildroot}%{_bindir} -iname "*.py" -exec sed -i "s,^#!%{_bindir}/env pyth %{_bindir}/rgb2pct.py %{_bindir}/testepsg %{_datadir}/gdal -%if %{with docs} %{_mandir}/man1/gdal2tiles.1%{?ext_man} %{_mandir}/man1/gdal_calc.1%{?ext_man} %{_mandir}/man1/gdal_contour.1%{?ext_man} @@ -429,6 +387,7 @@ find %{buildroot}%{_bindir} -iname "*.py" -exec sed -i "s,^#!%{_bindir}/env pyth %{_mandir}/man1/gdal_retile.1%{?ext_man} %{_mandir}/man1/gdal_sieve.1%{?ext_man} %{_mandir}/man1/gdal_translate.1%{?ext_man} +%{_mandir}/man1/gdal_viewshed.1%{?ext_man} %{_mandir}/man1/gdaladdo.1%{?ext_man} %{_mandir}/man1/gdalbuildvrt.1%{?ext_man} %{_mandir}/man1/gdalcompare.1%{?ext_man} @@ -436,6 +395,8 @@ find %{buildroot}%{_bindir} -iname "*.py" -exec sed -i "s,^#!%{_bindir}/env pyth %{_mandir}/man1/gdalinfo.1%{?ext_man} %{_mandir}/man1/gdallocationinfo.1%{?ext_man} %{_mandir}/man1/gdalmanage.1%{?ext_man} +%{_mandir}/man1/gdalmdiminfo.1%{?ext_man} +%{_mandir}/man1/gdalmdimtranslate.1%{?ext_man} %{_mandir}/man1/gdalmove.1%{?ext_man} %{_mandir}/man1/gdalsrsinfo.1%{?ext_man} %{_mandir}/man1/gdaltindex.1%{?ext_man} @@ -451,7 +412,6 @@ find %{buildroot}%{_bindir} -iname "*.py" -exec sed -i "s,^#!%{_bindir}/env pyth %{_mandir}/man1/ogrtindex.1%{?ext_man} %{_mandir}/man1/pct2rgb.1%{?ext_man} %{_mandir}/man1/rgb2pct.1%{?ext_man} -%endif %files devel %license LICENSE.TXT @@ -464,9 +424,7 @@ find %{buildroot}%{_bindir} -iname "*.py" -exec sed -i "s,^#!%{_bindir}/env pyth %{_libdir}/pkgconfig/gdal.pc %dir %{_includedir}/gdal %{_includedir}/gdal/*.h -%if %{with docs} %{_mandir}/man1/gdal-config.1%{?ext_man} -%endif %files -n perl-%{name} %license LICENSE.TXT