From cf48f3e51a4b3340eeb4b72d021677d361c2d702 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 12 Jun 2013 15:19:47 -0600 Subject: [PATCH 01/15] Cleanup changelog --- gdal.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/gdal.spec b/gdal.spec index 6760d86..71c5041 100644 --- a/gdal.spec +++ b/gdal.spec @@ -792,9 +792,6 @@ popd * Wed Jun 12 2013 Orion Poplawski - 1.9.2-7 - Update Java/JNI for new guidelines, also fixes bug #908065 -* Thu May 16 2013 Orion Poplawski - 1.9.2-6 -- Rebuild for hdf5 1.8.11 - * Mon Apr 29 2013 Peter Robinson 1.9.2-5 - Rebuild for ARM libspatialite issue From 58856598da1483a8a8c078145ae9e09eea002e58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Devrim=20G=C3=BCnd=C3=BCz?= Date: Thu, 10 Jul 2014 16:50:00 +0300 Subject: [PATCH 02/15] Sync EPEL 7 with rawhide, so that we start with latest and greatest. --- gdal-1.9.0-man.patch | 11 - gdal-1.9.1-dods-3.11.3.patch | 14 - gdal-cleaner.sh | 6 +- gdal.spec | 528 ++++++++--------------------------- sources | 4 +- 5 files changed, 123 insertions(+), 440 deletions(-) delete mode 100644 gdal-1.9.0-man.patch delete mode 100644 gdal-1.9.1-dods-3.11.3.patch diff --git a/gdal-1.9.0-man.patch b/gdal-1.9.0-man.patch deleted file mode 100644 index 2e1671e..0000000 --- a/gdal-1.9.0-man.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur gdal-1.9.0-fedora/GNUmakefile gdal-1.9.0-fedora-man/GNUmakefile ---- gdal-1.9.0-fedora/GNUmakefile 2012-01-04 08:03:42.000000000 +0100 -+++ gdal-1.9.0-fedora-man/GNUmakefile 2012-02-22 17:29:07.565112215 +0100 -@@ -129,6 +129,7 @@ - cp frmts/wms/frmt_wms_*.xml html - cp frmts/wms/frmt_twms_*.xml html - -+.PHONY: man - man: - # Generate man pages - (cat Doxyfile ; echo "ENABLED_SECTIONS=man"; echo "INPUT=apps swig/python/scripts"; echo "FILE_PATTERNS=*.cpp *.dox"; echo "GENERATE_HTML=NO"; echo "GENERATE_MAN=YES") | doxygen - diff --git a/gdal-1.9.1-dods-3.11.3.patch b/gdal-1.9.1-dods-3.11.3.patch deleted file mode 100644 index 5cdc90d..0000000 --- a/gdal-1.9.1-dods-3.11.3.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nur gdal-1.9.1-fedora/configure gdal-1.9.1-fedora-dods3.11.3/configure ---- gdal-1.9.1-fedora/configure 2012-05-17 05:30:56.000000000 +0200 -+++ gdal-1.9.1-fedora-dods3.11.3/configure 2012-05-20 10:47:10.032831845 +0200 -@@ -24320,8 +24320,8 @@ - as_fn_error $? "--with-dods-root requires path to dods root as argument" "$LINENO" 5 - else - DODS_LIB=$with_dods_root/lib -- DODS_INC="-I$with_dods_root/include -I$with_dods_root/include/libdap -I$with_dods_root/include/dap" - DODS_BIN=$with_dods_root/bin -+ DODS_INC="-I$with_dods_root/include -I$with_dods_root/include/libdap -I$with_dods_root/include/dap `$DODS_BIN/xml2-config --cflags`" - - rm -f islibdappost310.* - echo '#include "Connect.h"' > islibdappost310.cpp -Binary files gdal-1.9.1-fedora/.configure.swp and gdal-1.9.1-fedora-dods3.11.3/.configure.swp differ diff --git a/gdal-cleaner.sh b/gdal-cleaner.sh index 8a0d644..bfba377 100755 --- a/gdal-cleaner.sh +++ b/gdal-cleaner.sh @@ -1,8 +1,8 @@ #!/bin/bash # Volker Fröhlich -VERSION="1.9.2" +VERSION="1.11.0" -tar xvfz gdal-"${VERSION}".tar.gz +tar xvf gdal-"${VERSION}".tar.xz mv gdal-"${VERSION}"{,-fedora} && pushd gdal-"${VERSION}"-fedora @@ -22,4 +22,4 @@ popd #TODO: Insert Provenance file -tar cvfz gdal-"${VERSION}"-fedora.tar.gz gdal-"${VERSION}"-fedora +tar cvfJ gdal-"${VERSION}"-fedora.tar.xz gdal-"${VERSION}"-fedora diff --git a/gdal.spec b/gdal.spec index 71c5041..68e8e3c 100644 --- a/gdal.spec +++ b/gdal.spec @@ -23,17 +23,25 @@ # Tests can be of a different version -%global testversion 1.9.0 +%global testversion 1.11.0 +%global run_tests 1 -# https://bugzilla.redhat.com/show_bug.cgi?id=663938 -%ifnarch ppc ppc64 +%global with_spatialite 1 %global spatialite "--with-spatialite" + +# No ppc64 build for spatialite in EL6 +# https://bugzilla.redhat.com/show_bug.cgi?id=663938 +%if 0%{?rhel} == 6 +%ifnarch ppc64 +%global with_spatialite 0 +%global spatialite "--without-spatialite" +%endif %endif Name: gdal -Version: 1.9.2 -Release: 7%{?dist} +Version: 1.11.0 +Release: 2%{?dist} Summary: GIS file format library Group: System Environment/Libraries License: MIT @@ -41,7 +49,7 @@ URL: http://www.gdal.org # Source0: http://download.osgeo.org/gdal/gdal-%%{version}.tar.gz # See PROVENANCE.TXT-fedora and the cleaner script for details! -Source0: %{name}-%{version}-fedora.tar.gz +Source0: %{name}-%{version}-fedora.tar.xz Source1: http://download.osgeo.org/%{name}/%{name}autotest-%{testversion}.tar.gz Source2: %{name}.pom @@ -55,15 +63,9 @@ Patch1: %{name}-g2clib.patch # Patch for Fedora JNI library location Patch2: %{name}-jni.patch -Patch4: %{name}-1.9.1-dods-3.11.3.patch - # Fedora uses Alternatives for Java Patch8: %{name}-1.9.0-java.patch -# Make man a phony buildtarget; the directory otherwise blocks it -# Should be solved in 2.0 -Patch9: %{name}-1.9.0-man.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant @@ -88,7 +90,6 @@ BuildRequires: hdf5-devel BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jasper-devel BuildRequires: jpackage-utils -BuildRequires: libgcj BuildRequires: libgeotiff-devel # No libgta in EL5 BuildRequires: libgta-devel @@ -96,11 +97,12 @@ BuildRequires: libgta-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel -%ifnarch ppc ppc64 +%if %{with_spatialite} BuildRequires: libspatialite-devel %endif BuildRequires: libtiff-devel +# No libwebp in EL 5 and 6 BuildRequires: libwebp-devel BuildRequires: libtool BuildRequires: giflib-devel @@ -109,18 +111,28 @@ BuildRequires: libdap-devel BuildRequires: librx-devel BuildRequires: mysql-devel BuildRequires: numpy -#BuildRequires: ogdi-devel +BuildRequires: pcre-devel +BuildRequires: ogdi-devel BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: pkgconfig BuildRequires: poppler-devel BuildRequires: postgresql-devel BuildRequires: proj-devel -BuildRequires: python-devel -BuildRequires: ruby -BuildRequires: ruby-devel +BuildRequires: python2-devel BuildRequires: sqlite-devel BuildRequires: swig -BuildRequires: tetex-latex +BuildRequires: texlive-latex +%if 0%{?fedora} >= 20 +BuildRequires: texlive-collection-fontsrecommended +BuildRequires: texlive-collection-langcyrillic +BuildRequires: texlive-collection-langportuguese +BuildRequires: texlive-collection-latex +BuildRequires: texlive-epstopdf +BuildRequires: tex(multirow.sty) +BuildRequires: tex(sectsty.sty) +BuildRequires: tex(tocloft.sty) +BuildRequires: tex(xtab.sty) +%endif BuildRequires: unixODBC-devel BuildRequires: xerces-c-devel BuildRequires: xz-devel @@ -141,16 +153,11 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} %global cpuarch 64 %endif -%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) +%if ! (0%{?fedora} || 0%{?rhel} > 5) %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %endif -%if (0%{?fedora} < 17 || 0%{?rhel}) -# https://fedoraproject.org/wiki/PackagingDrafts/Ruby -%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')} -%endif - #TODO: Description on the lib? %description Geospatial Data Abstraction Library (GDAL/OGR) is a cross platform @@ -182,34 +189,15 @@ This package contains development files for GDAL. %package libs Summary: GDAL file format library Group: System Environment/Libraries +Obsoletes: %{name}-ruby < 1.11.0-1 %description libs This package contains the GDAL file format library. -%package ruby -Summary: Ruby modules for the GDAL file format library -Group: Development/Libraries -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - -%if (0%{?fedora} < 17 || 0%{?rhel}) -Requires: ruby(abi) = 1.8 -%else -%if 0%{?fedora} < 19 -Requires: ruby(abi) = 1.9.1 -%else -Requires: ruby(release) -%endif -%endif - -%description ruby -The GDAL Ruby modules provide support to handle multiple GIS file formats. - - %package java Summary: Java modules for the GDAL file format library Group: Development/Libraries -Requires: java >= 1:1.6.0 Requires: jpackage-utils Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -277,12 +265,10 @@ rm -r frmts/grib/degrib18/g2clib-1.0.4 %patch1 -p1 -b .g2clib~ %patch2 -p1 -b .jni~ -%patch4 -p1 -b .dods~ %patch8 -p1 -b .java~ -%patch9 -p1 -b .man~ # Copy in PROVENANCE.TXT-fedora -cp %SOURCE4 . +cp -p %SOURCE4 . # Sanitize linebreaks and encoding #TODO: Don't touch data directory! @@ -311,6 +297,10 @@ pushd $f popd done +# Fix build order with parallel make +# http://trac.osgeo.org/gdal/ticket/5346 +sed -i '/^swig-modules:/s/lib-target/apps-target/' GNUmakefile + # Workaround about wrong result in configure # armadillo returns a warning about gcc versions 4.7.0 or 4.7.1 # due to http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53549 @@ -318,21 +308,6 @@ done # this patch can/should be removed after gcc 4.7.2 is released sed -i 's|if test -z "`${CXX} testarmadillo.cpp -o testarmadillo -larmadillo 2>&1`"|if true|' configure -# Build with fPIC to allow Ruby bindings -# Xcompiler should normally achieve that -- http://trac.osgeo.org/gdal/ticket/3978 -# http://trac.osgeo.org/gdal/ticket/1994 -sed -i 's|\$(CFLAGS)|$(CFLAGS) -fPIC|g' swig/ruby/RubyMakefile.mk - -%if !(0%{?fedora} < 17 || 0%{?rhel}) -# Install Ruby bindings to distribution specific directory -sed -i 's|RUBY_EXTENSIONS_DIR :=.*|RUBY_EXTENSIONS_DIR := %{ruby_vendorarchdir}|' swig/ruby/RubyMakefile.mk -%endif - -# Install Ruby bindings into the proper place -#TODO: Ticket -sed -i -e 's|^$(INSTALL_DIR):|$(DESTDIR)$(INSTALL_DIR):|' swig/ruby/RubyMakefile.mk -sed -i -e 's|^install: $(INSTALL_DIR)|install: $(DESTDIR)$(INSTALL_DIR)|' swig/ruby/RubyMakefile.mk - # Replace hard-coded library- and include paths sed -i 's|@LIBTOOL@|%{_bindir}/libtool|g' GDALmake.opt.in sed -i 's|-L\$with_cfitsio -L\$with_cfitsio/lib -lcfitsio|-lcfitsio|g' configure @@ -363,6 +338,9 @@ sed -i 's|test \"$ARCH\" = \"x86_64\"|test \"$libdir\" = \"/usr/lib64\"|g' confi sed -i 's|with_dods_root/lib|with_dods_root/lib64|' configure %endif +# Fix mandir +sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure + # Activate support for JPEGLS sed -i 's|^#HAVE_CHARLS|HAVE_CHARLS|' GDALmake.opt.in sed -i 's|#CHARLS_INC = -I/path/to/charls_include|CHARLS_INC = -I%{_includedir}/CharLS|' GDALmake.opt.in @@ -427,7 +405,7 @@ export CPPFLAGS="$CPPFLAGS -I%{_includedir}/libgeotiff" --with-mysql \ --with-netcdf \ --with-odbc \ - --without-ogdi \ + --with-ogdi \ --without-msg \ --without-openjpeg \ --with-pcraster \ @@ -440,7 +418,6 @@ export CPPFLAGS="$CPPFLAGS -I%{_includedir}/libgeotiff" --with-webp \ --with-xerces \ --enable-shared \ - --with-ruby \ --with-perl \ --with-python @@ -483,6 +460,7 @@ for docdir in %{docdirs}; do doxygen -u fi sed -i -e 's|^GENERATE_LATEX|GENERATE_LATEX = YES\n#GENERATE_LATEX |' Doxyfile + sed -i -e 's|^GENERATE_HTML|GENERATE_HTML = YES\n#GENERATE_HTML |' Doxyfile sed -i -e 's|^USE_PDFLATEX|USE_PDFLATEX = YES\n#USE_PDFLATEX |' Doxyfile if [ $docdir == "doc/ru" ]; then @@ -642,8 +620,7 @@ touch -r NEWS %{buildroot}%{_bindir}/%{name}-config chmod 755 %{buildroot}%{_bindir}/%{name}-config # Clean up junk -rm -f %{buildroot}%{_bindir}/gdal_sieve.dox -rm -f %{buildroot}%{_bindir}/gdal_fillnodata.dox +rm -f %{buildroot}%{_bindir}/*.dox #jni-libs and libgdal are also built static (*.a) #.exists and .packlist stem from Perl @@ -658,12 +635,14 @@ rm -f %{buildroot}%{_datadir}/%{name}/LICENSE.TXT for f in 'GDAL*' BandProperty ColorAssociation CutlineTransformer DatasetProperty EnhanceCBInfo ListFieldDesc NamedColor OGRSplitListFieldLayer VRTBuilder; do rm -rf %{buildroot}%{_mandir}/man1/$f.1* done +#TODO: What's that? rm -f %{buildroot}%{_mandir}/man1/*_%{name}-%{version}-fedora_apps_* %check -#for i in -I/usr/lib/jvm/java/include{,/linux}; do -# java_inc="$java_inc $i" -#done +%if %{run_tests} +for i in -I/usr/lib/jvm/java/include{,/linux}; do + java_inc="$java_inc $i" +done pushd %{name}autotest-%{testversion} @@ -688,6 +667,7 @@ pushd %{name}autotest-%{testversion} # Run tests but force normal exit in the end ./run_all.py || true popd +%endif #%{run_tests} %post libs -p /sbin/ldconfig @@ -709,6 +689,7 @@ popd %{_bindir}/gdal_grid %{_bindir}/gdalenhance %{_bindir}/gdalmanage +%{_bindir}/gdalserver %{_bindir}/gdalsrsinfo %{_bindir}/gdaltransform %{_bindir}/nearblack @@ -740,13 +721,6 @@ popd %{_libdir}/*.so %{_libdir}/pkgconfig/%{name}.pc -%files ruby -%if (0%{?fedora} < 17 || 0%{?rhel}) -%{ruby_sitearch}/%{name} -%else -%{ruby_vendorarchdir}/%{name} -%endif - # Can I even have a separate Java package anymore? %files java -f .mfiles %doc swig/java/apps @@ -789,16 +763,77 @@ popd #Or as before, using ldconfig %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.11.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri Apr 25 2014 Volker Fröhlich - 1.11.0-1 +- New upstream release +- Remove libgcj as BR, as it no longer exists in F21 +- Re-enable ogdi and spatialite where possible +- Adapt Python-BR to python2-devel +- Obsolete Ruby bindings, due to the suggestion of Even Rouault +- Preserve timestamp of Fedora README file +- Explicitly create HTML documentation with Doxygen +- Make test execution conditional +- Truncate changelog + +* Thu Apr 24 2014 Vít Ondruch - 1.10.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.1 + +* Fri Mar 28 2014 Michael Simacek - 1.10.1-6 +- Use Requires: java-headless rebuild (#1067528) + +* Fri Jan 10 2014 Orion Poplawski - 1.10.1-5 +- Rebuild for armadillo soname bump + +* Wed Jan 08 2014 Orion Poplawski - 1.10.1-4 +- Rebuild for cfitsio 3.360 + +* Thu Jan 02 2014 Orion Poplawski - 1.10.1-3 +- Rebuild for libwebp soname bump + +* Sat Sep 21 2013 Orion Poplawski - 1.10.1-2 +- Rebuild to pick up atlas 3.10 changes + +* Sun Sep 8 2013 Volker Fröhlich - 1.10.1-1 +- New upstream release + +* Fri Aug 23 2013 Orion Poplawski - 1.10.0-1 +- Update to 1.10.0 +- Enable PCRE support +- Drop man patch applied upstream +- Drop dods patch fixed upstream +- Add more tex BRs to handle changes in texlive packaging +- Fix man page install location + +* Mon Aug 19 2013 Marek Kasik - 1.9.2-12 +- Rebuild (poppler-0.24.0) + +* Sat Aug 03 2013 Fedora Release Engineering - 1.9.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Jul 17 2013 Petr Pisar - 1.9.2-10 +- Perl 5.18 rebuild + +* Thu Jul 11 2013 Orion Poplawski - 1.9.2-9 +- Rebuild for cfitsio 3.350 + +* Mon Jun 24 2013 Volker Fröhlich - 1.9.2-8 +- Rebuild for poppler 0.22.5 + * Wed Jun 12 2013 Orion Poplawski - 1.9.2-7 - Update Java/JNI for new guidelines, also fixes bug #908065 -* Mon Apr 29 2013 Peter Robinson 1.9.2-5 +* Thu May 16 2013 Orion Poplawski - 1.9.2-6 +- Rebuild for hdf5 1.8.11 + +* Mon Apr 29 2013 Peter Robinson - 1.9.2-5 - Rebuild for ARM libspatialite issue * Tue Mar 26 2013 Volker Fröhlich - 1.9.2-4 - Rebuild for cfitsio 3.340 -* Sun Mar 24 2013 Peter Robinson 1.9.2-3 +* Sun Mar 24 2013 Peter Robinson - 1.9.2-3 - rebuild (libcfitsio) * Wed Mar 13 2013 Vít Ondruch - 1.9.2-2 @@ -821,7 +856,7 @@ popd - Rebuild, see http://lists.fedoraproject.org/pipermail/devel/2012-December/175685.html -* Thu Dec 13 2012 Peter Robinson 1.9.1-14 +* Thu Dec 13 2012 Peter Robinson - 1.9.1-14 - Tweak -fpic CFLAGS to fix FTBFS on ARM * Mon Dec 3 2012 Orion Poplawski - 1.9.1-13 @@ -900,7 +935,7 @@ popd - Harmonize the use of buildroot and RPM_BUILD_ROOT - Introduce testversion macro -* Thu Feb 19 2012 Volker Fröhlich - 1.7.3-14 +* Sun Feb 19 2012 Volker Fröhlich - 1.7.3-14 - Require Ruby abi - Add patch for Ruby 1.9 include dir, back-ported from GDAL 1.9 - Change version string for gdal-config from -fedora to @@ -952,7 +987,7 @@ popd - Removed Python files from main package files section, that effectively already belonged to the Python sub-package -* Thu Apr 11 2011 Volker Fröhlich - 1.7.3-8 +* Mon Apr 11 2011 Volker Fröhlich - 1.7.3-8 - Solved image path problem with Latex - Removed with-tiff and updated with-sqlite to with-sqlite3 - Add more refman documents @@ -965,7 +1000,7 @@ popd * Wed Mar 23 2011 Dan Horák - 1.7.3-6 - rebuilt for mysql 5.5.10 (soname bump in libmysqlclient) -* Sun Mar 20 2011 Volker Fröhlich 1.7.3-5 +* Sun Mar 20 2011 Volker Fröhlich - 1.7.3-5 - Dropped unnecessary encoding conversion for Russian refman - Install Russian refman - Don't try to install refman for sdts and dgn, as they fail to compile @@ -994,330 +1029,3 @@ popd + Maven2 pom + JPP-style depmap + Use -f XX.files for ruby and python - -* Sun Oct 31 2010 Mathieu Baudier - 1.7.2-5_2 -- PCRaster support -- cURL support -- Disable building the reference manual (really too long...) - -* Sat Oct 09 2010 Mathieu Baudier - 1.7.2-5_1 -- Add Java JNI libraries - -* Sat Aug 14 2010 Mathieu Baudier - 1.7.2-5_0 -- Rebuild for EL GIS, based on work contributed by Nikolaos Hatzopoulos and Peter Hopfgartner -- Use vanilla sources - -* Wed Jul 21 2010 David Malcolm - 1.7.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Tue Jul 20 2010 Orion Poplawski - 1.7.2-4 -- Rebuild with grass support - -* Thu Jul 17 2010 Orion Poplawski - 1.7.2-3 -- Add patch to change AISConnect() to Connect() for libdap 3.10 -- build without grass for libdap soname bump - -* Tue Jul 13 2010 Kevin Kofler - 1.7.2-2 -- reenable grass support - -* Fri Jul 09 2010 Robert Scheck - 1.7.2-1 -- upgrade to 1.7.2 (#587707, huge thanks to Sven Lankes) - -* Thu Mar 18 2010 Balint Cristian - 1.7.1-2 -- fix bz#572617 - -* Thu Mar 18 2010 Balint Cristian - 1.7.1-1 -- new stable branch -- re-enable java ColorTable -- gdal custom fedora version banner -- rebuild without grass -- gdal manual are gone (upstream fault) - -* Fri Feb 5 2010 Kevin Kofler - 1.6.2-5 -- reenable grass support - -* Fri Feb 5 2010 Kevin Kofler - 1.6.2-4 -- temporarily disable grass support for bootstrapping -- rebuild for new libxerces-c - -* Tue Dec 8 2009 Michael Schwendt - 1.6.2-3 -- Explicitly BR hdf-static in accordance with the Packaging - Guidelines (hdf-devel is still static-only). - -* Thu Nov 19 2009 Orion Poplawski - 1.6.2-2 -- re-enable grass support - -* Tue Nov 17 2009 Orion Poplawski - 1.6.2-1 -- Update to 1.6.2 -- Rebuild for netcdf 4.1.0 - -* Fri Aug 21 2009 Tomas Mraz - 1.6.1-2 -- rebuilt with new openssl - -* Thu Jul 30 2009 Dan Horak - 1.6.1-1 -- add patch for incompatibilities caused by libdap 3.9.x (thanks goes to arekm from PLD) -- update to 1.6.1 -- don't install some refman.pdf, because they don't build -- don't fail on man pages with suffix other than .gz -- fix filelist for python subpackage - -* Fri Jul 24 2009 Fedora Release Engineering - 1.6.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Jul 22 2009 Orion Poplawski - 1.6.0-9 -- Rebuild for libdap 3.9.3, bootstrap - -* Mon Mar 23 2009 Jesse Keating - 1.6.0-8 -- re-enable grass support - -* Sun Mar 22 2009 Lubomir Rintel - 1.6.0-7 -- Depend specifically on GCJ for Java (Alex Lancaster) -- Disable grass (Alex Lancaster) -- Create %%_bindir before copying files there - -* Tue Feb 24 2009 Fedora Release Engineering - 1.6.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Feb 04 2009 Balint Cristian - 1.6.0-4 -- rebuild with grass support -- fix email typo - -* Thu Jan 29 2009 Balint Cristian - 1.6.0-3 -- rebuild against mysql 5.1.30 - -* Thu Jan 29 2009 Balint Cristian - 1.6.0-2 -- email change -- rebuild without grass - -* Fri Dec 12 2008 Balint Cristian - 1.6.0-1 -- final stable release - -* Sat Dec 06 2008 Balint Cristian - 1.6.0-0.2.rc4 -- enable grass - -* Sat Dec 06 2008 Balint Cristian - 1.6.0-0.1.rc4 -- new branch -- disable grass -- fix ruby compile - -* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 1.5.3-2 -- Rebuild for Python 2.6 - -* Fri Oct 24 2008 Balint Cristian - 1.5.3-1 -- new stable -- ship static package too -- fix some doc generation -- libdap patch for fc10 only - -* Tue Sep 30 2008 Balint Cristian - 1.5.2-4 -- enable gdal_array for python subpackage -- require numpy - -* Tue Sep 9 2008 Patrice Dumas - 1.5.2-3 -- patch for libdap > 0.8.0, from Rob Cermak - -* Thu Jun 12 2008 Balint Cristian - 1.5.2-1 -- a new bugfix upstream -- drop gcc43 patch -- more license cleaned - -* Wed May 27 2008 Balint Cristian - 1.5.1-13 -- fix pkgconfig too - -* Wed May 27 2008 Balint Cristian - 1.5.1-12 -- fix once more gdal-config - -* Tue May 27 2008 Balint Cristian - 1.5.1-11 -- fix multilib gdal-config, add wrapper around -- fix typos in cpl_config.h wrapper - -* Tue May 27 2008 Balint Cristian - 1.5.1-10 -- fix for multilib packaging bz#341231 -- huge spec cleanup -- enable russian and brazil docs -- enable and triage more docs - -* Sun May 25 2008 Balint Cristian - 1.5.1-9 -- enable ruby and java packages -- fix spurious sed problem -- spec file cosmetics - -* Thu May 23 2008 Balint Cristian - 1.5.1-8 -- fix sincos on all arch - -* Thu May 15 2008 Balint Cristian - 1.5.1-7 -- fix x86_64 problem - -* Wed Apr 16 2008 Balint Cristian - 1.5.1-6 -- disable fortify source, it crash gdal for now. - -* Fri Mar 28 2008 Balint Cristian - 1.5.1-5 -- really eanble against grass63 - -* Fri Mar 28 2008 Balint Cristian - 1.5.1-4 -- disable grass to bootstrap once again - -* Fri Mar 28 2008 Balint Cristian - 1.5.1-3 -- rebuild to really pick up grass63 in koji - -* Fri Mar 28 2008 Balint Cristian - 1.5.1-2 -- enable build against newer grass -- enable build of reference manuals - -* Tue Mar 25 2008 Balint Cristian - 1.5.1-1 -- new bugfix release from upstream -- drop large parts from gcc43 patch, some are upstream now -- fix building with perl-5.10 swig binding issue - -* Wed Feb 29 2008 Orion Poplawski - 1.5.0-4 -- Rebuild for hdf5-1.8.0, use compatability API define - -* Tue Feb 12 2008 Balint Cristian - 1.5.0-3 -- install cpl_config.h manually for bz#430894 -- fix gcc4.3 build - -* Mon Jan 14 2008 Balint Cristian - 1.5.0-2 -- fix perl dependency issue. - -* Mon Jan 07 2008 Balint Cristian - 1.5.0-1 -- update to new 1.5.0 upstream stable -- dropped build patch since HFA/ILI/DGN mandatories are now present -- dropped swig patch, its upstream now -- enable HFA it holds Intergraph (TM) explicit public license -- enable DGN it holds Avenza Systems (TM) explicit public license -- enable ILI headers since now contain proper public license message -- keep and polish up rest of doubted license -- further fixed hdf not supporting netcdf for for bz#189337 -- kill the annoying -Lexternal/lib for -lgeotiff -- fix configure to not export LDFLAGS anyomre, upstream - should really switch to real GNU automagic stuff -- pymod samples and rfc docs now gone -- hardcode external libtool to be used, LIBTOOL env not propagating anymore -- use DESTDIR instead - -* Thu Jan 03 2008 Alex Lancaster - 1.4.2-7 -- Re-enable grass support now that gdal has been bootstrapped - -* Wed Jan 02 2008 Mamoru Tasaka - 1.4.2-6 -- Bootstrap 1st: disabling grass support -- Workaround for hdf not supporting netcdf (bug 189337 c8) -- Disabling documents creation for now. - -* Thu Dec 06 2007 Release Engineering - 1.4.2-5 -- Rebuild for deps -- Disable grass to avoid circular deps - -* Tue Aug 28 2007 Fedora Release Engineering - 1.4.2-3 -- Rebuild for selinux ppc32 issue. - -* Wed Jul 24 2007 Balint Cristian 1.4.2-2 -- disable one more HFA test, HFA is unaviable due to license - -* Wed Jul 24 2007 Balint Cristian 1.4.2-1 -- new upstream one -- catch some more docs -- fix ogr python module runtime -- include testcases and run tests -- enable geotiff external library we have new libgeotiff now -- EPSG geodetic database is licensed OK since v6.13 so re-enable -- enable it against grass by default, implement optional switches - -* Tue Jun 05 2007 Balint Cristian 1.4.1-4 -- re-build. - -* Sat May 12 2007 Balint Cristian 1.4.1-3 -- re-build against grass. - -* Fri May 11 2007 Balint Cristian 1.4.1-2 -- fix python lookup paths for ppc64. - -* Wed May 09 2007 Balint Cristian 1.4.1-1 -- new upstream release. -- disable temporary grass-devel requirement untill find a - resonable solution for gdal-grass egg-chicken dep problem. - -* Fri Apr 20 2007 Balint Cristian 1.4.0-22 -- and olso dont attempt pack missing docs. - -* Fri Apr 20 2007 Balint Cristian 1.4.0-21 -- exclude some docs, doxygen segfault with those now upstream. - -* Fri Apr 20 2007 Balint Cristian 1.4.0-20 -- rebuild against latest fedora upstream tree. - -* Mon Apr 02 2007 Balint Cristian 1.4.0-19 -- own gdal includedir -- fix one more spurious lib path - -* Wed Mar 21 2007 Balint Cristian 1.4.0-18 -- remove system lib path from gdal-config --libs, its implicit - -* Tue Mar 20 2007 Balint Cristian 1.4.0-17 -- enable build against grass -- fix incorrect use of 32/64 library paths lookups - -* Fri Mar 16 2007 Balint Cristian 1.4.0-16 -- fix gdal flag from pkgconfig file - -* Thu Mar 15 2007 Balint Cristian 1.4.0-15 -- require pkgconfig -- generate pkgconfig from spec instead - -* Thu Mar 15 2007 Balint Cristian 1.4.0-14 -- require perl(ExtUtils::MakeMaker) instead ?dist checking -- add pkgconfig file - -* Wed Mar 14 2007 Balint Cristian 1.4.0-13 -- fix typo in specfile - -* Wed Mar 14 2007 Balint Cristian 1.4.0-12 -- add missing dot from dist string in specfile - -* Wed Mar 14 2007 Balint Cristian 1.4.0-11 -- fix fc6 fc5 builds - -* Thu Mar 1 2007 Balint Cristian 1.4.0-10 -- fix mock build -- require perl-devel - -* Tue Feb 27 2007 Balint Cristian 1.4.0-9 -- repack tarball for fedora, explain changes in PROVENANCE-fedora, - license should be clean now according to PROVENANCE-* files -- require ogdi since is available now -- drop nogeotiff patch, in -fedora tarball geotiff is removed -- man page triage over subpackages -- exclude python byte compiled objects -- fix some source C file exec bits - -* Sat Feb 24 2007 Balint Cristian 1.4.0-8 -- fix more things in spec -- include more docs - -* Wed Feb 21 2007 Balint Cristian 1.4.0-7 -- libtool in requirement list for build - -* Wed Feb 21 2007 Balint Cristian 1.4.0-6 -- use external libtool to avoid rpath usage -- include more docs - -* Mon Feb 12 2007 Balint Cristian 1.4.0-5 -- use rm -rf for removal of dirs. -- fix require lists - -* Mon Feb 12 2007 Balint Cristian 1.4.0-4 -- fix doxygen buildreq -- make sure r-path is fine. - -* Sat Feb 10 2007 Balint Cristian 1.4.0-3 -- disable now ogdi (pending ogdi submission). - -* Sat Feb 10 2007 Balint Cristian 1.4.0-2 -- more fixups for lib paths - -* Fri Feb 09 2007 Balint Cristian 1.4.0-1 -- first pack for fedora extras -- disable geotiff (untill license sorted out) -- enable all options aviable from extras -- pack perl and python modules -- kill r-path from libs -- pack all docs posible diff --git a/sources b/sources index 8cbf7d4..394b985 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -1cc5e615ee5bcf32f4f2999e9021042e gdal-1.9.2-fedora.tar.gz -0d1e425b45465f64f6d1f32790d8bea0 gdalautotest-1.9.0.tar.gz +e2a032cd2d1dc7650f783babef4bff6d gdal-1.11.0-fedora.tar.xz +75c91b2d218e02338762de741bd1dac2 gdalautotest-1.11.0.tar.gz From 63fb3e9ef91f7e40fb5808f651e6f2f3b29d224c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Devrim=20G=C3=BCnd=C3=BCz?= Date: Sun, 20 Jul 2014 15:24:32 +0300 Subject: [PATCH 03/15] Disable ppc builds as we did in EL 6. --- gdal.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdal.spec b/gdal.spec index 68e8e3c..2971d19 100644 --- a/gdal.spec +++ b/gdal.spec @@ -29,9 +29,9 @@ %global with_spatialite 1 %global spatialite "--with-spatialite" -# No ppc64 build for spatialite in EL6 +# No ppc64 build for spatialite in EL7 # https://bugzilla.redhat.com/show_bug.cgi?id=663938 -%if 0%{?rhel} == 6 +%if 0%{?rhel} == 7 %ifnarch ppc64 %global with_spatialite 0 %global spatialite "--without-spatialite" From ad9df8335e444dd90e345cd9f3b5ca7be939339e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Devrim=20G=C3=BCnd=C3=BCz?= Date: Sun, 20 Jul 2014 16:40:36 +0300 Subject: [PATCH 04/15] Exclude ppc64 arch --- gdal.spec | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/gdal.spec b/gdal.spec index 2971d19..b69f486 100644 --- a/gdal.spec +++ b/gdal.spec @@ -31,13 +31,7 @@ # No ppc64 build for spatialite in EL7 # https://bugzilla.redhat.com/show_bug.cgi?id=663938 -%if 0%{?rhel} == 7 -%ifnarch ppc64 -%global with_spatialite 0 -%global spatialite "--without-spatialite" -%endif -%endif - +ExcludeArch: ppc64 Name: gdal Version: 1.11.0 From 4ba13847f82a6b81ff30ac11e019c55df1470792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Devrim=20G=C3=BCnd=C3=BCz?= Date: Sun, 20 Jul 2014 16:53:28 +0300 Subject: [PATCH 05/15] Revert last patch. I misread the error message. --- gdal.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index b69f486..9a1ecb0 100644 --- a/gdal.spec +++ b/gdal.spec @@ -31,7 +31,13 @@ # No ppc64 build for spatialite in EL7 # https://bugzilla.redhat.com/show_bug.cgi?id=663938 -ExcludeArch: ppc64 +%if 0%{?rhel} == 7 +%ifnarch ppc64 +%global with_spatialite 0 +%global spatialite "--without-spatialite" +%endif +%endif + Name: gdal Version: 1.11.0 From 4e96b9425bfa7ac44be1d37eee615e82529618e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Thu, 2 Oct 2014 10:35:28 +0200 Subject: [PATCH 06/15] New release 1.11.1 - Add aarch64 to 64 bit architectures Conflicts: .gitignore gdal.spec --- .gitignore | 7 +++++++ gdal-cleaner.sh | 2 +- gdal.spec | 12 ++++++++---- sources | 4 ++-- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index a219059..fae421c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,10 @@ gdalautotest-1.7.0.tar.gz /gdalautotest-1.9.0.tar.gz /gdal-1.9.1-fedora.tar.gz /gdal-1.9.2-fedora.tar.gz +/gdal-1.10.0-fedora.tar.gz +/gdal-1.10.1-fedora.tar.xz +/gdalautotest-1.10.1.tar.gz +/gdal-1.11.0-fedora.tar.xz +/gdalautotest-1.11.0.tar.gz +/gdal-1.11.1-fedora.tar.xz +/gdalautotest-1.11.1.tar.gz diff --git a/gdal-cleaner.sh b/gdal-cleaner.sh index bfba377..1c65842 100755 --- a/gdal-cleaner.sh +++ b/gdal-cleaner.sh @@ -1,6 +1,6 @@ #!/bin/bash # Volker Fröhlich -VERSION="1.11.0" +VERSION="1.11.1" tar xvf gdal-"${VERSION}".tar.xz diff --git a/gdal.spec b/gdal.spec index 9a1ecb0..3985e1c 100644 --- a/gdal.spec +++ b/gdal.spec @@ -23,7 +23,7 @@ # Tests can be of a different version -%global testversion 1.11.0 +%global testversion 1.11.1 %global run_tests 1 %global with_spatialite 1 @@ -40,8 +40,8 @@ Name: gdal -Version: 1.11.0 -Release: 2%{?dist} +Version: 1.11.1 +Release: 1%{?dist} Summary: GIS file format library Group: System Environment/Libraries License: MIT @@ -50,7 +50,7 @@ URL: http://www.gdal.org # See PROVENANCE.TXT-fedora and the cleaner script for details! Source0: %{name}-%{version}-fedora.tar.xz -Source1: http://download.osgeo.org/%{name}/%{name}autotest-%{testversion}.tar.gz +Source1: http://download.osgeo.org/%{name}/%{testversion}/%{name}autotest-%{testversion}.tar.gz Source2: %{name}.pom # Cleaner script for the tarball @@ -763,6 +763,10 @@ popd #Or as before, using ldconfig %changelog +* Tue Nov 18 2014 Volker Fröhlich - 1.11.1-1 +- New release +- Correct test suite source URL + * Sat Jun 07 2014 Fedora Release Engineering - 1.11.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 394b985..b2f39aa 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -e2a032cd2d1dc7650f783babef4bff6d gdal-1.11.0-fedora.tar.xz -75c91b2d218e02338762de741bd1dac2 gdalautotest-1.11.0.tar.gz +f8cba353a17576ec93770ef286d2220d gdal-1.11.1-fedora.tar.xz +9a3f691157013f8707984b4870d37a7a gdalautotest-1.11.1.tar.gz From 1494bd2e4afffa16e3529e9b9df57c3939311288 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Fri, 14 Nov 2014 12:19:15 +0100 Subject: [PATCH 07/15] New version 1.11.2, rebuild for g2clib, support ppc64le - New release 1.11.2 - Update gdal-config for ppc64le - Don't try to install perllocal.pod (bz 1161231). --- .gitignore | 2 ++ gdal-cleaner.sh | 2 +- gdal.spec | 12 +++++++++--- sources | 4 ++-- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index fae421c..7846640 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ gdalautotest-1.7.0.tar.gz /gdalautotest-1.11.0.tar.gz /gdal-1.11.1-fedora.tar.xz /gdalautotest-1.11.1.tar.gz +/gdalautotest-1.11.2.tar.gz +/gdal-1.11.2-fedora.tar.xz diff --git a/gdal-cleaner.sh b/gdal-cleaner.sh index 1c65842..41cbba5 100755 --- a/gdal-cleaner.sh +++ b/gdal-cleaner.sh @@ -1,6 +1,6 @@ #!/bin/bash # Volker Fröhlich -VERSION="1.11.1" +VERSION="1.11.2" tar xvf gdal-"${VERSION}".tar.xz diff --git a/gdal.spec b/gdal.spec index 3985e1c..5206a89 100644 --- a/gdal.spec +++ b/gdal.spec @@ -23,7 +23,7 @@ # Tests can be of a different version -%global testversion 1.11.1 +%global testversion 1.11.2 %global run_tests 1 %global with_spatialite 1 @@ -40,7 +40,7 @@ Name: gdal -Version: 1.11.1 +Version: 1.11.2 Release: 1%{?dist} Summary: GIS file format library Group: System Environment/Libraries @@ -493,6 +493,7 @@ mkdir -p %{buildroot}%{_libdir}/%{name}plugins #TODO: Don't do that? find %{buildroot}%{perl_vendorarch} -name "*.dox" -exec rm -rf '{}' \; +rm -f %{buildroot}%{perl_archlib}/perllocal.pod # Correct permissions #TODO and potential ticket: Why are the permissions not correct? @@ -607,7 +608,7 @@ cat > %{buildroot}%{_bindir}/%{name}-config < - 1.11.2-1 +- New release +- Update gdal-config for aarch64 and ppc64le +- Don't try to install perllocal.pod (bz 1161231) + * Tue Nov 18 2014 Volker Fröhlich - 1.11.1-1 - New release - Correct test suite source URL diff --git a/sources b/sources index b2f39aa..e0be54a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -f8cba353a17576ec93770ef286d2220d gdal-1.11.1-fedora.tar.xz -9a3f691157013f8707984b4870d37a7a gdalautotest-1.11.1.tar.gz +f639373d0709858d41997c708ca80c52 gdal-1.11.2-fedora.tar.xz +3d4cb6361005312dc86016b0b7eb57a4 gdalautotest-1.11.2.tar.gz From 9ce729dcc193e192e78160df3989e16465c6ca47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Tue, 7 Jul 2015 01:20:20 +0200 Subject: [PATCH 08/15] Add missing ticket references in changelog --- gdal.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdal.spec b/gdal.spec index 5206a89..53a13b2 100644 --- a/gdal.spec +++ b/gdal.spec @@ -766,8 +766,8 @@ popd %changelog * Tue Jul 7 2015 Volker Fröhlich - 1.11.2-1 - New release -- Update gdal-config for aarch64 and ppc64le -- Don't try to install perllocal.pod (bz 1161231) +- Rebuild for g2clib (bz 1203582) +- Update gdal-config for aarch64 and ppc64le (bz 1227642) * Tue Nov 18 2014 Volker Fröhlich - 1.11.1-1 - New release From dc15bccfda60e97957e42c4968df17447e65ee2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Thu, 10 Dec 2015 10:55:58 +0100 Subject: [PATCH 09/15] - workaround libtool bug in RHEL 7.2 (rhbz#1287191) --- gdal.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index 53a13b2..6e0d2ba 100644 --- a/gdal.spec +++ b/gdal.spec @@ -41,7 +41,7 @@ Name: gdal Version: 1.11.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GIS file format library Group: System Environment/Libraries License: MIT @@ -309,7 +309,10 @@ sed -i '/^swig-modules:/s/lib-target/apps-target/' GNUmakefile sed -i 's|if test -z "`${CXX} testarmadillo.cpp -o testarmadillo -larmadillo 2>&1`"|if true|' configure # Replace hard-coded library- and include paths +%ifnarch aarch64 ppc64le +# workaround libtool bug in RHEL 7.2 (rhbz#1287191) sed -i 's|@LIBTOOL@|%{_bindir}/libtool|g' GDALmake.opt.in +%endif sed -i 's|-L\$with_cfitsio -L\$with_cfitsio/lib -lcfitsio|-lcfitsio|g' configure sed -i 's|-I\$with_cfitsio -I\$with_cfitsio/include|-I\$with_cfitsio/include/cfitsio|g' configure sed -i 's|-L\$with_netcdf -L\$with_netcdf/lib -lnetcdf|-lnetcdf|g' configure @@ -764,6 +767,9 @@ popd #Or as before, using ldconfig %changelog +* Thu Dec 10 2015 Dan Horák - 1.11.2-2 +- workaround libtool bug in RHEL 7.2 (rhbz#1287191) + * Tue Jul 7 2015 Volker Fröhlich - 1.11.2-1 - New release - Rebuild for g2clib (bz 1203582) From 2d060277c5c21777f04f1d90e2e80af634d2d40c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Tue, 20 Oct 2015 00:38:57 +0200 Subject: [PATCH 10/15] New release 1.11.3, utilities and openjpeg2 Solve BZ #1271906 (Build iso8211 and s57 utilities) Support openjpeg2 --- .gitignore | 2 ++ gdal-2.0.1-iso8211-include.patch | 11 +++++++++ gdal-cleaner.sh | 2 +- gdal.spec | 38 ++++++++++++++++++++++++++------ sources | 4 ++-- 5 files changed, 47 insertions(+), 10 deletions(-) create mode 100644 gdal-2.0.1-iso8211-include.patch diff --git a/.gitignore b/.gitignore index 7846640..811c953 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ gdalautotest-1.7.0.tar.gz /gdalautotest-1.11.1.tar.gz /gdalautotest-1.11.2.tar.gz /gdal-1.11.2-fedora.tar.xz +/gdalautotest-1.11.3.tar.gz +/gdal-1.11.3-fedora.tar.xz diff --git a/gdal-2.0.1-iso8211-include.patch b/gdal-2.0.1-iso8211-include.patch new file mode 100644 index 0000000..6cd5e81 --- /dev/null +++ b/gdal-2.0.1-iso8211-include.patch @@ -0,0 +1,11 @@ +diff -Nur gdal-2.0.1-fedora/frmts/iso8211/8211createfromxml.cpp gdal-2.0.1-fedora-iso8211/frmts/iso8211/8211createfromxml.cpp +--- gdal-2.0.1-fedora/frmts/iso8211/8211createfromxml.cpp 2015-09-15 16:06:51.000000000 +0200 ++++ gdal-2.0.1-fedora-iso8211/frmts/iso8211/8211createfromxml.cpp 2015-10-18 03:04:21.812446373 +0200 +@@ -28,6 +28,7 @@ + ****************************************************************************/ + + #include "cpl_minixml.h" ++#include "cpl_conv.h" + #include "iso8211.h" + #include + #include diff --git a/gdal-cleaner.sh b/gdal-cleaner.sh index 41cbba5..29abe4b 100755 --- a/gdal-cleaner.sh +++ b/gdal-cleaner.sh @@ -1,6 +1,6 @@ #!/bin/bash # Volker Fröhlich -VERSION="1.11.2" +VERSION="1.11.3" tar xvf gdal-"${VERSION}".tar.xz diff --git a/gdal.spec b/gdal.spec index 6e0d2ba..798d7ec 100644 --- a/gdal.spec +++ b/gdal.spec @@ -18,12 +18,11 @@ # Sadly noarch doesn't work in EL 5, see # http://fedoraproject.org/wiki/EPEL/GuidelinesAndPolicies -#TODO: EvenR suggested to drop Ruby bindings, as they are unmaintained # He also suggest to use --with-static-proj4 to actually link to proj, instead of dlopen()ing it. # Tests can be of a different version -%global testversion 1.11.2 +%global testversion 1.11.3 %global run_tests 1 %global with_spatialite 1 @@ -40,13 +39,13 @@ Name: gdal -Version: 1.11.2 -Release: 2%{?dist} +Version: 1.11.3 +Release: 1%{?dist} Summary: GIS file format library Group: System Environment/Libraries License: MIT URL: http://www.gdal.org -# Source0: http://download.osgeo.org/gdal/gdal-%%{version}.tar.gz +# Source0: http://download.osgeo.org/gdal/%%{version}/gdal-%%{version}.tar.xz # See PROVENANCE.TXT-fedora and the cleaner script for details! Source0: %{name}-%{version}-fedora.tar.xz @@ -63,6 +62,9 @@ Patch1: %{name}-g2clib.patch # Patch for Fedora JNI library location Patch2: %{name}-jni.patch +# https://trac.osgeo.org/gdal/ticket/6159#ticket +Patch3: %{name}-2.0.1-iso8211-include.patch + # Fedora uses Alternatives for Java Patch8: %{name}-1.9.0-java.patch @@ -113,6 +115,7 @@ BuildRequires: mysql-devel BuildRequires: numpy BuildRequires: pcre-devel BuildRequires: ogdi-devel +BuildRequires: openjpeg2-devel BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: pkgconfig BuildRequires: poppler-devel @@ -265,6 +268,7 @@ rm -r frmts/grib/degrib18/g2clib-1.0.4 %patch1 -p1 -b .g2clib~ %patch2 -p1 -b .jni~ +%patch3 -p1 -b .iso8211~ %patch8 -p1 -b .java~ # Copy in PROVENANCE.TXT-fedora @@ -375,7 +379,6 @@ export CPPFLAGS="$CPPFLAGS -I%{_includedir}/libgeotiff" # For future reference: # epsilon: Stalled review -- https://bugzilla.redhat.com/show_bug.cgi?id=660024 -# openjpeg 2.0 necessary, 1.4 is in Fedora # Building without pgeo driver, because it drags in Java %configure \ @@ -410,7 +413,7 @@ export CPPFLAGS="$CPPFLAGS -I%{_includedir}/libgeotiff" --with-odbc \ --with-ogdi \ --without-msg \ - --without-openjpeg \ + --with-openjpeg \ --with-pcraster \ --with-pg \ --with-png \ @@ -437,6 +440,15 @@ pushd swig/perl echo > Makefile.PL; popd +# Build some utilities, as requested in BZ #1271906 +pushd ogr/ogrsf_frmts/s57/ + make all +popd + +pushd frmts/iso8211/ + make all +popd + # Install the Perl modules in the right place sed -i 's|INSTALLDIRS = site|INSTALLDIRS = vendor|' swig/perl/Makefile_* @@ -491,6 +503,11 @@ make DESTDIR=%{buildroot} \ install \ install-man +install -pm 755 ogr/ogrsf_frmts/s57/s57dump %{buildroot}%{_bindir} +install -pm 755 frmts/iso8211/8211createfromxml %{buildroot}%{_bindir} +install -pm 755 frmts/iso8211/8211dump %{buildroot}%{_bindir} +install -pm 755 frmts/iso8211/8211view %{buildroot}%{_bindir} + # Directory for auto-loading plugins mkdir -p %{buildroot}%{_libdir}/%{name}plugins @@ -698,6 +715,8 @@ popd %{_bindir}/gdaltransform %{_bindir}/nearblack %{_bindir}/ogr* +%{_bindir}/8211* +%{_bindir}/s57* %{_bindir}/testepsg %{_mandir}/man1/gdal*.1* %exclude %{_mandir}/man1/gdal-config.1* @@ -767,6 +786,11 @@ popd #Or as before, using ldconfig %changelog +* Thu Feb 04 2016 Volker Froehlich - 1.11.3-1 +- New release +- Solve BZ #1271906 (Build iso8211 and s57 utilities) +- Support openjpeg2 + * Thu Dec 10 2015 Dan Horák - 1.11.2-2 - workaround libtool bug in RHEL 7.2 (rhbz#1287191) diff --git a/sources b/sources index e0be54a..69e5b8b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -f639373d0709858d41997c708ca80c52 gdal-1.11.2-fedora.tar.xz -3d4cb6361005312dc86016b0b7eb57a4 gdalautotest-1.11.2.tar.gz +2b6ba83e78a3ce5ffbed8f14ddd0029a gdalautotest-1.11.3.tar.gz +b07d7f7d1c0032fb8207df477644534a gdal-1.11.3-fedora.tar.xz From 5b23fa3c02687c111495d91637511a76193e673f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Sun, 14 Feb 2016 02:00:34 +0100 Subject: [PATCH 11/15] New version 1.11.4 --- .gitignore | 2 ++ gdal-cleaner.sh | 2 +- gdal.spec | 8 ++++++-- sources | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 811c953..a43a288 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,5 @@ gdalautotest-1.7.0.tar.gz /gdal-1.11.2-fedora.tar.xz /gdalautotest-1.11.3.tar.gz /gdal-1.11.3-fedora.tar.xz +/gdalautotest-1.11.4.tar.gz +/gdal-1.11.4-fedora.tar.xz diff --git a/gdal-cleaner.sh b/gdal-cleaner.sh index 29abe4b..4f94bda 100755 --- a/gdal-cleaner.sh +++ b/gdal-cleaner.sh @@ -1,6 +1,6 @@ #!/bin/bash # Volker Fröhlich -VERSION="1.11.3" +VERSION="1.11.4" tar xvf gdal-"${VERSION}".tar.xz diff --git a/gdal.spec b/gdal.spec index 798d7ec..afc22d9 100644 --- a/gdal.spec +++ b/gdal.spec @@ -22,7 +22,7 @@ # Tests can be of a different version -%global testversion 1.11.3 +%global testversion 1.11.4 %global run_tests 1 %global with_spatialite 1 @@ -39,7 +39,7 @@ Name: gdal -Version: 1.11.3 +Version: 1.11.4 Release: 1%{?dist} Summary: GIS file format library Group: System Environment/Libraries @@ -658,6 +658,7 @@ for f in 'GDAL*' BandProperty ColorAssociation CutlineTransformer DatasetPropert done #TODO: What's that? rm -f %{buildroot}%{_mandir}/man1/*_%{name}-%{version}-fedora_apps_* +rm -f %{buildroot}%{_mandir}/man1/_home_rouault_dist_wrk_gdal_apps_.1* %check %if %{run_tests} @@ -786,6 +787,9 @@ popd #Or as before, using ldconfig %changelog +* Sun Feb 14 2016 Volker Froehlich - 1.11.4-1 +- New release + * Thu Feb 04 2016 Volker Froehlich - 1.11.3-1 - New release - Solve BZ #1271906 (Build iso8211 and s57 utilities) diff --git a/sources b/sources index 69e5b8b..f1c6d1f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -2b6ba83e78a3ce5ffbed8f14ddd0029a gdalautotest-1.11.3.tar.gz -b07d7f7d1c0032fb8207df477644534a gdal-1.11.3-fedora.tar.xz +8b63eaff1df4d8ccd1a17b497b189282 gdalautotest-1.11.4.tar.gz +4003b0a4c6c3eb603cd63e61fb9416e2 gdal-1.11.4-fedora.tar.xz From 96965a2f907b2f33a1dd8b0a67b2a42221a5d4a8 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Mon, 11 Dec 2017 18:51:02 -0500 Subject: [PATCH 12/15] rebuild for armadillo --- gdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index afc22d9..96da28d 100644 --- a/gdal.spec +++ b/gdal.spec @@ -40,7 +40,7 @@ Name: gdal Version: 1.11.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GIS file format library Group: System Environment/Libraries License: MIT @@ -787,6 +787,9 @@ popd #Or as before, using ldconfig %changelog +* Mon Dec 11 2017 Mukundan Ragavan - 1.11.4-2 +- rebuild for armadillo + * Sun Feb 14 2016 Volker Froehlich - 1.11.4-1 - New release From 22f0e2bcc35fdb106c3f4d1485647e10486c3520 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 21 Dec 2017 09:13:37 -0700 Subject: [PATCH 13/15] Rebuild again for new armadillo --- gdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index 96da28d..8a60a92 100644 --- a/gdal.spec +++ b/gdal.spec @@ -40,7 +40,7 @@ Name: gdal Version: 1.11.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GIS file format library Group: System Environment/Libraries License: MIT @@ -787,6 +787,9 @@ popd #Or as before, using ldconfig %changelog +* Thu Dec 21 2017 Orion Poplawski - 1.11.4-3 +- Rebuild again for new armadillo + * Mon Dec 11 2017 Mukundan Ragavan - 1.11.4-2 - rebuild for armadillo From 18ab04919a43ced94100660f556b3f057cef4a90 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 1 Jun 2022 12:20:29 +0200 Subject: [PATCH 14/15] Rebuild (armadillo) --- gdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gdal.spec b/gdal.spec index 8a60a92..f0a2dc0 100644 --- a/gdal.spec +++ b/gdal.spec @@ -40,7 +40,7 @@ Name: gdal Version: 1.11.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GIS file format library Group: System Environment/Libraries License: MIT @@ -787,6 +787,9 @@ popd #Or as before, using ldconfig %changelog +* Wed Jun 01 2022 Sandro Mani +- Rebuild (armadillo) + * Thu Dec 21 2017 Orion Poplawski - 1.11.4-3 - Rebuild again for new armadillo From 681a48aa9ffff6a05f6842784f790a108f045c5e Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 1 Jun 2022 12:24:44 +0200 Subject: [PATCH 15/15] Use versioned python macros --- gdal.spec | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gdal.spec b/gdal.spec index f0a2dc0..1e37b98 100644 --- a/gdal.spec +++ b/gdal.spec @@ -157,8 +157,8 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} %endif %if ! (0%{?fedora} || 0%{?rhel} > 5) -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %endif #TODO: Description on the lib? @@ -248,7 +248,7 @@ BuildArch: noarch This package contains HTML and PDF documentation for GDAL. # We don't want to provide private Python extension libs -%global __provides_exclude_from ^%{python_sitearch}/.*\.so$ +%global __provides_exclude_from ^%{python2_sitearch}/.*\.so$ %prep %setup -q -n %{name}-%{version}-fedora @@ -669,7 +669,7 @@ done pushd %{name}autotest-%{testversion} # Export test enviroment - export PYTHONPATH=$PYTHONPATH:%{buildroot}%{python_sitearch} + export PYTHONPATH=$PYTHONPATH:%{buildroot}%{python2_sitearch} #TODO: Nötig? export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{buildroot}%{_libdir} # export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{buildroot}%{_libdir}:$java_inc @@ -769,11 +769,11 @@ popd %{_mandir}/man1/gdal_merge.1* %{_mandir}/man1/gdal_retile.1* %{_mandir}/man1/gdal_sieve.1* -%{python_sitearch}/osgeo -%{python_sitearch}/GDAL-%{version}-py*.egg-info -%{python_sitearch}/osr.py* -%{python_sitearch}/ogr.py* -%{python_sitearch}/gdal*.py* +%{python2_sitearch}/osgeo +%{python2_sitearch}/GDAL-%{version}-py*.egg-info +%{python2_sitearch}/osr.py* +%{python2_sitearch}/ogr.py* +%{python2_sitearch}/gdal*.py* %files doc %doc gdal_frmts ogrsf_frmts refman @@ -787,7 +787,7 @@ popd #Or as before, using ldconfig %changelog -* Wed Jun 01 2022 Sandro Mani +* Wed Jun 01 2022 Sandro Mani - 1.11.4-4 - Rebuild (armadillo) * Thu Dec 21 2017 Orion Poplawski - 1.11.4-3