Skip to content

Commit

Permalink
Update PostgreSQL, PostGIS and their dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
andyone committed Sep 30, 2023
1 parent f4e2c25 commit fd45687
Show file tree
Hide file tree
Showing 60 changed files with 935 additions and 983 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ Security is our first priority. We can't keep an outdated package in our reposit

| EL version | Updates | Repository removal |
|------------|-------------|--------------------|
| `7.x` | 1 Sep 2023 | 31 Dec 2023 |
| `8.x` | 1 Sep 2024 | 31 Dec 2024 |
| `7.x` | 1 Jun 2024 | 31 Dec 2024 |
| `8.x` | 1 Jun 2025 | 31 Dec 2025 |
| `9.x` | 1 Sep 2026 | 31 Dec 2026 |

### [_perfecto_](https://kaos.sh/perfecto) and [bibop](https://kaos.sh/bibop) check status
Expand Down
6 changes: 5 additions & 1 deletion specs/gdal/gdal3.spec
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

################################################################################

%global sqlite_min_ver %(rpm -q --quiet sqlite-devel && rpm -q --qf '%{VERSION}' sqlite-devel || echo "3")
%global libcurl_min_ver %(rpm -q --quiet libcurl-devel && rpm -q --qf '%{VERSION}' libcurl-devel || echo "7")

################################################################################
Expand Down Expand Up @@ -46,12 +47,15 @@ BuildRequires: cmake swig
BuildRequires: gcc-c++ bison expat-devel freexl-devel geos-devel hdf-devel
BuildRequires: hdf5-devel libgeotiff-devel libjpeg-devel libpng-devel
BuildRequires: libtiff-devel libzstd-devel libwebp-devel netcdf-devel
BuildRequires: openexr-devel openjpeg2-devel proj-devel sqlite-devel
BuildRequires: openexr-devel openjpeg2-devel proj-devel
BuildRequires: xerces-c-devel xz-devel zlib-devel giflib-devel
BuildRequires: postgresql%{pg_short_ver}-devel

BuildRequires: sqlite-devel >= %{sqlite_min_ver}
BuildRequires: libcurl-devel >= %{libcurl_min_ver}

Requires: libcurl >= %{libcurl_min_ver}
Requires: sqlite-libs >= %{sqlite_min_ver}

Provides: %{name} = %{version}-%{release}

Expand Down
11 changes: 6 additions & 5 deletions specs/geos.spec
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,10 @@ functions such as IsValid()
################################################################################

%package devel
Summary: Development files for GEOS
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Summary: Development files for GEOS
Group: Development/Libraries

Requires: %{name} = %{version}-%{release}

%description devel
GEOS (Geometry Engine - Open Source) is a C++ port of the Java Topology
Expand Down Expand Up @@ -86,10 +87,10 @@ popd
%endif

%post
/sbin/ldconfig
%{_sbindir}/ldconfig

%postun
/sbin/ldconfig
%{_sbindir}/ldconfig

%clean
rm -rf %{buildroot}
Expand Down
11 changes: 0 additions & 11 deletions specs/hdf/SOURCES/hdf-4.2.5-maxavailfiles.patch

This file was deleted.

12 changes: 12 additions & 0 deletions specs/hdf/SOURCES/hdf-maxavailfiles.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --color -urN hdf-4.2.16-orig/mfhdf/libsrc/file.c hdf-4.2.16/mfhdf/libsrc/file.c
--- hdf-4.2.16-orig/mfhdf/libsrc/file.c 2023-02-03 17:03:59.000000000 +0300
+++ hdf-4.2.16/mfhdf/libsrc/file.c 2023-09-27 14:50:05.000000000 +0300
@@ -51,7 +51,7 @@

#define H4_MAX_AVAIL_OPENFILES 20000
#define MAX_AVAIL_OPENFILES \
- (((MAX_SYS_OPENFILES - 3) > H4_MAX_AVAIL_OPENFILES) ? H4_MAX_AVAIL_OPENFILES : (MAX_SYS_OPENFILES - 3))
+ (((MAX_SYS_OPENFILES - 10) > H4_MAX_AVAIL_OPENFILES) ? H4_MAX_AVAIL_OPENFILES : (MAX_SYS_OPENFILES - 10))

