Skip to content

Commit 5502879

Browse files
alaniwialaniwi
committed
UPDATE (local builds): mc, saga, tkdiff. ADD (from std repos): bison, rclone, tesseract, wgrib2
1 parent c58268a commit 5502879

File tree

5 files changed

+36
-17
lines changed

5 files changed

+36
-17
lines changed

‎rpmbuild/SPECS/jasmin-sci.spec‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
Summary: Package that installs %scl
55
Name: %scl_name
6-
Version: 2.5
6+
Version: 2.6
77
Release: 1%{?dist}
88
BuildArch: noarch
99
License: GPLv2+
@@ -17,6 +17,7 @@ Requires: %{scl_prefix}runtime == %{version}-%{release}
1717

1818
Requires: atlas
1919
Requires: atlas-devel
20+
Requires: bison
2021
Requires: ddd
2122
Requires: emacs
2223
Requires: gcc-gfortran
@@ -42,6 +43,8 @@ Requires: libRmath-devel
4243
Requires: libXaw-devel
4344
Requires: libcurl-devel
4445
Requires: libuuid-devel
46+
# mc is the "midnight commander" and is distinct from minio client
47+
# which is also provided (see under local builds, the exe is here renamed minio)
4548
Requires: mc
4649
Requires: mercurial
4750
Requires: mesa-dri-drivers
@@ -68,6 +71,7 @@ Requires: postgresql-devel
6871
Requires: proj
6972
Requires: proj-devel
7073
Requires: qt5-devel
74+
Requires: rclone
7175
Requires: s3cmd
7276
Requires: screen
7377
Requires: singularity-ce
@@ -77,6 +81,7 @@ Requires: subversion-devel
7781
Requires: subversion-tools
7882
Requires: tcl-devel
7983
Requires: tcsh
84+
Requires: tesseract
8085
Requires: texlive-dvipng texlive-pdftex texlive-type1cm texlive-latex-bin texlive-cm-super texlive-cm texlive-epstopdf
8186
Requires: tk-devel
8287
Requires: tmpwatch
@@ -88,6 +93,7 @@ Requires: uuid-devel
8893
Requires: vim-enhanced
8994
Requires: vim-X11
9095
Requires: wgrib
96+
Requires: wgrib2
9197
Requires: wxGTK-devel
9298
Requires: xfce4-terminal
9399
Requires: xorg-x11-util-macros
@@ -103,7 +109,7 @@ Requires: xterm
103109
Requires: %{scl_prefix}mo_unpack >= 2.0.1-3
104110
Requires: %{scl_prefix}xconv >= 1.94-2
105111
Requires: %{scl_prefix}leafpad >= 0.8.19-1
106-
Requires: %{scl_prefix}tkdiff >= 5.6-1
112+
Requires: %{scl_prefix}tkdiff >= 6.0-1
107113
Requires: %{scl_prefix}ferret >= 7.6.0-1
108114
Requires: %{scl_prefix}ferret-datasets >= 7.6-1
109115
Requires: %{scl_prefix}hdfeos2 >= 3.0-2
@@ -115,8 +121,8 @@ Requires: %{scl_prefix}libcrayutil >= 20121128-3
115121
Requires: %{scl_prefix}umutil >= 20130102-5
116122
Requires: %{scl_prefix}umutil-lib >= 20130102-5
117123
Requires: %{scl_prefix}filesystem >= 1.1-5
118-
Requires: %{scl_prefix}minio >= 20211007.041958-2
119-
Requires: %{scl_prefix}saga >= 9.3.2-1
124+
Requires: %{scl_prefix}minio >= 20250721.083541-1
125+
Requires: %{scl_prefix}saga >= 9.10.0-1
120126
Requires: %{scl_prefix}xdiskusage >= 1.60-1
121127
Requires: %{scl_prefix}eccodes2_27 >= 2.27.1-2
122128

‎rpmbuild/SPECS/mc.spec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
%{?scl:%scl_package minio}
22
Name: %{?scl_pkg_name}%{?!scl_pkg_name:minio}
3-
Version: 20211007.041958
4-
Release: 2%{?dist}
5-
Source0: mc
3+
Version: 20250721.083541
4+
Release: 1%{?dist}
5+
Source0: mc.RELEASE.2025-08-13T08-35-41Z
66
License: Affero GPL v3
77
Group: Scientific support
88
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot

