Hello community, here is the log from the commit of package gdal for openSUSE:Factory checked in at 2020-07-07 12:58:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gdal (Old) and /work/SRC/openSUSE:Factory/.gdal.new.3060 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gdal" Tue Jul 7 12:58:40 2020 rev:52 rq:819042 version:3.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/gdal/gdal.changes 2020-06-16 13:47:12.198418806 +0200 +++ /work/SRC/openSUSE:Factory/.gdal.new.3060/gdal.changes 2020-07-07 12:58:58.645864574 +0200 @@ -1,0 +2,13 @@ +Tue Jun 30 09:46:10 UTC 2020 - Bruno Friedmann <br...@ioda-net.ch> + +- 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 + +------------------------------------------------------------------- Old: ---- gdal-3.1.0.tar.xz gdal-3.1.0.tar.xz.md5 gdal-fix-docs.patch New: ---- gdal-3.1.1.tar.xz gdal-3.1.1.tar.xz.md5 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdal.spec ++++++ --- /var/tmp/diff_new_pack.INhIsA/_old 2020-07-07 12:59:00.405870317 +0200 +++ /var/tmp/diff_new_pack.INhIsA/_new 2020-07-07 12:59:00.405870317 +0200 @@ -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 @@ 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(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 @@ %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 @@ # 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 @@ 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 @@ 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/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 @@ # 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 @@ %{_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 @@ %{_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 @@ %{_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 @@ %{_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 @@ %{_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 ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.INhIsA/_old 2020-07-07 12:59:00.441870434 +0200 +++ /var/tmp/diff_new_pack.INhIsA/_new 2020-07-07 12:59:00.441870434 +0200 @@ -1,10 +1,10 @@ <constraints> <hardware> <memory> - <size unit="G">3</size> + <size unit="G">2.5</size> </memory> <disk> - <size unit="G">5</size> + <size unit="G">4</size> </disk> </hardware> </constraints> ++++++ gdal-3.1.0.tar.xz -> gdal-3.1.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/gdal/gdal-3.1.0.tar.xz /work/SRC/openSUSE:Factory/.gdal.new.3060/gdal-3.1.1.tar.xz differ: char 26, line 1 ++++++ gdal-3.1.0.tar.xz.md5 -> gdal-3.1.1.tar.xz.md5 ++++++ --- /work/SRC/openSUSE:Factory/gdal/gdal-3.1.0.tar.xz.md5 2020-06-16 13:47:10.498413071 +0200 +++ /work/SRC/openSUSE:Factory/.gdal.new.3060/gdal-3.1.1.tar.xz.md5 2020-07-07 12:58:57.393860489 +0200 @@ -1 +1 @@ -fe29a41d5813263fc33c1f9130f73e01 gdal-3.1.0.tar.xz +7a88fae4beb62ccd9b794db1c22b8bc4 gdal-3.1.1.tar.xz