static int _curr_opened = 0; /* the number of files currently opened */
/* NOTE: _ncdf might have been the number of files currently opened, yet it
139 changes: 106 additions & 33 deletions specs/hdf/hdf.spec
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,26 @@

################################################################################

Summary: A general purpose library and file format for storing scientific data
Name: hdf
Version: 4.2.14
Release: 0%{?dist}
License: BSD
Group: System Environment/Libraries
URL: https://hdfgroup.org/products/hdf4/index.html
Summary: A general purpose library and file format for storing scientific data
Name: hdf
Version: 4.2.16
Release: 0%{?dist}
License: BSD
Group: System Environment/Libraries
URL: https://portal.hdfgroup.org/display/HDF4/HDF4

Source0: https://support.hdfgroup.org/ftp/HDF/releases/HDF%{version}/src/%{name}-%{version}.tar.bz2
Source0: https://support.hdfgroup.org/ftp/HDF/releases/HDF%{version}/src/%{name}-%{version}.tar.bz2

Source100: checksum.sha512
Source100: checksum.sha512

Patch0: %{name}-4.2.5-maxavailfiles.patch
Patch0: %{name}-maxavailfiles.patch

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: make gcc gcc-c++ gcc-gfortran automake libtool
BuildRequires: flex byacc libjpeg-devel zlib-devel
BuildRequires: make gcc gcc-c++ gcc-gfortran automake libtool chrpath
BuildRequires: flex byacc libjpeg-turbo-devel zlib-devel libtirpc-devel

Provides: %{name} = %{version}-%{release}
Provides: %{name} = %{version}-%{release}

################################################################################

Expand All @@ -43,16 +43,36 @@ grids. You can also mix and match them in HDF files according to your needs.
################################################################################

%package devel
Summary: HDF development files
Group: Development/Libraries
Summary: HDF4 development files
Group: Development/Libraries

Requires: %{name} = %{version}-%{release}
Requires: libjpeg-devel zlib-devel
Requires: %{name} = %{version}-%{release}
Requires: libjpeg-turbo-devel zlib-devel

Provides: %{name}-static = %{version}-%{release}
Provides: %{name}-static = %{version}-%{release}

%description devel
HDF development headers and libraries.
HDF4 development headers and libraries.

################################################################################

%package libs
Summary: HDF4 shared libraries
Group: Development/Libraries

%description libs
HDF4 shared libraries.

################################################################################

%package static
Summary: HDF4 static libraries
Group: Development/Libraries

Requires: %{name}-devel = %{version}-%{release}

%description static
HDF4 static libraries.

################################################################################

Expand All @@ -68,15 +88,33 @@ chmod a-x *hdf/*/*.c hdf/*/*.h
%build
rm config/*linux-gnu

export CFLAGS="%{optflags} -fPIC"
export FFLAGS="%{optflags} -fPIC -ffixed-line-length-none"
export CFLAGS="%{optflags} -I%{_includedir}/tirpc"
export CPPFLAGS="%{optflags} -fPIC"
export LIBS="-ltirpc"

mkdir build-static
pushd build-static
ln -s ../configure .
%configure --disable-production \
--disable-netcdf \
--enable-shared=no \
--enable-static=yes \
--includedir=%{_includedir}/%{name}

%configure --disable-production \
--disable-netcdf \
--includedir=%{_includedir}/%{name} \
--libdir=%{_libdir}/%{name}
%{__make} %{?_smp_mflags}
popd

mkdir build-shared
pushd build-shared
ln -s ../configure .
%configure --disable-production \
--disable-netcdf \
--enable-shared=yes \
--enable-static=no \
--includedir=%{_includedir}/%{name}

%{__make} %{?_smp_mflags}
%{__make} %{?_smp_mflags}
popd

touch -c -r hdf/src/hdf.inc hdf/src/hdf.f90
touch -c -r hdf/src/dffunc.inc hdf/src/dffunc.f90
Expand All @@ -85,15 +123,22 @@ touch -c -r mfhdf/fortran/mffunc.inc mfhdf/fortran/mffunc.f90
%install
rm -rf %{buildroot}

%{make_install} INSTALL='install -p'
%make_install -C build-static
%make_install -C build-shared

rm -f %{buildroot}%{_libdir}/*.la

chrpath --delete \
--keepgoing \
%{buildroot}%{_bindir}/* \
%{buildroot}%{_libdir}/%{name}/*.so.* \
%{buildroot}%{_libdir}/*.so.* || :

for file in ncdump ncgen ; do
mv %{buildroot}%{_bindir}/$file %{buildroot}%{_bindir}/h$file
rm %{buildroot}%{_mandir}/man1/${file}.1
done

touch -c -r README.txt %{buildroot}%{_includedir}/%{name}/h4config.h

# Remove an autoconf conditional from the API that is unused and cause
# the API to be different on x86 and x86_64
pushd %{buildroot}%{_includedir}/hdf
Expand All @@ -109,30 +154,58 @@ mv %{buildroot}%{_datadir}/hdf4_examples \

%check
%if %{?_with_check:1}%{?_without_check:0}
%{__make} check
%{__make} -C build-shared check
%{__make} -C build-static check
%endif

%clean
rm -rf %{buildroot}

%post
%{_sbindir}/ldconfig

%postun
%{_sbindir}/ldconfig

%post libs
%{_sbindir}/ldconfig

%postun libs
%{_sbindir}/ldconfig

################################################################################

%files
%defattr(-,root,root,-)
%doc COPYING MANIFEST README.txt release_notes/*.txt
%doc COPYING README.md release_notes/*.txt
%exclude %{_defaultdocdir}/%{name}/examples
%{_bindir}/*
%exclude %{_bindir}/h4?c*
%{_libdir}/*.so.0*
%{_mandir}/man1/*.gz

%files devel
%defattr(-,root,root,-)
%{_bindir}/h4?c*
%{_includedir}/%{name}/
%{_libdir}/%{name}/
%{_libdir}/*.so
%{_libdir}/*.settings
%{_defaultdocdir}/%{name}/examples

%files libs
%defattr(-,root,root,-)
%{_libdir}/*.so.0*

%files static
%defattr(-,root,root,-)
%{_libdir}/*.a

################################################################################

%changelog
* Wed Sep 27 2023 Anton Novojilov <[email protected]> - 4.2.16-0
- https://support.hdfgroup.org/ftp/HDF/releases/HDF4.2.16/src/hdf-4.2.16-RELEASE.txt

* Sat Dec 14 2019 Anton Novojilov <[email protected]> - 4.2.14-0
- Updated to latest stable release

Expand Down
Loading

0 comments on commit fd45687

Please sign in to comment.