‎rpmbuild/SPECS/saga.spec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
%{?scl:%scl_package %{_name}}
44
Name: %{?scl_pkg_name}%{?!scl_pkg_name:%{_name}}
5-
Version: 9.3.2
5+
Version: 9.10.0
66
Release: 1%{?dist}
77
Summary: GTK+ based simple text editor
88
Group: Scientific support
@@ -37,10 +37,10 @@ rm -rf $RPM_BUILD_ROOT
3737
%defattr(-,root,root,-)
3838
%{_datadir}/saga
3939
%{_mandir}/man1/saga*
40-
%{_datadir}/applications/saga.desktop
40+
%{_datadir}/applications/org.saga_gis.saga_gui.desktop
4141
%{_datadir}/pixmaps/saga.png
4242
%{_datadir}/icons/hicolor/*/apps/saga.png
43-
%{_datadir}/metainfo/org.saga-gis.saga-gui.appdata.xml
43+
%{_datadir}/metainfo/org.saga_gis.saga_gui.appdata.xml
4444
%{_libdir}/libsaga*
4545
%{_libdir}/saga
4646
%{_includedir}/saga

‎rpmbuild/SPECS/tkdiff.spec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
%{?scl:%scl_package %{_name}}
44
Name: %{?scl_pkg_name}%{?!scl_pkg_name:%{_name}}
55

6-
Version: 5.6
7-
%define _version 5-6
6+
Version: 6.0
7+
%define _version 6-0
88
Release: 1%{?dist}
99
Source0: %{_name}-%{_version}.zip
1010
License: GPL v2

‎source_urls‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,46 +5,57 @@
55
#
66
# whole line comments allowed but inline comments not
77

8+
# xconv dev_stalled
89
#http://cms.ncas.ac.uk/documents/xconv/_downloads/xconv1.94_linux_x86_64.tar.gz
910
https://ncas-cms.github.io/xconv-doc/html/_downloads/4882f36737ac8481863010236fc63e4f/xconv1.94_linux_x86_64.tar.gz
1011

1112
# lxterminal replaced with xfce4-terminal (standard RPM)
1213
#https://sourceforge.net/projects/lxde/files/LXTerminal%20%28terminal%20emulator%29/LXTerminal%200.3.2/lxterminal-0.3.2.tar.xz
1314
#https://downloads.sourceforge.net/project/lxde/LXTerminal%20%28terminal%20emulator%29/LXTerminal%200.4.x/lxterminal-0.4.0.tar.xz
1415

16+
# leafpad dev_stalled
1517
#http://download.savannah.gnu.org/releases/leafpad/leafpad-0.8.18.tar.gz
1618
https://download-mirror.savannah.gnu.org/releases/leafpad/leafpad-0.8.19.tar.gz
1719

1820
#https://sourceforge.net/projects/tkdiff/files/tkdiff/4.3.5/tkdiff-4-3-5.zip/download tkdiff-4-3-5.zip
19-
https://downloads.sourceforge.net/project/tkdiff/tkdiff/5.6/tkdiff-5-6.zip
21+
#https://downloads.sourceforge.net/project/tkdiff/tkdiff/5.6/tkdiff-5-6.zip
22+
https://downloads.sourceforge.net/project/tkdiff/tkdiff/6.0/tkdiff-6-0.zip
2023

2124
#https://gitlab.com/remikz/nccmp/-/archive/1.8.3.1/nccmp-1.8.3.1.tar.gz
22-
https://gitlab.com/remikz/nccmp/-/archive/1.9.1.0/nccmp-1.9.1.0.tar.gz
25+
#https://gitlab.com/remikz/nccmp/-/archive/1.9.1.0/nccmp-1.9.1.0.tar.gz
26+
https://gitlab.com/remikz/nccmp/-/archive/1.10.0.0/nccmp-1.10.0.0.tar.gz
2327

28+
# Ferret dev_stalled
2429
#https://github.com/NOAA-PMEL/Ferret/releases/download/v7.5.0/Ferret-7.5.0-RHEL7-64.tar.gz
2530
https://github.com/NOAA-PMEL/Ferret/releases/download/v7.6.0/Ferret-7.6.0-RHEL7.tar.gz
2631

2732
#https://github.com/NOAA-PMEL/FerretDatasets/archive/v7.4.tar.gz FerretDatasets-7.4.tar.gz
2833
https://github.com/NOAA-PMEL/FerretDatasets/archive/refs/tags/v7.6.tar.gz FerretDatasets-7.6.tar.gz
2934

35+
# Mtk dev_stalled
3036
#https://github.com/nasa/MISR-Toolkit/archive/v1.4.5.tar.gz Mtk-src-1.4.5.tar.gz
3137
https://github.com/nasa/MISR-Toolkit/archive/refs/tags/v1.5.1.tar.gz Mtk-src-1.5.1.tar.gz
3238

39+
# HDF-EOS2 dev_stalled
3340
#https://observer.gsfc.nasa.gov/ftp/edhs/hdfeos/latest_release/HDF-EOS2.20v1.00.tar.Z
3441
#https://git.earthdata.nasa.gov/projects/DAS/repos/hdfeos/raw/hdf-eos2-3.0-src.tar.gz
3542
https://git.earthdata.nasa.gov/projects/DAS/repos/hdfeos/raw/hdf-eos2-3.0-src.tar.gz?at=refs%2Fheads%2FHDFEOS2_3.0 hdf-eos2-3.0-src.tar.gz
3643

3744
# Diffuse is python2.7 software - remove
3845
#https://sourceforge.net/projects/diffuse/files/diffuse/0.4.8/diffuse-0.4.8.tar.bz2/download diffuse-0.4.8.tar.bz2
3946

47+
# libemos dev_stalled
4048
https://confluence.ecmwf.int/download/attachments/3473472/libemos-4.5.9-Source.tar.gz
4149

50+
# libdrs dev_stalled
4251
https://github.com/CDAT/libdrs/archive/v3.1.2.tar.gz libdrs-3.1.2.tar.gz
4352

44-
https://dl.min.io/client/mc/release/linux-amd64/mc
53+
#https://dl.min.io/client/mc/release/linux-amd64/mc
54+
https://dl.min.io/client/mc/release/linux-amd64/archive/mc.RELEASE.2025-08-13T08-35-41Z
4555

56+
# NCO is back is Jaspy - remove
4657
#https://github.com/nco/nco/archive/5.0.7.tar.gz nco-5.0.7.tar.gz
47-
https://github.com/nco/nco/archive/refs/tags/5.1.9.tar.gz nco-5.1.9.tar.gz
58+
#https://github.com/nco/nco/archive/refs/tags/5.1.9.tar.gz nco-5.1.9.tar.gz
4859

4960
https://artifacts.unidata.ucar.edu/repository/downloads-udunits/2.2.28/udunits-2.2.28.tar.gz
5061

@@ -53,6 +64,8 @@ https://www.earthsystemgrid.org/dataset/ncl.662.dap/file/ncl_ncarg-6.6.2-CentOS7
5364
# old version of eccodes needed to support libemos
5465
https://confluence.ecmwf.int/download/attachments/45757960/eccodes-2.27.1-Source.tar.gz
5566

56-
https://sourceforge.net/projects/saga-gis/files/SAGA%20-%209/SAGA%20-%209.3.2/saga-9.3.2.tar.gz/download saga-9.3.2.tar.gz
67+
#https://sourceforge.net/projects/saga-gis/files/SAGA%20-%209/SAGA%20-%209.3.2/saga-9.3.2.tar.gz/download saga-9.3.2.tar.gz
68+
https://downloads.sourceforge.net/project/saga-gis/SAGA%20-%209/SAGA%20-%209.10.0/saga-9.10.0.tar.gz saga-9.10.0.tar.gz
5769

70+
# xdiskusage dev_stalled
5871
https://xdiskusage.sourceforge.net/xdiskusage-1.60.tgz

0 commit comments

Comments
 (0)