From 05f0231670db7af015678b591c24b3cce984bf0c Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Tue, 13 Feb 2018 16:24:19 +0100 Subject: [PATCH] Revert "Rebuild (giflib)" This reverts commit d2377e3126c0f99d553695fbc12c9c20eb77d178. The reason is that there's less invasive method quite some time proposed in PR#5. --- gdal-tirpc.patch | 12 ------------ gdal.spec | 15 +-------------- 2 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 gdal-tirpc.patch diff --git a/gdal-tirpc.patch b/gdal-tirpc.patch deleted file mode 100644 index 7284dd5..0000000 --- a/gdal-tirpc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN gdal-2.2.3-fedora/configure.ac gdal-2.2.3-fedora-new/configure.ac ---- gdal-2.2.3-fedora/configure.ac 2017-11-20 11:45:32.000000000 +0100 -+++ gdal-2.2.3-fedora-new/configure.ac 2018-02-13 09:44:58.214951534 +0100 -@@ -2089,6 +2089,8 @@ dnl Fedora has hdf static libraries in / - if test "$HDF_LIB_DIR" != "" ; then - LIBS="-L$HDF_LIB_DIR $LIBS" - fi -+ EXTRA_INCLUDES="-I/usr/include/tirpc/ $EXTRA_INCLUDES" -+ LIBS="-ltirpc $LIBS" - - dnl Debian supplies the HDF4 library which does not conflict with NetCDF. - dnl Test for Debian flavor first. Hint: install the libhdf4-alt-dev package. diff --git a/gdal.spec b/gdal.spec index 1476a10..a06d1a4 100644 --- a/gdal.spec +++ b/gdal.spec @@ -62,7 +62,7 @@ Name: gdal Version: 2.2.3 -Release: 8%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap} +Release: 7%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap} Summary: GIS file format library Group: System Environment/Libraries License: MIT @@ -97,12 +97,8 @@ Patch9: %{name}-2.2.2-zlib.patch Patch10: %{name}-2.2.3_json-c_013.patch -# Add tirpc include dir and libs for hdf4, needed since https://fedoraproject.org/wiki/Changes/SunRPCRemoval -Patch11: gdal-tirpc.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: automake autoconf libtool BuildRequires: ant # No armadillo in EL5 BuildRequires: armadillo-devel @@ -122,7 +118,6 @@ BuildRequires: geos-devel BuildRequires: ghostscript BuildRequires: hdf-devel BuildRequires: hdf-static -BuildRequires: libtirpc-devel BuildRequires: hdf5-devel BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jasper-devel @@ -340,10 +335,6 @@ rm -r frmts/grib/degrib18/g2clib-1.0.4 %patch8 -p1 -b .java~ %patch9 -p1 -b .zlib~ %patch10 -p1 -b .json-c_013~ -%patch11 -p1 -b .tirpc~ - -# Needed for Patch11 -autoreconf -ifv # Copy in PROVENANCE.TXT-fedora cp -p %SOURCE4 . @@ -891,10 +882,6 @@ popd #Or as before, using ldconfig %changelog -* Tue Feb 13 2018 Sandro Mani - 2.2.3-8 -- Rebuild (giflib) -- Add patch to adapt for https://fedoraproject.org/wiki/Changes/SunRPCRemoval - * Wed Feb 07 2018 Fedora Release Engineering - 2.2.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild